From 2df7b8c2acd28d32be8a9adbf3079a45513a28b5 Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Fri, 7 Apr 2023 09:46:15 +0200 Subject: [PATCH] chore: replace h64 with payload (#2149) --- crates/rpc/rpc-api/src/engine.rs | 8 ++++---- crates/rpc/rpc-engine-api/src/engine_api.rs | 8 +++++--- crates/rpc/rpc-engine-api/src/message.rs | 8 ++++---- crates/rpc/rpc/src/engine.rs | 10 +++++----- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/crates/rpc/rpc-api/src/engine.rs b/crates/rpc/rpc-api/src/engine.rs index 3ee151224e..8dd4ee159e 100644 --- a/crates/rpc/rpc-api/src/engine.rs +++ b/crates/rpc/rpc-api/src/engine.rs @@ -1,8 +1,8 @@ use jsonrpsee::{core::RpcResult as Result, proc_macros::rpc}; -use reth_primitives::{BlockHash, H64, U64}; +use reth_primitives::{BlockHash, U64}; use reth_rpc_types::engine::{ ExecutionPayload, ExecutionPayloadBodies, ForkchoiceState, ForkchoiceUpdated, - PayloadAttributes, PayloadStatus, TransitionConfiguration, + PayloadAttributes, PayloadId, PayloadStatus, TransitionConfiguration, }; #[cfg_attr(not(feature = "client"), rpc(server))] @@ -39,11 +39,11 @@ pub trait EngineApi { /// /// Caution: This should not return the `withdrawals` field #[method(name = "engine_getPayloadV1")] - async fn get_payload_v1(&self, payload_id: H64) -> Result; + async fn get_payload_v1(&self, payload_id: PayloadId) -> Result; /// See also #[method(name = "engine_getPayloadV2")] - async fn get_payload_v2(&self, payload_id: H64) -> Result; + async fn get_payload_v2(&self, payload_id: PayloadId) -> Result; /// See also #[method(name = "engine_getPayloadBodiesByHashV1")] diff --git a/crates/rpc/rpc-engine-api/src/engine_api.rs b/crates/rpc/rpc-engine-api/src/engine_api.rs index 2085f73ea5..91a4318c65 100644 --- a/crates/rpc/rpc-engine-api/src/engine_api.rs +++ b/crates/rpc/rpc-engine-api/src/engine_api.rs @@ -1,9 +1,11 @@ use crate::{EngineApiError, EngineApiMessage, EngineApiResult}; use futures::StreamExt; use reth_beacon_consensus::BeaconEngineMessage; -use reth_primitives::{BlockHash, BlockId, BlockNumber, ChainSpec, Hardfork, H64}; +use reth_primitives::{BlockHash, BlockId, BlockNumber, ChainSpec, Hardfork}; use reth_provider::{BlockProvider, EvmEnvProvider, HeaderProvider, StateProviderFactory}; -use reth_rpc_types::engine::{ExecutionPayload, ExecutionPayloadBodies, TransitionConfiguration}; +use reth_rpc_types::engine::{ + ExecutionPayload, ExecutionPayloadBodies, PayloadId, TransitionConfiguration, +}; use std::{ future::Future, pin::Pin, @@ -83,7 +85,7 @@ impl Option { + pub fn get_payload(&self, _payload_id: PayloadId) -> Option { None } diff --git a/crates/rpc/rpc-engine-api/src/message.rs b/crates/rpc/rpc-engine-api/src/message.rs index 9bc7ce11e1..1d80ad25ad 100644 --- a/crates/rpc/rpc-engine-api/src/message.rs +++ b/crates/rpc/rpc-engine-api/src/message.rs @@ -1,17 +1,17 @@ use crate::EngineApiSender; use reth_beacon_consensus::BeaconEngineSender; use reth_interfaces::consensus::ForkchoiceState; -use reth_primitives::{BlockHash, BlockNumber, H64}; +use reth_primitives::{BlockHash, BlockNumber}; use reth_rpc_types::engine::{ - ExecutionPayload, ExecutionPayloadBodies, ForkchoiceUpdated, PayloadAttributes, PayloadStatus, - TransitionConfiguration, + ExecutionPayload, ExecutionPayloadBodies, ForkchoiceUpdated, PayloadAttributes, PayloadId, + PayloadStatus, TransitionConfiguration, }; /// Message type for communicating with [`EngineApi`][crate::EngineApi]. #[derive(Debug)] pub enum EngineApiMessage { /// Get payload message - GetPayload(H64, EngineApiSender), + GetPayload(PayloadId, EngineApiSender), /// Get payload bodies by range message GetPayloadBodiesByRange(BlockNumber, u64, EngineApiSender), /// Get payload bodies by hash message diff --git a/crates/rpc/rpc/src/engine.rs b/crates/rpc/rpc/src/engine.rs index 025b5d6855..02b4615e7a 100644 --- a/crates/rpc/rpc/src/engine.rs +++ b/crates/rpc/rpc/src/engine.rs @@ -1,14 +1,14 @@ use async_trait::async_trait; use jsonrpsee::core::{Error, RpcResult as Result}; use reth_interfaces::consensus::ForkchoiceState; -use reth_primitives::{BlockHash, ChainSpec, Hardfork, H64, U64}; +use reth_primitives::{BlockHash, ChainSpec, Hardfork, U64}; use reth_rpc_api::EngineApiServer; use reth_rpc_engine_api::{ EngineApiError, EngineApiHandle, EngineApiMessage, EngineApiMessageVersion, EngineApiResult, }; use reth_rpc_types::engine::{ - ExecutionPayload, ExecutionPayloadBodies, ForkchoiceUpdated, PayloadAttributes, PayloadStatus, - TransitionConfiguration, CAPABILITIES, + ExecutionPayload, ExecutionPayloadBodies, ForkchoiceUpdated, PayloadAttributes, PayloadId, + PayloadStatus, TransitionConfiguration, CAPABILITIES, }; use std::sync::Arc; use tokio::sync::oneshot::{self, Receiver}; @@ -155,14 +155,14 @@ impl EngineApiServer for EngineApi { /// See also /// /// Caution: This should not return the `withdrawals` field - async fn get_payload_v1(&self, payload_id: H64) -> Result { + async fn get_payload_v1(&self, payload_id: PayloadId) -> Result { let (tx, rx) = oneshot::channel(); self.delegate_request(EngineApiMessage::GetPayload(payload_id, tx), rx).await } /// Handler for `engine_getPayloadV2` /// See also - async fn get_payload_v2(&self, payload_id: H64) -> Result { + async fn get_payload_v2(&self, payload_id: PayloadId) -> Result { let (tx, rx) = oneshot::channel(); self.delegate_request(EngineApiMessage::GetPayload(payload_id, tx), rx).await }