Merge remote-tracking branch 'origin/feature/caller-replacement' into feature/check-target

Switch to callframe tracer

crates/config/src/lib.rs

@@ -73,6 +73,12 @@ pub struct Arguments {
     )]
     pub account: String,
 
+    /// This argument controls which private keys the nodes should have access to and be added to
+    /// its wallet signers. With a value of N, private keys (0, N] will be added to the signer set
+    /// of the node.
+    #[arg(short, long = "private-keys-count", default_value_t = 30)]
+    pub private_keys_to_add: usize,
+
     /// The differential testing leader node implementation.
     #[arg(short, long = "leader", default_value = "geth")]
     pub leader: TestingPlatform,

crates/core/src/main.rs

@@ -1,13 +1,5 @@
-use std::{
+use std::{collections::HashMap, sync::LazyLock};
-    collections::{HashMap, HashSet},
-    sync::LazyLock,
-};
 
-use alloy::{
-    network::TxSigner,
-    primitives::FixedBytes,
-    signers::{Signature, local::PrivateKeySigner},
-};
 use clap::Parser;
 use rayon::{ThreadPoolBuilder, prelude::*};
 
@@ -16,11 +8,7 @@ use revive_dt_core::{
     Geth, Kitchensink, Platform,
     driver::{Driver, State},
 };
-use revive_dt_format::{
+use revive_dt_format::{corpus::Corpus, metadata::MetadataFile};
-    corpus::Corpus,
-    input::default_caller,
-    metadata::{AddressReplacementMap, MetadataFile},
-};
 use revive_dt_node::pool::NodePool;
 use revive_dt_report::reporter::{Report, Span};
 use temp_dir::TempDir;
