jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: clean up reth-bench payload status checks (#8852)

Browse Source
This commit is contained in:
Dan Cline
2024-06-14 16:59:14 -04:00
committed by GitHub
parent 3b27da59dc
commit 352d57655b
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
bin/reth-bench/src/valid_payload.rs
View File

@ -5,7 +5,6 @@
use alloy_provider::{ext::EngineApi, Network}; use alloy_provider::{ext::EngineApi, Network};
use alloy_rpc_types_engine::{ use alloy_rpc_types_engine::{
ExecutionPayloadInputV2, ForkchoiceState, ForkchoiceUpdated, PayloadAttributes, PayloadStatus, ExecutionPayloadInputV2, ForkchoiceState, ForkchoiceUpdated, PayloadAttributes, PayloadStatus,
PayloadStatusEnum,
}; };
use alloy_transport::{Transport, TransportResult}; use alloy_transport::{Transport, TransportResult};
use reth_node_api::EngineApiMessageVersion; use reth_node_api::EngineApiMessageVersion;
@ -76,8 +75,8 @@ where
payload: ExecutionPayloadV1, payload: ExecutionPayloadV1,
) -> TransportResult<PayloadStatus> { ) -> TransportResult<PayloadStatus> {
let mut status = self.new_payload_v1(payload.clone()).await?; let mut status = self.new_payload_v1(payload.clone()).await?;
while status.status != PayloadStatusEnum::Valid { while !status.is_valid() {
if status.status.is_invalid() { if status.is_invalid() {
error!(?status, ?payload, "Invalid newPayloadV1",); error!(?status, ?payload, "Invalid newPayloadV1",);
panic!("Invalid newPayloadV1: {status:?}"); panic!("Invalid newPayloadV1: {status:?}");
} }
@ -91,8 +90,8 @@ where
payload: ExecutionPayloadInputV2, payload: ExecutionPayloadInputV2,
) -> TransportResult<PayloadStatus> { ) -> TransportResult<PayloadStatus> {
let mut status = self.new_payload_v2(payload.clone()).await?; let mut status = self.new_payload_v2(payload.clone()).await?;
while status.status != PayloadStatusEnum::Valid { while !status.is_valid() {
if status.status.is_invalid() { if status.is_invalid() {
error!(?status, ?payload, "Invalid newPayloadV2",); error!(?status, ?payload, "Invalid newPayloadV2",);
panic!("Invalid newPayloadV2: {status:?}"); panic!("Invalid newPayloadV2: {status:?}");
} }
@ -110,8 +109,8 @@ where
let mut status = self let mut status = self
.new_payload_v3(payload.clone(), versioned_hashes.clone(), parent_beacon_block_root) .new_payload_v3(payload.clone(), versioned_hashes.clone(), parent_beacon_block_root)
.await?; .await?;
while status.status != PayloadStatusEnum::Valid { while !status.is_valid() {
if status.status.is_invalid() { if status.is_invalid() {
error!( error!(
?status, ?status,
?payload, ?payload,
@ -136,8 +135,8 @@ where
let mut status = let mut status =
self.fork_choice_updated_v1(fork_choice_state, payload_attributes.clone()).await?; self.fork_choice_updated_v1(fork_choice_state, payload_attributes.clone()).await?;
while status.payload_status.status != PayloadStatusEnum::Valid { while !status.is_valid() {
if status.payload_status.status.is_invalid() { if status.is_invalid() {
error!( error!(
?status, ?status,
?fork_choice_state, ?fork_choice_state,
@ -161,8 +160,8 @@ where
let mut status = let mut status =
self.fork_choice_updated_v2(fork_choice_state, payload_attributes.clone()).await?; self.fork_choice_updated_v2(fork_choice_state, payload_attributes.clone()).await?;
while status.payload_status.status != PayloadStatusEnum::Valid { while !status.is_valid() {
if status.payload_status.status.is_invalid() { if status.is_invalid() {
error!( error!(
?status, ?status,
?fork_choice_state, ?fork_choice_state,
@ -186,8 +185,8 @@ where
let mut status = let mut status =
self.fork_choice_updated_v3(fork_choice_state, payload_attributes.clone()).await?; self.fork_choice_updated_v3(fork_choice_state, payload_attributes.clone()).await?;
while status.payload_status.status != PayloadStatusEnum::Valid { while !status.is_valid() {
if status.payload_status.status.is_invalid() { if status.is_invalid() {
error!( error!(
?status, ?status,
?fork_choice_state, ?fork_choice_state,