replace DisplayHardforks with Box<dyn Display> (#12219)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
paradigmxyz · Oct 31, 2024 · bd8c4ec · bd8c4ec
1 parent d020b41
commit bd8c4ec
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/crates/chainspec/src/api.rs b/crates/chainspec/src/api.rs
@@ -1,11 +1,10 @@
 use crate::{ChainSpec, DepositContract};
-use alloc::vec::Vec;
+use alloc::{boxed::Box, vec::Vec};
 use alloy_chains::Chain;
 use alloy_eips::eip1559::BaseFeeParams;
 use alloy_genesis::Genesis;
 use alloy_primitives::B256;
-use core::fmt::Debug;
-use reth_ethereum_forks::DisplayHardforks;
+use core::fmt::{Debug, Display};
 use reth_network_peers::NodeRecord;
 use reth_primitives_traits::Header;
 
@@ -39,7 +38,7 @@ pub trait EthChainSpec: Send + Sync + Unpin + Debug {
     fn prune_delete_limit(&self) -> usize;
 
     /// Returns a string representation of the hardforks.
-    fn display_hardforks(&self) -> DisplayHardforks;
+    fn display_hardforks(&self) -> Box<dyn Display>;
 
     /// The genesis header.
     fn genesis_header(&self) -> &Header;
@@ -89,8 +88,8 @@ impl EthChainSpec for ChainSpec {
         self.prune_delete_limit
     }
 
-    fn display_hardforks(&self) -> DisplayHardforks {
-        self.display_hardforks()
+    fn display_hardforks(&self) -> Box<dyn Display> {
+        Box::new(Self::display_hardforks(self))
     }
 
     fn genesis_header(&self) -> &Header {

diff --git a/crates/optimism/chainspec/src/lib.rs b/crates/optimism/chainspec/src/lib.rs
@@ -17,7 +17,7 @@ mod dev;
 mod op;
 mod op_sepolia;
 
-use alloc::{vec, vec::Vec};
+use alloc::{boxed::Box, vec, vec::Vec};
 use alloy_chains::Chain;
 use alloy_genesis::Genesis;
 use alloy_primitives::{Bytes, Parity, Signature, B256, U256};
@@ -30,8 +30,8 @@ pub(crate) use once_cell::sync::Lazy as LazyLock;
 pub use op::OP_MAINNET;
 pub use op_sepolia::OP_SEPOLIA;
 use reth_chainspec::{
-    BaseFeeParams, BaseFeeParamsKind, ChainSpec, ChainSpecBuilder, DepositContract,
-    DisplayHardforks, EthChainSpec, EthereumHardforks, ForkFilter, ForkId, Hardforks, Head,
+    BaseFeeParams, BaseFeeParamsKind, ChainSpec, ChainSpecBuilder, DepositContract, EthChainSpec,
+    EthereumHardforks, ForkFilter, ForkId, Hardforks, Head,
 };
 use reth_ethereum_forks::{ChainHardforks, EthereumHardfork, ForkCondition, Hardfork};
 use reth_network_peers::NodeRecord;
@@ -287,8 +287,8 @@ impl EthChainSpec for OpChainSpec {
         self.inner.prune_delete_limit()
     }
 
-    fn display_hardforks(&self) -> DisplayHardforks {
-        self.inner.display_hardforks()
+    fn display_hardforks(&self) -> Box<dyn Display> {
+        Box::new(ChainSpec::display_hardforks(self))
     }
 
     fn genesis_header(&self) -> &Header {