From 95b95616c74c025e187548a069e334dabb1db594 Mon Sep 17 00:00:00 2001 From: Eitan Seri-Levi Date: Thu, 30 Apr 2026 10:33:13 +0200 Subject: [PATCH] resolve conflicts --- .../beacon_chain/src/payload_envelope_verification/import.rs | 1 - .../beacon_chain/src/payload_envelope_verification/mod.rs | 1 - 2 files changed, 2 deletions(-) diff --git a/beacon_node/beacon_chain/src/payload_envelope_verification/import.rs b/beacon_node/beacon_chain/src/payload_envelope_verification/import.rs index bb1f1b53c7..1845866e4a 100644 --- a/beacon_node/beacon_chain/src/payload_envelope_verification/import.rs +++ b/beacon_node/beacon_chain/src/payload_envelope_verification/import.rs @@ -192,7 +192,6 @@ impl BeaconChain { signed_envelope, import_data, payload_verification_outcome, - self.spec.clone(), )) } diff --git a/beacon_node/beacon_chain/src/payload_envelope_verification/mod.rs b/beacon_node/beacon_chain/src/payload_envelope_verification/mod.rs index 5558cbc50c..9d61025e96 100644 --- a/beacon_node/beacon_chain/src/payload_envelope_verification/mod.rs +++ b/beacon_node/beacon_chain/src/payload_envelope_verification/mod.rs @@ -136,7 +136,6 @@ impl ExecutedEnvelope { envelope: MaybeAvailableEnvelope, import_data: EnvelopeImportData, payload_verification_outcome: PayloadVerificationOutcome, - spec: Arc, ) -> Self { match envelope { MaybeAvailableEnvelope::Available(available_envelope) => {