renamed OptimismPayloadBuilderAttributes to OpPayloadBuilderAttributes (#12213)

This commit is contained in:
Steven
2024-10-31 02:34:11 -06:00
committed by GitHub
parent c19af293a6
commit 9659717e83
6 changed files with 22 additions and 24 deletions

View File

@ -16,7 +16,7 @@ use reth_node_api::{
use reth_optimism_chainspec::OpChainSpec;
use reth_optimism_forks::{OptimismHardfork, OptimismHardforks};
use reth_optimism_payload_builder::{
builder::decode_eip_1559_params, OptimismBuiltPayload, OptimismPayloadBuilderAttributes,
builder::decode_eip_1559_params, OpPayloadBuilderAttributes, OptimismBuiltPayload,
};
/// The types used in the optimism beacon consensus engine.
@ -53,7 +53,7 @@ pub struct OptimismPayloadTypes;
impl PayloadTypes for OptimismPayloadTypes {
type BuiltPayload = OptimismBuiltPayload;
type PayloadAttributes = OpPayloadAttributes;
type PayloadBuilderAttributes = OptimismPayloadBuilderAttributes;
type PayloadBuilderAttributes = OpPayloadBuilderAttributes;
}
/// Validator for Optimism engine API.

View File

@ -23,7 +23,7 @@ pub use node::OptimismNode;
pub mod txpool;
pub use reth_optimism_payload_builder::{
OptimismBuiltPayload, OptimismPayloadBuilder, OptimismPayloadBuilderAttributes,
OpPayloadBuilderAttributes, OptimismBuiltPayload, OptimismPayloadBuilder,
};
pub use reth_optimism_evm::*;

View File

@ -6,7 +6,7 @@ use reth_e2e_test_utils::{
};
use reth_optimism_chainspec::OpChainSpecBuilder;
use reth_optimism_node::{
node::OptimismAddOns, OptimismBuiltPayload, OptimismNode, OptimismPayloadBuilderAttributes,
node::OptimismAddOns, OpPayloadBuilderAttributes, OptimismBuiltPayload, OptimismNode,
};
use reth_payload_builder::EthPayloadBuilderAttributes;
use std::sync::Arc;
@ -31,7 +31,7 @@ pub(crate) async fn advance_chain(
length: usize,
node: &mut OpNode,
wallet: Arc<Mutex<Wallet>>,
) -> eyre::Result<Vec<(OptimismBuiltPayload, OptimismPayloadBuilderAttributes)>> {
) -> eyre::Result<Vec<(OptimismBuiltPayload, OpPayloadBuilderAttributes)>> {
node.advance(length as u64, |_| {
let wallet = wallet.clone();
Box::pin(async move {
@ -49,7 +49,7 @@ pub(crate) async fn advance_chain(
}
/// Helper function to create a new eth payload attributes
pub(crate) fn optimism_payload_attributes(timestamp: u64) -> OptimismPayloadBuilderAttributes {
pub(crate) fn optimism_payload_attributes(timestamp: u64) -> OpPayloadBuilderAttributes {
let attributes = PayloadAttributes {
timestamp,
prev_randao: B256::ZERO,
@ -58,7 +58,7 @@ pub(crate) fn optimism_payload_attributes(timestamp: u64) -> OptimismPayloadBuil
parent_beacon_block_root: Some(B256::ZERO),
};
OptimismPayloadBuilderAttributes {
OpPayloadBuilderAttributes {
payload_attributes: EthPayloadBuilderAttributes::new(B256::ZERO, attributes),
transactions: vec![],
no_tx_pool: false,