From 8e8a1a827d240166d93d00423deae677059b49c4 Mon Sep 17 00:00:00 2001 From: Steven <112043913+stevencartavia@users.noreply.github.com> Date: Thu, 7 Nov 2024 02:56:16 -0600 Subject: [PATCH] renamed OptimismPayloadBuilderError to OpPayloadBuilderError (#12364) --- crates/optimism/payload/src/builder.rs | 12 +++++------- crates/optimism/payload/src/error.rs | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/crates/optimism/payload/src/builder.rs b/crates/optimism/payload/src/builder.rs index 76c48c09b..f7fdf157c 100644 --- a/crates/optimism/payload/src/builder.rs +++ b/crates/optimism/payload/src/builder.rs @@ -35,7 +35,7 @@ use revm::{ use tracing::{debug, trace, warn}; use crate::{ - error::OptimismPayloadBuilderError, + error::OpPayloadBuilderError, payload::{OpBuiltPayload, OpPayloadBuilderAttributes}, }; use op_alloy_consensus::DepositTransaction; @@ -589,7 +589,7 @@ impl OpPayloadBuilderCtx { ) .map_err(|err| { warn!(target: "payload_builder", %err, "missing create2 deployer, skipping block."); - PayloadBuilderError::other(OptimismPayloadBuilderError::ForceCreate2DeployerFail) + PayloadBuilderError::other(OpPayloadBuilderError::ForceCreate2DeployerFail) }) } } @@ -640,7 +640,7 @@ where // A sequencer's block should never contain blob transactions. if sequencer_tx.value().is_eip4844() { return Err(PayloadBuilderError::other( - OptimismPayloadBuilderError::BlobTransactionRejected, + OpPayloadBuilderError::BlobTransactionRejected, )) } @@ -650,9 +650,7 @@ where // will just pull in its `from` address. let sequencer_tx = sequencer_tx.value().clone().try_into_ecrecovered().map_err(|_| { - PayloadBuilderError::other( - OptimismPayloadBuilderError::TransactionEcRecoverFailed, - ) + PayloadBuilderError::other(OpPayloadBuilderError::TransactionEcRecoverFailed) })?; // Cache the depositor account prior to the state transition for the deposit nonce. @@ -667,7 +665,7 @@ where }) .transpose() .map_err(|_| { - PayloadBuilderError::other(OptimismPayloadBuilderError::AccountLoadFailed( + PayloadBuilderError::other(OpPayloadBuilderError::AccountLoadFailed( sequencer_tx.signer(), )) })?; diff --git a/crates/optimism/payload/src/error.rs b/crates/optimism/payload/src/error.rs index 2016fdc6d..8a254e983 100644 --- a/crates/optimism/payload/src/error.rs +++ b/crates/optimism/payload/src/error.rs @@ -2,7 +2,7 @@ /// Optimism specific payload building errors. #[derive(Debug, thiserror::Error)] -pub enum OptimismPayloadBuilderError { +pub enum OpPayloadBuilderError { /// Thrown when a transaction fails to convert to a /// [`reth_primitives::TransactionSignedEcRecovered`]. #[error("failed to convert deposit transaction to TransactionSignedEcRecovered")]