From 05cb56788dee4097005651a4acbe8c50a486b959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien?= Date: Mon, 2 Jan 2023 11:47:25 +0100 Subject: [PATCH] Change terminal_block_number type to U64 (#677) --- crates/consensus/src/engine/mod.rs | 6 +++--- crates/net/rpc-types/src/eth/engine.rs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/consensus/src/engine/mod.rs b/crates/consensus/src/engine/mod.rs index af63bd4b68..ff3ca4f2b5 100644 --- a/crates/consensus/src/engine/mod.rs +++ b/crates/consensus/src/engine/mod.rs @@ -290,7 +290,7 @@ impl ConsensusEngine } // Attempt to look up terminal block hash - let local_hash = self.client.block_hash(terminal_block_number.into())?; + let local_hash = self.client.block_hash(terminal_block_number.as_u64().into())?; // Transition configuration exchange is successful if block hashes match match local_hash { @@ -665,7 +665,7 @@ mod tests { let transition_config = TransitionConfiguration { terminal_total_difficulty: config.merge_terminal_total_difficulty.into(), terminal_block_hash: consensus_terminal_block.hash(), - terminal_block_number, + terminal_block_number: terminal_block_number.into(), }; // Unknown block number @@ -724,7 +724,7 @@ mod tests { let transition_config = TransitionConfiguration { terminal_total_difficulty: config.merge_terminal_total_difficulty.into(), terminal_block_hash: terminal_block.hash(), - terminal_block_number, + terminal_block_number: terminal_block_number.into(), }; client.add_block(terminal_block.hash(), terminal_block.clone().unseal()); diff --git a/crates/net/rpc-types/src/eth/engine.rs b/crates/net/rpc-types/src/eth/engine.rs index 16f3bdef53..7b1b8f651c 100644 --- a/crates/net/rpc-types/src/eth/engine.rs +++ b/crates/net/rpc-types/src/eth/engine.rs @@ -3,7 +3,7 @@ #![allow(missing_docs)] use bytes::BytesMut; -use reth_primitives::{Address, BlockNumber, Bloom, Bytes, SealedBlock, H256, H64, U256, U64}; +use reth_primitives::{Address, Bloom, Bytes, SealedBlock, H256, H64, U256, U64}; use reth_rlp::Encodable; use serde::{Deserialize, Serialize}; @@ -147,7 +147,7 @@ pub struct TransitionConfiguration { /// Maps on TERMINAL_BLOCK_HASH parameter of EIP-3675 pub terminal_block_hash: H256, /// Maps on TERMINAL_BLOCK_NUMBER parameter of EIP-3675 - pub terminal_block_number: BlockNumber, + pub terminal_block_number: U64, } #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]