mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-03 00:31:50 +00:00
Upgrade dependencies (#2513)
## Proposed Changes
* Consolidate Tokio versions: everything now uses the latest v1.10.0, no more `tokio-compat`.
* Many semver-compatible changes via `cargo update`. Notably this upgrades from the yanked v0.8.0 version of crossbeam-deque which is present in v1.5.0-rc.0
* Many semver incompatible upgrades via `cargo upgrades` and `cargo upgrade --workspace pkg_name`. Notable ommissions:
- Prometheus, to be handled separately: https://github.com/sigp/lighthouse/issues/2485
- `rand`, `rand_xorshift`: the libsecp256k1 package requires 0.7.x, so we'll stick with that for now
- `ethereum-types` is pinned at 0.11.0 because that's what `web3` is using and it seems nice to have just a single version
## Additional Info
We still have two versions of `libp2p-core` due to `discv5` depending on the v0.29.0 release rather than `master`. AFAIK it should be OK to release in this state (cc @AgeManning )
This commit is contained in:
@@ -4,7 +4,6 @@ use std::io::BufReader;
|
||||
use std::net::TcpListener;
|
||||
use std::process::{Child, Command, Stdio};
|
||||
use std::time::{Duration, Instant};
|
||||
use tokio_compat_02::FutureExt;
|
||||
use web3::{transports::Http, Transport, Web3};
|
||||
|
||||
/// How long we will wait for ganache to indicate that it is ready.
|
||||
@@ -156,7 +155,6 @@ impl GanacheInstance {
|
||||
self.web3
|
||||
.transport()
|
||||
.execute("evm_increaseTime", vec![json!(increase_by)])
|
||||
.compat()
|
||||
.await
|
||||
.map(|_json_value| ())
|
||||
.map_err(|e| format!("Failed to increase time on EVM (is this ganache?): {:?}", e))
|
||||
@@ -167,7 +165,6 @@ impl GanacheInstance {
|
||||
self.web3
|
||||
.eth()
|
||||
.block_number()
|
||||
.compat()
|
||||
.await
|
||||
.map(|v| v.as_u64())
|
||||
.map_err(|e| format!("Failed to get block number: {:?}", e))
|
||||
@@ -178,7 +175,6 @@ impl GanacheInstance {
|
||||
self.web3
|
||||
.transport()
|
||||
.execute("evm_mine", vec![])
|
||||
.compat()
|
||||
.await
|
||||
.map(|_| ())
|
||||
.map_err(|_| {
|
||||
|
||||
@@ -13,7 +13,6 @@ use deposit_contract::{
|
||||
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};
|
||||
@@ -182,7 +181,6 @@ impl DepositContract {
|
||||
.web3
|
||||
.eth()
|
||||
.accounts()
|
||||
.compat()
|
||||
.await
|
||||
.map_err(|e| format!("Failed to get accounts: {:?}", e))
|
||||
.and_then(|accounts| {
|
||||
@@ -213,7 +211,6 @@ impl DepositContract {
|
||||
self.web3
|
||||
.eth()
|
||||
.send_transaction(tx_request)
|
||||
.compat()
|
||||
.await
|
||||
.map_err(|e| format!("Failed to call deposit fn: {:?}", e))?;
|
||||
Ok(())
|
||||
@@ -257,7 +254,6 @@ async fn deploy_deposit_contract(
|
||||
let from_address = web3
|
||||
.eth()
|
||||
.accounts()
|
||||
.compat()
|
||||
.await
|
||||
.map_err(|e| format!("Failed to get accounts: {:?}", e))
|
||||
.and_then(|accounts| {
|
||||
@@ -271,7 +267,6 @@ async fn deploy_deposit_contract(
|
||||
let result = web3
|
||||
.personal()
|
||||
.unlock_account(from_address, &password, None)
|
||||
.compat()
|
||||
.await;
|
||||
match result {
|
||||
Ok(true) => return Ok(from_address),
|
||||
@@ -292,7 +287,6 @@ async fn deploy_deposit_contract(
|
||||
.execute(bytecode, (), deploy_address);
|
||||
|
||||
pending_contract
|
||||
.compat()
|
||||
.await
|
||||
.map(|contract| contract.address())
|
||||
.map_err(|e| format!("Unable to resolve pending contract: {:?}", e))
|
||||
|
||||
Reference in New Issue
Block a user