mirror of
https://github.com/sigp/lighthouse.git
synced 2026-05-31 13:17:09 +00:00
resolve conflicts
This commit is contained in:
@@ -192,7 +192,6 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
|
|||||||
signed_envelope,
|
signed_envelope,
|
||||||
import_data,
|
import_data,
|
||||||
payload_verification_outcome,
|
payload_verification_outcome,
|
||||||
self.spec.clone(),
|
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -136,7 +136,6 @@ impl<E: EthSpec> ExecutedEnvelope<E> {
|
|||||||
envelope: MaybeAvailableEnvelope<E>,
|
envelope: MaybeAvailableEnvelope<E>,
|
||||||
import_data: EnvelopeImportData<E>,
|
import_data: EnvelopeImportData<E>,
|
||||||
payload_verification_outcome: PayloadVerificationOutcome,
|
payload_verification_outcome: PayloadVerificationOutcome,
|
||||||
spec: Arc<ChainSpec>,
|
|
||||||
) -> Self {
|
) -> Self {
|
||||||
match envelope {
|
match envelope {
|
||||||
MaybeAvailableEnvelope::Available(available_envelope) => {
|
MaybeAvailableEnvelope::Available(available_envelope) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user