Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

renamed OptimismEngineValidator to OpEngineValidator #12312

Merged
merged 1 commit into from
Nov 5, 2024
Merged

renamed OptimismEngineValidator to OpEngineValidator #12312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions crates/optimism/node/src/engine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ impl PayloadTypes for OpPayloadTypes {

/// Validator for Optimism engine API.
#[derive(Debug, Clone)]
pub struct OptimismEngineValidator {
pub struct OpEngineValidator {
chain_spec: Arc<OpChainSpec>,
}

impl OptimismEngineValidator {
impl OpEngineValidator {
/// Instantiates a new validator.
pub const fn new(chain_spec: Arc<OpChainSpec>) -> Self {
Self { chain_spec }
Expand Down Expand Up @@ -111,7 +111,7 @@ pub fn validate_withdrawals_presence(
Ok(())
}

impl<Types> EngineValidator<Types> for OptimismEngineValidator
impl<Types> EngineValidator<Types> for OpEngineValidator
where
Types: EngineTypes<PayloadAttributes = OpPayloadAttributes>,
{
Expand Down Expand Up @@ -220,10 +220,10 @@ mod test {

#[test]
fn test_well_formed_attributes_pre_holocene() {
let validator = OptimismEngineValidator::new(get_chainspec(false));
let validator = OpEngineValidator::new(get_chainspec(false));
let attributes = get_attributes(None, 1799999999);

let result = <engine::OptimismEngineValidator as reth_node_builder::EngineValidator<
let result = <engine::OpEngineValidator as reth_node_builder::EngineValidator<
OpEngineTypes,
>>::ensure_well_formed_attributes(
&validator, EngineApiMessageVersion::V3, &attributes
Expand All @@ -233,10 +233,10 @@ mod test {

#[test]
fn test_well_formed_attributes_holocene_no_eip1559_params() {
let validator = OptimismEngineValidator::new(get_chainspec(true));
let validator = OpEngineValidator::new(get_chainspec(true));
let attributes = get_attributes(None, 1800000000);

let result = <engine::OptimismEngineValidator as reth_node_builder::EngineValidator<
let result = <engine::OpEngineValidator as reth_node_builder::EngineValidator<
OpEngineTypes,
>>::ensure_well_formed_attributes(
&validator, EngineApiMessageVersion::V3, &attributes
Expand All @@ -246,10 +246,10 @@ mod test {

#[test]
fn test_well_formed_attributes_holocene_eip1559_params_zero_denominator() {
let validator = OptimismEngineValidator::new(get_chainspec(true));
let validator = OpEngineValidator::new(get_chainspec(true));
let attributes = get_attributes(Some(b64!("0000000000000008")), 1800000000);

let result = <engine::OptimismEngineValidator as reth_node_builder::EngineValidator<
let result = <engine::OpEngineValidator as reth_node_builder::EngineValidator<
OpEngineTypes,
>>::ensure_well_formed_attributes(
&validator, EngineApiMessageVersion::V3, &attributes
Expand All @@ -259,10 +259,10 @@ mod test {

#[test]
fn test_well_formed_attributes_holocene_valid() {
let validator = OptimismEngineValidator::new(get_chainspec(true));
let validator = OpEngineValidator::new(get_chainspec(true));
let attributes = get_attributes(Some(b64!("0000000800000008")), 1800000000);

let result = <engine::OptimismEngineValidator as reth_node_builder::EngineValidator<
let result = <engine::OpEngineValidator as reth_node_builder::EngineValidator<
OpEngineTypes,
>>::ensure_well_formed_attributes(
&validator, EngineApiMessageVersion::V3, &attributes
Expand All @@ -272,10 +272,10 @@ mod test {

#[test]
fn test_well_formed_attributes_holocene_valid_all_zero() {
let validator = OptimismEngineValidator::new(get_chainspec(true));
let validator = OpEngineValidator::new(get_chainspec(true));
let attributes = get_attributes(Some(b64!("0000000000000000")), 1800000000);

let result = <engine::OptimismEngineValidator as reth_node_builder::EngineValidator<
let result = <engine::OpEngineValidator as reth_node_builder::EngineValidator<
OpEngineTypes,
>>::ensure_well_formed_attributes(
&validator, EngineApiMessageVersion::V3, &attributes
Expand Down
14 changes: 7 additions & 7 deletions crates/optimism/node/src/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ use reth_trie_db::MerklePatriciaTrie;

use crate::{
args::RollupArgs,
engine::OptimismEngineValidator,
engine::OpEngineValidator,
txpool::{OpTransactionPool, OpTransactionValidator},
OpEngineTypes,
};
Expand Down Expand Up @@ -150,7 +150,7 @@ impl<N: FullNodeComponents> OptimismAddOns<N> {
impl<N> NodeAddOns<N> for OptimismAddOns<N>
where
N: FullNodeComponents<Types: NodeTypes<ChainSpec = OpChainSpec>>,
OptimismEngineValidator: EngineValidator<<N::Types as NodeTypesWithEngine>::Engine>,
OpEngineValidator: EngineValidator<<N::Types as NodeTypesWithEngine>::Engine>,
{
type Handle = RpcHandle<N, OpEthApi<N>>;

Expand All @@ -165,7 +165,7 @@ where
impl<N> RethRpcAddOns<N> for OptimismAddOns<N>
where
N: FullNodeComponents<Types: NodeTypes<ChainSpec = OpChainSpec>>,
OptimismEngineValidator: EngineValidator<<N::Types as NodeTypesWithEngine>::Engine>,
OpEngineValidator: EngineValidator<<N::Types as NodeTypesWithEngine>::Engine>,
{
type EthApi = OpEthApi<N>;

Expand Down Expand Up @@ -456,7 +456,7 @@ where
}
}

/// Builder for [`OptimismEngineValidator`].
/// Builder for [`OpEngineValidator`].
#[derive(Debug, Default, Clone)]
#[non_exhaustive]
pub struct OptimismEngineValidatorBuilder;
Expand All @@ -465,11 +465,11 @@ impl<Node, Types> EngineValidatorBuilder<Node> for OptimismEngineValidatorBuilde
where
Types: NodeTypesWithEngine<ChainSpec = OpChainSpec>,
Node: FullNodeComponents<Types = Types>,
OptimismEngineValidator: EngineValidator<Types::Engine>,
OpEngineValidator: EngineValidator<Types::Engine>,
{
type Validator = OptimismEngineValidator;
type Validator = OpEngineValidator;

async fn build(self, ctx: &AddOnsContext<'_, Node>) -> eyre::Result<Self::Validator> {
Ok(OptimismEngineValidator::new(ctx.config.chain.clone()))
Ok(OpEngineValidator::new(ctx.config.chain.clone()))
}
}
Loading