From 0000f81df0717f9d16ccaedcb8f00fcbbd349881 Mon Sep 17 00:00:00 2001 From: Etan Kissling Date: Wed, 3 Apr 2024 07:27:00 +0200 Subject: [PATCH] remove unused and redundant `PayloadID` type definition (#6165) `PayloadID` is defined in `nim-web3` and our own Bellatrix definition can be removed. --- beacon_chain/consensus_object_pools/consensus_manager.nim | 2 -- beacon_chain/el/el_manager.nim | 2 +- beacon_chain/spec/datatypes/bellatrix.nim | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/beacon_chain/consensus_object_pools/consensus_manager.nim b/beacon_chain/consensus_object_pools/consensus_manager.nim index d78e73ad5..6bdcccdcd 100644 --- a/beacon_chain/consensus_object_pools/consensus_manager.nim +++ b/beacon_chain/consensus_object_pools/consensus_manager.nim @@ -333,8 +333,6 @@ proc getFeeRecipient*( proc getGasLimit*(self: ConsensusManager, pubkey: ValidatorPubKey): uint64 = getGasLimit(self.validatorsDir, self.defaultGasLimit, pubkey) -from ../spec/datatypes/bellatrix import PayloadID - proc runProposalForkchoiceUpdated*( self: ref ConsensusManager, wallSlot: Slot): Future[Opt[void]] {.async: (raises: [CancelledError]).} = let diff --git a/beacon_chain/el/el_manager.nim b/beacon_chain/el/el_manager.nim index 71add3dd5..9479f46a7 100644 --- a/beacon_chain/el/el_manager.nim +++ b/beacon_chain/el/el_manager.nim @@ -171,7 +171,7 @@ type depositContractSyncStatus: DepositContractSyncStatus ## Are we sure that this EL has synced the deposit contract? - lastPayloadId: Option[engine_api.PayloadID] + lastPayloadId: Option[PayloadID] FullBlockId* = object number: Eth1BlockNumber diff --git a/beacon_chain/spec/datatypes/bellatrix.nim b/beacon_chain/spec/datatypes/bellatrix.nim index 28f59a9f0..d0e883684 100644 --- a/beacon_chain/spec/datatypes/bellatrix.nim +++ b/beacon_chain/spec/datatypes/bellatrix.nim @@ -44,8 +44,6 @@ type BloomLogs* = object data*: array[BYTES_PER_LOGS_BLOOM, byte] - PayloadID* = array[8, byte] - # https://github.com/ethereum/consensus-specs/blob/v1.4.0/specs/bellatrix/beacon-chain.md#executionpayload ExecutionPayload* = object # Execution block header fields