LumeWeb
/
ethers-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: update geth.rs

This commit is contained in:
DaniPopes 2023-02-24 23:44:24 +01:00
parent 5ca98643a6
commit e0e7876af1
No known key found for this signature in database
GPG Key ID: 0F09640DDB7AC692
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ethers-core/src/utils/geth.rs
View File

@ -1,10 +1,9 @@
use k256::ecdsa::SigningKey; use super::{unused_port, CliqueConfig, Genesis};
use super::{unused_port, Genesis};
use crate::{ use crate::{
types::{Bytes, H256}, types::{Bytes, H256},
utils::secret_key_to_address, utils::secret_key_to_address,
}; };
use k256::ecdsa::SigningKey;
use std::{ use std::{
fs::{create_dir, File}, fs::{create_dir, File},
io::{BufRead, BufReader}, io::{BufRead, BufReader},
@ -15,10 +14,10 @@ use std::{
use tempfile::tempdir; use tempfile::tempdir;
/// How long we will wait for geth to indicate that it is ready. /// How long we will wait for geth to indicate that it is ready.
const GETH_STARTUP_TIMEOUT_MILLIS: u64 = 10_000; const GETH_STARTUP_TIMEOUT: Duration = Duration::from_secs(10);
/// Timeout for waiting for geth to add a peer. /// Timeout for waiting for geth to add a peer.
const GETH_DIAL_LOOP_TIMEOUT: Duration = Duration::new(20, 0); const GETH_DIAL_LOOP_TIMEOUT: Duration = Duration::from_secs(20);
/// The exposed APIs /// The exposed APIs
const API: &str = "eth,net,web3,txpool,admin,personal,miner,debug"; const API: &str = "eth,net,web3,txpool,admin,personal,miner,debug";
@ -351,11 +350,16 @@ impl Geth {
self self
} }
/// Consumes the builder and spawns `geth` with stdout redirected /// Consumes the builder and spawns `geth` with stdout redirected to /dev/null.
/// to /dev/null. #[must_use]
#[track_caller]
pub fn spawn(mut self) -> GethInstance { pub fn spawn(mut self) -> GethInstance {
let mut cmd = let bin_path = match self.program.as_ref() {
if let Some(ref prg) = self.program { Command::new(prg) } else { Command::new(GETH) }; Some(bin) => bin.as_os_str(),
None => GETH.as_ref(),
}
.to_os_string();
let mut cmd = Command::new(&bin_path);
// geth uses stderr for its logs // geth uses stderr for its logs
cmd.stderr(Stdio::piped()); cmd.stderr(Stdio::piped());
let port = if let Some(port) = self.port { port } else { unused_port() }; let port = if let Some(port) = self.port { port } else { unused_port() };
@ -387,7 +391,6 @@ impl Geth {
// use geth init to initialize the datadir if the genesis exists // use geth init to initialize the datadir if the genesis exists
if let Some(ref mut genesis) = self.genesis { if let Some(ref mut genesis) = self.genesis {
if is_clique { if is_clique {
use super::CliqueConfig;
// set up a clique config with an instant sealing period and short (8 block) epoch // set up a clique config with an instant sealing period and short (8 block) epoch
let clique_config = CliqueConfig { period: Some(0), epoch: Some(8) }; let clique_config = CliqueConfig { period: Some(0), epoch: Some(8) };
genesis.config.clique = Some(clique_config); genesis.config.clique = Some(clique_config);
@ -427,7 +430,7 @@ impl Geth {
serde_json::to_writer_pretty(&mut file, &genesis) serde_json::to_writer_pretty(&mut file, &genesis)
.expect("could not write genesis to file"); .expect("could not write genesis to file");
let mut init_cmd = Command::new(GETH); let mut init_cmd = Command::new(bin_path);
if let Some(ref data_dir) = self.data_dir { if let Some(ref data_dir) = self.data_dir {
init_cmd.arg("--datadir").arg(data_dir); init_cmd.arg("--datadir").arg(data_dir);
} }
@ -501,11 +504,11 @@ impl Geth {
let mut http_started = false; let mut http_started = false;
loop { loop {
if start + Duration::from_millis(GETH_STARTUP_TIMEOUT_MILLIS) <= Instant::now() { if start + GETH_STARTUP_TIMEOUT <= Instant::now() {
panic!("Timed out waiting for geth to start. Is geth installed?") panic!("Timed out waiting for geth to start. Is geth installed?")
} }
let mut line = String::new(); let mut line = String::with_capacity(120);
reader.read_line(&mut line).expect("Failed to read line from geth process"); reader.read_line(&mut line).expect("Failed to read line from geth process");
if matches!(self.mode, GethMode::NonDev(_)) && line.contains("Started P2P networking") { if matches!(self.mode, GethMode::NonDev(_)) && line.contains("Started P2P networking") {