status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove unused and redundant `PayloadID` type definition (#6165) 

`PayloadID` is defined in `nim-web3` and our own Bellatrix definition
can be removed.
This commit is contained in:
Etan Kissling 2024-04-03 07:27:00 +02:00 committed by GitHub
parent 27ec2893ff
commit 0000f81df0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_chain/consensus_object_pools/consensus_manager.nim
View File

@ -333,8 +333,6 @@ proc getFeeRecipient*(
proc getGasLimit*(self: ConsensusManager, pubkey: ValidatorPubKey): uint64 = proc getGasLimit*(self: ConsensusManager, pubkey: ValidatorPubKey): uint64 =
getGasLimit(self.validatorsDir, self.defaultGasLimit, pubkey) getGasLimit(self.validatorsDir, self.defaultGasLimit, pubkey)
from ../spec/datatypes/bellatrix import PayloadID
proc runProposalForkchoiceUpdated*( proc runProposalForkchoiceUpdated*(
self: ref ConsensusManager, wallSlot: Slot): Future[Opt[void]] {.async: (raises: [CancelledError]).} = self: ref ConsensusManager, wallSlot: Slot): Future[Opt[void]] {.async: (raises: [CancelledError]).} =
let let

2
beacon_chain/el/el_manager.nim
View File

@ -171,7 +171,7 @@ type
depositContractSyncStatus: DepositContractSyncStatus depositContractSyncStatus: DepositContractSyncStatus
## Are we sure that this EL has synced the deposit contract? ## Are we sure that this EL has synced the deposit contract?
lastPayloadId: Option[engine_api.PayloadID] lastPayloadId: Option[PayloadID]
FullBlockId* = object FullBlockId* = object
number: Eth1BlockNumber number: Eth1BlockNumber

2
beacon_chain/spec/datatypes/bellatrix.nim
View File

@ -44,8 +44,6 @@ type
BloomLogs* = object BloomLogs* = object
data*: array[BYTES_PER_LOGS_BLOOM, byte] 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 # https://github.com/ethereum/consensus-specs/blob/v1.4.0/specs/bellatrix/beacon-chain.md#executionpayload
ExecutionPayload* = object ExecutionPayload* = object
# Execution block header fields # Execution block header fields