diff --git a/crates/engine/service/src/service.rs b/crates/engine/service/src/service.rs index b099e56ae07b..b564eb4ea205 100644 --- a/crates/engine/service/src/service.rs +++ b/crates/engine/service/src/service.rs @@ -16,7 +16,7 @@ pub use reth_engine_tree::{ }; use reth_evm::execute::BlockExecutorProvider; use reth_network_p2p::BlockClient; -use reth_node_types::{BlockTy, BodyTy, HeaderTy, NodeTypes, NodeTypesWithEngine}; +use reth_node_types::{BlockTy, NodeTypes, NodeTypesWithEngine}; use reth_payload_builder::PayloadBuilderHandle; use reth_primitives::EthPrimitives; use reth_provider::{ @@ -55,7 +55,7 @@ type EngineServiceType = ChainOrchestrator< pub struct EngineService where N: EngineNodeTypes, - Client: BlockClient
, Body = BodyTy> + 'static, + Client: BlockClient> + 'static, E: BlockExecutorProvider + 'static, { orchestrator: EngineServiceType, @@ -65,7 +65,7 @@ where impl EngineService where N: EngineNodeTypes, - Client: BlockClient
, Body = BodyTy> + 'static, + Client: BlockClient> + 'static, E: BlockExecutorProvider + 'static, { /// Constructor for `EngineService`. @@ -133,7 +133,7 @@ where impl Stream for EngineService where N: EngineNodeTypes, - Client: BlockClient
, Body = BodyTy> + 'static, + Client: BlockClient> + 'static, E: BlockExecutorProvider + 'static, { type Item = ChainEvent>; diff --git a/crates/rpc/rpc-engine-api/tests/it/payload.rs b/crates/rpc/rpc-engine-api/tests/it/payload.rs index 69ea5bb175c0..0bc8806fa146 100644 --- a/crates/rpc/rpc-engine-api/tests/it/payload.rs +++ b/crates/rpc/rpc-engine-api/tests/it/payload.rs @@ -21,7 +21,11 @@ fn transform_block Block>(src: SealedBlock, f: F) -> Executi transformed.header.transactions_root = proofs::calculate_transaction_root(&transformed.body.transactions); transformed.header.ommers_hash = proofs::calculate_ommers_root(&transformed.body.ommers); - block_to_payload(SealedBlock::new(SealedHeader::seal(transformed.header), transformed.body)).0 + block_to_payload(SealedBlock::from_sealed_parts( + SealedHeader::seal(transformed.header), + transformed.body, + )) + .0 } #[test] diff --git a/testing/ef-tests/src/cases/blockchain_test.rs b/testing/ef-tests/src/cases/blockchain_test.rs index 98a64f9bab99..a3c168cb54de 100644 --- a/testing/ef-tests/src/cases/blockchain_test.rs +++ b/testing/ef-tests/src/cases/blockchain_test.rs @@ -91,8 +91,8 @@ impl Case for BlockchainTestCase { // Insert initial test state into the provider. provider.insert_historical_block( - SealedBlock::seal_parts( - case.genesis_block_header.clone(), + SealedBlock::::from_sealed_parts( + case.genesis_block_header.clone().into(), BlockBody::default(), ) .try_recover() @@ -113,8 +113,7 @@ impl Case for BlockchainTestCase { let last_block = case.blocks.iter().try_fold(None, |_, block| { let decoded = SealedBlock::::decode(&mut block.rlp.as_ref())?; - provider - .insert_historical_block(decoded.clone().try_with_senders().unwrap())?; + provider.insert_historical_block(decoded.clone().try_recover().unwrap())?; Ok::, Error>(Some(decoded)) })?; provider