mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-02 16:21:42 +00:00
Update dependencies (#2084)
## Issue Addressed Partially addresses dependencies mentioned in issue #1712. ## Proposed Changes Updates dependencies (including an update avoiding a vulnerability) + add tokio compatibility to `remote_signer_test`
This commit is contained in:
@@ -7,7 +7,7 @@ edition = "2018"
|
||||
[dependencies]
|
||||
tokio = { version = "0.3.2", features = ["time"] }
|
||||
tokio-compat-02 = "0.1"
|
||||
web3 = "0.13.0"
|
||||
web3 = "0.14.0"
|
||||
futures = "0.3.7"
|
||||
types = { path = "../../consensus/types"}
|
||||
serde_json = "1.0.58"
|
||||
|
||||
@@ -287,8 +287,7 @@ async fn deploy_deposit_contract(
|
||||
gas: Some(U256::from(CONTRACT_DEPLOY_GAS)),
|
||||
..Options::default()
|
||||
})
|
||||
.execute(bytecode, (), deploy_address)
|
||||
.map_err(|e| format!("Failed to execute deployment: {:?}", e))?;
|
||||
.execute(bytecode, (), deploy_address);
|
||||
|
||||
pending_contract
|
||||
.compat()
|
||||
|
||||
@@ -15,5 +15,6 @@ reqwest = { version = "0.10.8", features = ["blocking", "json"] }
|
||||
serde = { version = "1.0.116", features = ["derive"] }
|
||||
serde_json = "1.0.58"
|
||||
tempdir = "0.3.7"
|
||||
tokio = { version = "0.2.22", features = ["time"] }
|
||||
tokio = { version = "0.3.5", features = ["time"] }
|
||||
types = { path = "../../consensus/types" }
|
||||
tokio-compat-02 = "0.1"
|
||||
|
||||
@@ -26,7 +26,10 @@ impl ApiTestSigner<E> {
|
||||
|
||||
let client = environment
|
||||
.runtime()
|
||||
.block_on(Client::new(runtime_context, &matches))
|
||||
.block_on(tokio_compat_02::FutureExt::compat(Client::new(
|
||||
runtime_context,
|
||||
&matches,
|
||||
)))
|
||||
.map_err(|e| format!("Failed to init Rest API: {}", e))
|
||||
.unwrap();
|
||||
|
||||
|
||||
@@ -28,19 +28,15 @@ pub fn do_sign_request<E: EthSpec, T: RemoteSignerObject>(
|
||||
test_client: &RemoteSignerHttpConsumer,
|
||||
test_input: RemoteSignerTestData<E, T>,
|
||||
) -> Result<String, Error> {
|
||||
let mut runtime = Builder::new()
|
||||
.basic_scheduler()
|
||||
.enable_all()
|
||||
.build()
|
||||
.unwrap();
|
||||
let runtime = Builder::new_multi_thread().enable_all().build().unwrap();
|
||||
|
||||
runtime.block_on(test_client.sign(
|
||||
runtime.block_on(tokio_compat_02::FutureExt::compat(test_client.sign(
|
||||
&test_input.public_key,
|
||||
test_input.bls_domain,
|
||||
test_input.data,
|
||||
test_input.fork,
|
||||
test_input.genesis_validators_root,
|
||||
))
|
||||
)))
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
|
||||
Reference in New Issue
Block a user