mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-02 16:21:42 +00:00
Improve compile time (#1989)
## Issue Addressed Closes #1264 ## Proposed Changes * Milagro BLS: tweak the feature flags so that Milagro doesn't get compiled if we're using BLST. Profiling showed that it was consuming about 1 minute of CPU time out of 60 minutes of CPU time (real time ~15 mins). A 1.6% saving. * Reduce monomorphization: compiling for 3 different `EthSpec` types causes a heck of a lot of generic functions to be instantiated (monomorphized). Removing 2 of 3 cuts the LLVM+linking step from around 250 seconds to 180 seconds, a saving of 70 seconds (real time!). This applies only to `make` and not the CI build, because we test with the minimal spec on CI. * Update `web3` crate to v0.13. This is perhaps the most controversial change, because it requires axing some deposit contract tools from `lcli`. I suspect these tools weren't used much anyway, and could be maintained separately, but I'm also happy to revert this change. However, it does save us a lot of compile time. With #1839, we now have 3 versions of Tokio (and all of Tokio's deps). This change brings us down to 2 versions, but 1 should be achievable once web3 (and reqwest) move to Tokio 0.3. * Remove `lcli` from the Docker image. It's a dev tool and can be built from the repo if required.
This commit is contained in:
@@ -6,8 +6,9 @@ edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
tokio = { version = "0.3.2", features = ["time"] }
|
||||
web3 = "0.11.0"
|
||||
futures = { version = "0.3.7", features = ["compat"] }
|
||||
tokio-compat-02 = "0.1"
|
||||
web3 = "0.13.0"
|
||||
futures = "0.3.7"
|
||||
types = { path = "../../consensus/types"}
|
||||
serde_json = "1.0.58"
|
||||
deposit_contract = { path = "../../common/deposit_contract"}
|
||||
|
||||
@@ -1,15 +1,11 @@
|
||||
use futures::compat::Future01CompatExt;
|
||||
use serde_json::json;
|
||||
use std::io::prelude::*;
|
||||
use std::io::BufReader;
|
||||
use std::net::TcpListener;
|
||||
use std::process::{Child, Command, Stdio};
|
||||
use std::sync::Arc;
|
||||
use std::time::{Duration, Instant};
|
||||
use web3::{
|
||||
transports::{EventLoopHandle, Http},
|
||||
Transport, Web3,
|
||||
};
|
||||
use tokio_compat_02::FutureExt;
|
||||
use web3::{transports::Http, Transport, Web3};
|
||||
|
||||
/// How long we will wait for ganache to indicate that it is ready.
|
||||
const GANACHE_STARTUP_TIMEOUT_MILLIS: u64 = 10_000;
|
||||
@@ -20,7 +16,6 @@ const GANACHE_STARTUP_TIMEOUT_MILLIS: u64 = 10_000;
|
||||
pub struct GanacheInstance {
|
||||
pub port: u16,
|
||||
child: Child,
|
||||
_event_loop: Arc<EventLoopHandle>,
|
||||
pub web3: Web3<Http>,
|
||||
network_id: u64,
|
||||
chain_id: u64,
|
||||
@@ -56,7 +51,7 @@ impl GanacheInstance {
|
||||
}
|
||||
}?;
|
||||
|
||||
let (event_loop, transport) = Http::new(&endpoint(port)).map_err(|e| {
|
||||
let transport = Http::new(&endpoint(port)).map_err(|e| {
|
||||
format!(
|
||||
"Failed to start HTTP transport connected to ganache: {:?}",
|
||||
e
|
||||
@@ -69,7 +64,6 @@ impl GanacheInstance {
|
||||
Ok(Self {
|
||||
child,
|
||||
port,
|
||||
_event_loop: Arc::new(event_loop),
|
||||
web3,
|
||||
network_id,
|
||||
chain_id,
|
||||
|
||||
@@ -10,10 +10,10 @@ mod ganache;
|
||||
use deposit_contract::{
|
||||
encode_eth1_tx_data, testnet, ABI, BYTECODE, CONTRACT_DEPLOY_GAS, DEPOSIT_GAS,
|
||||
};
|
||||
use futures::compat::Future01CompatExt;
|
||||
use ganache::GanacheInstance;
|
||||
use std::time::Duration;
|
||||
use tokio::time::sleep;
|
||||
use tokio_compat_02::FutureExt;
|
||||
use types::DepositData;
|
||||
use types::{test_utils::generate_deterministic_keypair, EthSpec, Hash256, Keypair, Signature};
|
||||
use web3::contract::{Contract, Options};
|
||||
|
||||
Reference in New Issue
Block a user