diff options
author | Antoine A <> | 2024-02-01 16:19:30 +0100 |
---|---|---|
committer | Antoine A <> | 2024-02-01 16:19:30 +0100 |
commit | 284b8388215ca402c08e2601ce44c0f113d98068 (patch) | |
tree | 52d604ad40a128920dae08467642383a71ccfb90 /instrumentation/src/eth.rs | |
parent | 52e7d8b74bdf30f0b718758dc3636d0ebe17c3cf (diff) | |
download | depolymerization-284b8388215ca402c08e2601ce44c0f113d98068.tar.gz depolymerization-284b8388215ca402c08e2601ce44c0f113d98068.tar.bz2 depolymerization-284b8388215ca402c08e2601ce44c0f113d98068.zip |
Test support for geth 1.13.11 and update dependencies
Diffstat (limited to 'instrumentation/src/eth.rs')
-rw-r--r-- | instrumentation/src/eth.rs | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/instrumentation/src/eth.rs b/instrumentation/src/eth.rs index 7d5c534..882c997 100644 --- a/instrumentation/src/eth.rs +++ b/instrumentation/src/eth.rs @@ -238,6 +238,7 @@ impl EthCtx { &[ "--datadir", ctx.wire_dir.to_str().unwrap(), + "--lightkdf", "account", "new", "--password", @@ -252,6 +253,7 @@ impl EthCtx { &[ "--datadir", ctx.wire_dir.to_str().unwrap(), + "--lightkdf", "account", "list", ], @@ -293,6 +295,7 @@ impl EthCtx { &[ "--datadir", ctx.wire_dir.to_str().unwrap(), + "--lightkdf", "init", ctx.wire_dir.join("genesis.json").to_str().unwrap(), ], @@ -304,6 +307,7 @@ impl EthCtx { &[ "--datadir", ctx.wire2_dir.to_str().unwrap(), + "--lightkdf", "init", ctx.wire_dir.join("genesis.json").to_str().unwrap(), ], @@ -315,6 +319,7 @@ impl EthCtx { &[ "--datadir", ctx.wire_dir.to_str().unwrap(), + "--lightkdf", "--miner.gasprice", "10", "--authrpc.port", @@ -420,6 +425,7 @@ impl EthCtx { self.ctx.wire2_dir.to_str().unwrap(), "--keystore", self.ctx.wire_dir.join("keystore").to_str().unwrap(), + "--lightkdf", "import", path, ], @@ -436,6 +442,7 @@ impl EthCtx { self.ctx.wire2_dir.to_str().unwrap(), "--keystore", self.ctx.wire_dir.join("keystore").to_str().unwrap(), + "--lightkdf", "--miner.gasprice", "10", "--authrpc.port", @@ -458,6 +465,7 @@ impl EthCtx { &[ "--datadir", self.ctx.wire_dir.to_str().unwrap(), + "--lightkdf", "import", path, ], @@ -473,22 +481,19 @@ impl EthCtx { } pub fn resume_node(&mut self, additional_args: &[&str]) { - let datadir = format!("-datadir={}", self.ctx.wire_dir.to_string_lossy()); - let mut args = vec![datadir.as_str()]; + let (pa, pb) = (unused_port().to_string(), unused_port().to_string()); + let mut args = vec![ + "--datadir", + self.ctx.wire_dir.to_str().unwrap(), + "--lightkdf", + "--authrpc.port", + &pa, + "--port", + &pb, + "--rpc.enabledeprecatedpersonal", + ]; args.extend_from_slice(additional_args); - self.node = cmd_redirect( - "geth", - &[ - "--datadir", - self.ctx.wire_dir.to_str().unwrap(), - "--authrpc.port", - &unused_port().to_string(), - "--port", - &unused_port().to_string(), - "--rpc.enabledeprecatedpersonal", - ], - &self.ctx.log("geth"), - ); + self.node = cmd_redirect("geth", &args, &self.ctx.log("geth")); self.rpc = retry_opt(|| Rpc::new(&self.ctx.wire_dir).ok()); for addr in [&self.wire_addr, &self.client_addr, &self.reserve_addr] { self.rpc.unlock_account(addr, &self.passwd).unwrap(); |