github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-27 16:18:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

renamed OptimismEngineValidator to OpEngineValidator (#12312)

Browse Source
This commit is contained in:
Steven
2024-11-05 04:07:58 -06:00
committed by GitHub
parent 967cbc4e97
commit e3173407e1
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
crates/optimism/node/src/engine.rs
View File

@@ -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 }
@@ -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>,
{
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

14
crates/optimism/node/src/node.rs
View File

@@ -34,7 +34,7 @@ use reth_trie_db::MerklePatriciaTrie;
use crate::{
args::RollupArgs,
engine::OptimismEngineValidator,
engine::OpEngineValidator,
txpool::{OpTransactionPool, OpTransactionValidator},
OpEngineTypes,
};
@@ -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>>;
@@ -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>;
@@ -456,7 +456,7 @@ where
}
}
/// Builder for [`OptimismEngineValidator`].
/// Builder for [`OpEngineValidator`].
#[derive(Debug, Default, Clone)]
#[non_exhaustive]
pub struct OptimismEngineValidatorBuilder;
@@ -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()))
}
}