@@ -32,48 +20,12 @@ static TEMP_DIR: LazyLock<TempDir> = LazyLock::new(|| TempDir::new().unwrap());
 fn main() -> anyhow::Result<()> {
     let args = init_cli()?;
 
-    let mut corpora = collect_corpora(&args)?;
+    for (corpus, tests) in collect_corpora(&args)? {
-    let mut replacement_private_keys = HashSet::<FixedBytes<32>>::new();
-    for case in corpora
-        .values_mut()
-        .flat_map(|metadata| metadata.iter_mut())
-        .flat_map(|metadata| metadata.content.cases.iter_mut())
-    {
-        let mut replacement_map = AddressReplacementMap::new();
-        for address in case.inputs.iter().filter_map(|input| {
-            if input.caller != default_caller() {
-                Some(input.caller)
-            } else {
-                None
-            }
-        }) {
-            replacement_map.add(address);
-        }
-        case.handle_address_replacement(&mut replacement_map)?;
-        replacement_private_keys.extend(
-            replacement_map
-                .into_inner()
-                .into_values()
-                .map(|(sk, _)| sk)
-                .map(|sk| sk.to_bytes()),
-        );
-    }
-
-    for (corpus, tests) in corpora {
         let span = Span::new(corpus, args.clone())?;
 
         match &args.compile_only {
             Some(platform) => compile_corpus(&args, &tests, platform, span),
-            None => execute_corpus(
+            None => execute_corpus(&args, &tests, span)?,
-                &args,
-                &tests,
-                replacement_private_keys
-                    .clone()
-                    .into_iter()
-                    .map(|bytes| PrivateKeySigner::from_bytes(&bytes).expect("Can't fail"))
-                    .collect::<Vec<_>>(),
-                span,
-            )?,
         }
 
         Report::save()?;
@@ -131,24 +83,15 @@ fn collect_corpora(args: &Arguments) -> anyhow::Result<HashMap<Corpus, Vec<Metad
     Ok(corpora)
 }
 
-fn run_driver<L, F>(
+fn run_driver<L, F>(args: &Arguments, tests: &[MetadataFile], span: Span) -> anyhow::Result<()>
-    args: &Arguments,
-    tests: &[MetadataFile],
-    additional_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>
-    + Clone
-    + Send
-    + Sync
-    + 'static,
-    span: Span,
-) -> anyhow::Result<()>
 where
     L: Platform,
     F: Platform,
     L::Blockchain: revive_dt_node::Node + Send + Sync + 'static,
     F::Blockchain: revive_dt_node::Node + Send + Sync + 'static,
 {
-    let leader_nodes = NodePool::<L::Blockchain>::new(args, additional_signers.clone())?;
+    let leader_nodes = NodePool::<L::Blockchain>::new(args)?;
-    let follower_nodes = NodePool::<F::Blockchain>::new(args, additional_signers)?;
+    let follower_nodes = NodePool::<F::Blockchain>::new(args)?;
 
     tests.par_iter().for_each(
         |MetadataFile {
@@ -198,22 +141,13 @@ where
     Ok(())
 }
 
-fn execute_corpus(
+fn execute_corpus(args: &Arguments, tests: &[MetadataFile], span: Span) -> anyhow::Result<()> {
-    args: &Arguments,
-    tests: &[MetadataFile],
-    additional_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>
-    + Clone
-    + Send
-    + Sync
-    + 'static,
-    span: Span,
-) -> anyhow::Result<()> {
     match (&args.leader, &args.follower) {
         (TestingPlatform::Geth, TestingPlatform::Kitchensink) => {
-            run_driver::<Geth, Kitchensink>(args, tests, additional_signers, span)?
+            run_driver::<Geth, Kitchensink>(args, tests, span)?
         }
         (TestingPlatform::Geth, TestingPlatform::Geth) => {
-            run_driver::<Geth, Geth>(args, tests, additional_signers, span)?
+            run_driver::<Geth, Geth>(args, tests, span)?
         }
         _ => unimplemented!(),
     }

crates/format/src/case.rs

@@ -3,7 +3,6 @@ use serde::Deserialize;
 use crate::{
     define_wrapper_type,
     input::{Expected, Input},
-    metadata::AddressReplacementMap,
     mode::Mode,
 };
 
@@ -41,19 +40,6 @@ impl Case {
                 }
             })
     }
-
-    pub fn handle_address_replacement(
-        &mut self,
-        old_to_new_mapping: &mut AddressReplacementMap,
-    ) -> anyhow::Result<()> {
-        for input in self.inputs.iter_mut() {
-            input.handle_address_replacement(old_to_new_mapping)?;
-        }
-        if let Some(ref mut expected) = self.expected {
-            expected.handle_address_replacement(old_to_new_mapping)?;
-        }
-        Ok(())
-    }
 }
 
 define_wrapper_type!(

crates/format/src/input.rs

@@ -13,10 +13,7 @@ use serde::{Deserialize, Serialize};
 
 use revive_dt_node_interaction::EthereumNode;
 
-use crate::{
+use crate::{define_wrapper_type, metadata::ContractInstance};
-    define_wrapper_type,
-    metadata::{AddressReplacementMap, ContractInstance},
-};
 
 #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)]
 pub struct Input {
@@ -135,41 +132,6 @@ impl ExpectedOutput {
         self.return_data = Some(calldata);
         self
     }
-
-    pub fn handle_address_replacement(
-        &mut self,
-        old_to_new_mapping: &AddressReplacementMap,
-    ) -> anyhow::Result<()> {
-        if let Some(ref mut calldata) = self.return_data {
-            calldata.handle_address_replacement(old_to_new_mapping)?;
-        }
-        if let Some(ref mut events) = self.events {
-            for event in events.iter_mut() {
-                event.handle_address_replacement(old_to_new_mapping)?;
-            }
-        }
-        Ok(())
-    }
-}
-
-impl Event {
-    pub fn handle_address_replacement(
-        &mut self,
-        old_to_new_mapping: &AddressReplacementMap,
-    ) -> anyhow::Result<()> {
-        if let Some(ref mut address) = self.address {
-            if let Some(new_address) = old_to_new_mapping.resolve(address.to_string().as_str()) {
-                *address = new_address
-            }
-        };
-        for topic in self.topics.iter_mut() {
-            if let Some(new_address) = old_to_new_mapping.resolve(topic.to_string().as_str()) {
-                *topic = new_address.to_string();
-            }
-        }
-        self.values.handle_address_replacement(old_to_new_mapping)?;
-        Ok(())
-    }
 }
 
 impl Default for Calldata {
@@ -189,23 +151,6 @@ impl Calldata {
         }
     }
 
-    pub fn handle_address_replacement(
-        &mut self,
-        old_to_new_mapping: &AddressReplacementMap,
-    ) -> anyhow::Result<()> {
-        match self {
-            Calldata::Single(_) => {}
-            Calldata::Compound(items) => {
-                for item in items.iter_mut() {
-                    if let Some(resolved) = old_to_new_mapping.resolve(item) {
-                        *item = resolved.to_string()
-                    }
-                }
-            }
-        }
-        Ok(())
-    }
-
     pub fn calldata(
         &self,
         deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
@@ -251,28 +196,6 @@ impl Calldata {
     }
 }
 
-impl Expected {
-    pub fn handle_address_replacement(
-        &mut self,
-        old_to_new_mapping: &AddressReplacementMap,
-    ) -> anyhow::Result<()> {
-        match self {
-            Expected::Calldata(calldata) => {
-                calldata.handle_address_replacement(old_to_new_mapping)?;
-            }
-            Expected::Expected(expected_output) => {
-                expected_output.handle_address_replacement(old_to_new_mapping)?;
-            }
-            Expected::ExpectedMany(expected_outputs) => {
-                for expected_output in expected_outputs.iter_mut() {
-                    expected_output.handle_address_replacement(old_to_new_mapping)?;
-                }
-            }
-        }
-        Ok(())
-    }
-}
-
 impl Input {
     fn instance_to_address(
         &self,
@@ -379,26 +302,6 @@ impl Input {
 
         vec
     }
-
-    pub fn handle_address_replacement(
-        &mut self,
-        old_to_new_mapping: &mut AddressReplacementMap,
-    ) -> anyhow::Result<()> {
-        if self.caller != default_caller() {
-            self.caller = old_to_new_mapping.add(self.caller);
-        }
-        self.calldata
-            .handle_address_replacement(old_to_new_mapping)?;
-        if let Some(ref mut expected) = self.expected {
-            expected.handle_address_replacement(old_to_new_mapping)?;
-        }
-        if let Some(ref mut storage) = self.storage {
-            for calldata in storage.values_mut() {
-                calldata.handle_address_replacement(old_to_new_mapping)?;
-            }
-        }
-        Ok(())
-    }
 }
 
 fn default_instance() -> ContractInstance {
@@ -419,7 +322,7 @@ pub const fn default_caller() -> Address {
 /// This piece of code is taken from the matter-labs-tester repository which is licensed under MIT
 /// or Apache. The original source code can be found here:
 /// https://github.com/matter-labs/era-compiler-tester/blob/0ed598a27f6eceee7008deab3ff2311075a2ec69/compiler_tester/src/test/case/input/value.rs#L43-L146
-pub fn resolve_argument(
+fn resolve_argument(
     value: &str,
     deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
     chain_state_provider: &impl EthereumNode,

crates/format/src/metadata.rs

@@ -1,5 +1,5 @@
 use std::{
-    collections::{BTreeMap, HashMap},
+    collections::BTreeMap,
     fmt::Display,
     fs::{File, read_to_string},
     ops::Deref,
@@ -7,15 +7,11 @@ use std::{
     str::FromStr,
 };
 
-use alloy::signers::local::PrivateKeySigner;
-use alloy_primitives::Address;
-use revive_dt_node_interaction::EthereumNode;
 use serde::{Deserialize, Serialize};
 
 use crate::{
     case::Case,
     define_wrapper_type,
-    input::resolve_argument,
     mode::{Mode, SolcMode},
 };
 
@@ -215,17 +211,6 @@ impl Metadata {
             }
         }
     }
-
-    pub fn handle_address_replacement(
-        &mut self,
-        old_to_new_mapping: &mut AddressReplacementMap,
-    ) -> anyhow::Result<()> {
-        for case in self.cases.iter_mut() {
-            case.handle_address_replacement(old_to_new_mapping)?;
-        }
-        tracing::debug!(metadata = ?self, "Performed replacement on metadata");
-        Ok(())
-    }
 }
 
 define_wrapper_type!(
@@ -324,129 +309,6 @@ impl From<ContractPathAndIdentifier> for String {
     }
 }
 
-#[derive(Clone, Debug, Default)]
-pub struct AddressReplacementMap(HashMap<Address, (PrivateKeySigner, Address)>);
-
-impl AddressReplacementMap {
-    pub fn new() -> Self {
-        Self(Default::default())
-    }
-
-    pub fn into_inner(self) -> HashMap<Address, (PrivateKeySigner, Address)> {
-        self.0
-    }
-
-    pub fn contains_key(&self, address: &Address) -> bool {
-        self.0.contains_key(address)
-    }
-
-    pub fn add(&mut self, address: Address) -> Address {
-        self.0
-            .entry(address)
-            .or_insert_with(|| {
-                let private_key = Self::new_random_private_key_signer();
-                let account = private_key.address();
-                tracing::debug!(
-                    old_address = %address,
-                    new_address = %account,
-                    "Added a new address replacement"
-                );
-                (private_key, account)
-            })
-            .1
-    }
-
-    pub fn resolve(&self, value: &str) -> Option<Address> {
-        // We attempt to resolve the given string without any additional context of the deployed
-        // contracts or the node API as we do not need them. If the resolution fails then we know
-        // that this isn't an address and we skip it.
-        let Ok(resolved) = resolve_argument(value, &Default::default(), &UnimplementedEthereumNode)
-        else {
-            return None;
-        };
-        let resolved_bytes = resolved.to_be_bytes_trimmed_vec();
-        let Ok(address) = Address::try_from(resolved_bytes.as_slice()) else {
-            return None;
-        };
-        self.0.get(&address).map(|(_, address)| *address)
-    }
-
-    fn new_random_private_key_signer() -> PrivateKeySigner {
-        // TODO: Use a seedable RNG to allow for deterministic allocation of the private keys so
-        // that we get reproducible runs.
-        PrivateKeySigner::random()
-    }
-}
-
-impl AsRef<HashMap<Address, (PrivateKeySigner, Address)>> for AddressReplacementMap {
-    fn as_ref(&self) -> &HashMap<Address, (PrivateKeySigner, Address)> {
-        &self.0
-    }
-}
-
-struct UnimplementedEthereumNode;
-
-impl EthereumNode for UnimplementedEthereumNode {
-    fn execute_transaction(
-        &self,
-        _: alloy::rpc::types::TransactionRequest,
-    ) -> anyhow::Result<alloy::rpc::types::TransactionReceipt> {
-        anyhow::bail!("Unimplemented")
-    }
-
-    fn chain_id(&self) -> anyhow::Result<alloy_primitives::ChainId> {
-        anyhow::bail!("Unimplemented")
-    }
-
-    fn block_gas_limit(&self, _: alloy::eips::BlockNumberOrTag) -> anyhow::Result<u128> {
-        anyhow::bail!("Unimplemented")
-    }
-
-    fn block_coinbase(&self, _: alloy::eips::BlockNumberOrTag) -> anyhow::Result<Address> {
-        anyhow::bail!("Unimplemented")
-    }
-
-    fn block_difficulty(
-        &self,
-        _: alloy::eips::BlockNumberOrTag,
-    ) -> anyhow::Result<alloy_primitives::U256> {
-        anyhow::bail!("Unimplemented")
-    }
-
-    fn block_hash(
-        &self,
-        _: alloy::eips::BlockNumberOrTag,
-    ) -> anyhow::Result<alloy_primitives::BlockHash> {
-        anyhow::bail!("Unimplemented")
-    }
-
-    fn block_timestamp(
-        &self,
-        _: alloy::eips::BlockNumberOrTag,
-    ) -> anyhow::Result<alloy_primitives::BlockTimestamp> {
-        anyhow::bail!("Unimplemented")
-    }
-
-    fn last_block_number(&self) -> anyhow::Result<alloy_primitives::BlockNumber> {
-        anyhow::bail!("Unimplemented")
-    }
-
-    fn trace_transaction(
-        &self,
-        _: &alloy::rpc::types::TransactionReceipt,
-        _: alloy::rpc::types::trace::geth::GethDebugTracingOptions,
-    ) -> anyhow::Result<alloy::rpc::types::trace::geth::GethTrace> {
-        anyhow::bail!("Unimplemented")
-    }
-
-    fn state_diff(
-        &self,
-        _: &alloy::rpc::types::TransactionReceipt,
-    ) -> anyhow::Result<alloy::rpc::types::trace::geth::DiffMode> {
-        anyhow::bail!("Unimplemented")
-    }
-}
-
 #[cfg(test)]
 mod test {
     use super::*;

crates/node/src/geth.rs

@@ -12,8 +12,8 @@ use std::{
 use alloy::{
     eips::BlockNumberOrTag,
     genesis::{Genesis, GenesisAccount},
-    network::{Ethereum, EthereumWallet, NetworkWallet, TxSigner},
+    network::{Ethereum, EthereumWallet, NetworkWallet},
-    primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, U256},
+    primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, FixedBytes, U256},
     providers::{
         Provider, ProviderBuilder,
         ext::DebugApi,
@@ -23,7 +23,7 @@ use alloy::{
         TransactionReceipt, TransactionRequest,
         trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame},
     },
-    signers::Signature,
+    signers::local::PrivateKeySigner,
 };
 use revive_dt_config::Arguments;
 use revive_dt_node_interaction::{BlockingExecutor, EthereumNode};
@@ -435,16 +435,17 @@ impl EthereumNode for Instance {
 }
 
 impl Node for Instance {
-    fn new(
+    fn new(config: &Arguments) -> Self {
-        config: &Arguments,
-        additional_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>,
-    ) -> Self {
         let geth_directory = config.directory().join(Self::BASE_DIRECTORY);
         let id = NODE_COUNT.fetch_add(1, Ordering::SeqCst);
         let base_directory = geth_directory.join(id.to_string());
 
         let mut wallet = config.wallet();
-        for signer in additional_signers {
+        for signer in (1..=config.private_keys_to_add)
+            .map(|id| U256::from(id))
+            .map(|id| id.to_be_bytes::<32>())
+            .map(|id| PrivateKeySigner::from_bytes(&FixedBytes(id)).unwrap())
+        {
             wallet.register_signer(signer);
         }
 
@@ -532,7 +533,6 @@ impl Drop for Instance {
 mod tests {
     use revive_dt_config::Arguments;
 
-    use alloy::signers::local::PrivateKeySigner;
     use temp_dir::TempDir;
 
     use crate::{GENESIS_JSON, Node};
@@ -549,7 +549,7 @@ mod tests {
 
     fn new_node() -> (Instance, TempDir) {
         let (args, temp_dir) = test_config();
-        let mut node = Instance::new(&args, Vec::<PrivateKeySigner>::with_capacity(0));
+        let mut node = Instance::new(&args);
         node.init(GENESIS_JSON.to_owned())
             .expect("Failed to initialize the node")
             .spawn_process()
@@ -559,23 +559,21 @@ mod tests {
 
     #[test]
     fn init_works() {
-        Instance::new(&test_config().0, Vec::<PrivateKeySigner>::with_capacity(0))
+        Instance::new(&test_config().0)
             .init(GENESIS_JSON.to_string())
             .unwrap();
     }
 
     #[test]
     fn spawn_works() {
-        Instance::new(&test_config().0, Vec::<PrivateKeySigner>::with_capacity(0))
+        Instance::new(&test_config().0)
             .spawn(GENESIS_JSON.to_string())
             .unwrap();
     }
 
     #[test]
     fn version_works() {
-        let version = Instance::new(&test_config().0, Vec::<PrivateKeySigner>::with_capacity(0))
+        let version = Instance::new(&test_config().0).version().unwrap();
-            .version()
-            .unwrap();
         assert!(
             version.starts_with("geth version"),
             "expected version string, got: '{version}'"

crates/node/src/kitchensink.rs

@@ -13,9 +13,11 @@ use alloy::{
     genesis::{Genesis, GenesisAccount},
     network::{
         Ethereum, EthereumWallet, Network, NetworkWallet, TransactionBuilder,
-        TransactionBuilderError, TxSigner, UnbuiltTransactionError,
+        TransactionBuilderError, UnbuiltTransactionError,
+    },
+    primitives::{
+        Address, B64, B256, BlockHash, BlockNumber, BlockTimestamp, Bloom, Bytes, FixedBytes, U256,
     },
-    primitives::{Address, B64, B256, BlockHash, BlockNumber, BlockTimestamp, Bloom, Bytes, U256},
     providers::{
         Provider, ProviderBuilder,
         ext::DebugApi,
@@ -26,7 +28,7 @@ use alloy::{
         eth::{Block, Header, Transaction},
         trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame},
     },
-    signers::Signature,
+    signers::local::PrivateKeySigner,
 };
 use serde::{Deserialize, Serialize};
 use serde_json::{Value as JsonValue, json};
@@ -504,17 +506,18 @@ impl EthereumNode for KitchensinkNode {
 }
 
 impl Node for KitchensinkNode {
-    fn new(
+    fn new(config: &Arguments) -> Self {
-        config: &Arguments,
-        additional_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>,
-    ) -> Self {
         let kitchensink_directory = config.directory().join(Self::BASE_DIRECTORY);
         let id = NODE_COUNT.fetch_add(1, Ordering::SeqCst);
         let base_directory = kitchensink_directory.join(id.to_string());
         let logs_directory = base_directory.join(Self::LOGS_DIRECTORY);
 
         let mut wallet = config.wallet();
-        for signer in additional_signers {
+        for signer in (1..=config.private_keys_to_add)
+            .map(|id| U256::from(id))
+            .map(|id| id.to_be_bytes::<32>())
+            .map(|id| PrivateKeySigner::from_bytes(&FixedBytes(id)).unwrap())
+        {
             wallet.register_signer(signer);
         }
 
@@ -1030,7 +1033,7 @@ impl BlockHeader for KitchenSinkHeader {
 
 #[cfg(test)]
 mod tests {
-    use alloy::{rpc::types::TransactionRequest, signers::local::PrivateKeySigner};
+    use alloy::rpc::types::TransactionRequest;
     use revive_dt_config::Arguments;
     use std::path::PathBuf;
     use std::sync::{LazyLock, Mutex};
@@ -1073,7 +1076,7 @@ mod tests {
         let _guard = NODE_START_MUTEX.lock().unwrap();
 
         let (args, temp_dir) = test_config();
-        let mut node = KitchensinkNode::new(&args, Vec::<PrivateKeySigner>::with_capacity(0));
+        let mut node = KitchensinkNode::new(&args);
         node.init(GENESIS_JSON)
             .expect("Failed to initialize the node")
             .spawn_process()
@@ -1128,8 +1131,7 @@ mod tests {
         }
         "#;
 
-        let mut dummy_node =
+        let mut dummy_node = KitchensinkNode::new(&test_config().0);
-            KitchensinkNode::new(&test_config().0, Vec::<PrivateKeySigner>::with_capacity(0));
 
         // Call `init()`
         dummy_node.init(genesis_content).expect("init failed");
@@ -1173,8 +1175,7 @@ mod tests {
         }
         "#;
 
-        let node =
+        let node = KitchensinkNode::new(&test_config().0);
-            KitchensinkNode::new(&test_config().0, Vec::<PrivateKeySigner>::with_capacity(0));
 
         let result = node
             .extract_balance_from_genesis_file(&serde_json::from_str(genesis_json).unwrap())
@@ -1247,7 +1248,7 @@ mod tests {
     fn spawn_works() {
         let (config, _temp_dir) = test_config();
 
-        let mut node = KitchensinkNode::new(&config, Vec::<PrivateKeySigner>::with_capacity(0));
+        let mut node = KitchensinkNode::new(&config);
         node.spawn(GENESIS_JSON.to_string()).unwrap();
     }
 
@@ -1255,7 +1256,7 @@ mod tests {
     fn version_works() {
         let (config, _temp_dir) = test_config();
 
-        let node = KitchensinkNode::new(&config, Vec::<PrivateKeySigner>::with_capacity(0));
+        let node = KitchensinkNode::new(&config);
         let version = node.version().unwrap();
 
         assert!(
@@ -1268,7 +1269,7 @@ mod tests {
     fn eth_rpc_version_works() {
         let (config, _temp_dir) = test_config();
 
-        let node = KitchensinkNode::new(&config, Vec::<PrivateKeySigner>::with_capacity(0));
+        let node = KitchensinkNode::new(&config);
         let version = node.eth_rpc_version().unwrap();
 
         assert!(

crates/node/src/lib.rs

@@ -1,6 +1,5 @@
 //! This crate implements the testing nodes.
 
-use alloy::{network::TxSigner, signers::Signature};
 use revive_dt_config::Arguments;
 use revive_dt_node_interaction::EthereumNode;
 
@@ -15,10 +14,7 @@ pub const GENESIS_JSON: &str = include_str!("../../../genesis.json");
 /// An abstract interface for testing nodes.
 pub trait Node: EthereumNode {
     /// Create a new uninitialized instance.
-    fn new(
+    fn new(config: &Arguments) -> Self;
-        config: &Arguments,
-        additional_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>,
-    ) -> Self;
 
     /// Spawns a node configured according to the genesis json.
     ///

crates/node/src/pool.rs

@@ -6,7 +6,6 @@ use std::{
     thread,
 };
 
-use alloy::{network::TxSigner, signers::Signature};
 use anyhow::Context;
 use revive_dt_config::Arguments;
 
@@ -24,14 +23,7 @@ where
     T: Node + Send + 'static,
 {
     /// Create a new Pool. This will start as many nodes as there are workers in `config`.
-    pub fn new(
+    pub fn new(config: &Arguments) -> anyhow::Result<Self> {
-        config: &Arguments,
-        additional_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>
-        + Clone
-        + Send
-        + Sync
-        + 'static,
-    ) -> anyhow::Result<Self> {
         let nodes = config.workers;
         let genesis = read_to_string(&config.genesis_file).context(format!(
             "can not read genesis file: {}",
@@ -42,10 +34,7 @@ where
         for _ in 0..nodes {
             let config = config.clone();
             let genesis = genesis.clone();
-            let additional_signers = additional_signers.clone();
+            handles.push(thread::spawn(move || spawn_node::<T>(&config, genesis)));
-            handles.push(thread::spawn(move || {
-                spawn_node::<T>(&config, additional_signers, genesis)
-            }));
         }
 
         let mut nodes = Vec::with_capacity(nodes);
@@ -71,12 +60,8 @@ where
     }
 }
 
-fn spawn_node<T: Node + Send>(
+fn spawn_node<T: Node + Send>(args: &Arguments, genesis: String) -> anyhow::Result<T> {
-    args: &Arguments,
+    let mut node = T::new(args);
-    additional_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>,
-    genesis: String,
-) -> anyhow::Result<T> {
-    let mut node = T::new(args, additional_signers);
     tracing::info!("starting node: {}", node.connection_string());
     node.spawn(genesis)?;
     Ok(node)