From 255de530c394430e8776ab1a049dfa39cf22107e Mon Sep 17 00:00:00 2001
From: James Wilson <james@jsdw.me>
Date: Fri, 15 Aug 2025 16:32:41 +0100
Subject: [PATCH] remove --networkid and arg, back to 5s timeout for geth

---
 crates/config/src/lib.rs | 6 +-----
 crates/node/src/geth.rs  | 4 ----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/crates/config/src/lib.rs b/crates/config/src/lib.rs
index 8787b71..e4fb409 100644
--- a/crates/config/src/lib.rs
+++ b/crates/config/src/lib.rs
@@ -55,13 +55,9 @@ pub struct Arguments {
     pub geth: PathBuf,
 
     /// The maximum time in milliseconds to wait for geth to start.
-    #[arg(long = "geth-start-timeout", default_value = "30000")]
+    #[arg(long = "geth-start-timeout", default_value = "5000")]
     pub geth_start_timeout: u64,
 
-    /// The test network chain ID.
-    #[arg(short, long = "network-id", default_value = "420420420")]
-    pub network_id: u64,
-
     /// Configure nodes according to this genesis.json file.
     #[arg(long = "genesis", default_value = "genesis.json")]
     pub genesis_file: PathBuf,
diff --git a/crates/node/src/geth.rs b/crates/node/src/geth.rs
index 3ada731..6617351 100644
--- a/crates/node/src/geth.rs
+++ b/crates/node/src/geth.rs
@@ -60,7 +60,6 @@ pub struct GethNode {
     geth: PathBuf,
     id: u32,
     handle: Option<Child>,
-    network_id: u64,
     start_timeout: u64,
     wallet: EthereumWallet,
     nonce_manager: CachedNonceManager,
@@ -165,8 +164,6 @@ impl GethNode {
             .arg(&self.data_directory)
             .arg("--ipcpath")
             .arg(&self.connection_string)
-            .arg("--networkid")
-            .arg(self.network_id.to_string())
             .arg("--nodiscover")
             .arg("--maxpeers")
             .arg("0")
@@ -527,7 +524,6 @@ impl Node for GethNode {
             geth: config.geth.clone(),
             id,
             handle: None,
-            network_id: config.network_id,
             start_timeout: config.geth_start_timeout,
             wallet,
             // We know that we only need to be storing 2 files so we can specify that when creating