Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

bump a bunch of deps in parity-common #9263

Merged
8 commits merged into from
Jul 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 47 additions & 50 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions bin/node/bench/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ serde = "1.0.101"
serde_json = "1.0.41"
structopt = "0.3"
derive_more = "0.99.2"
kvdb = "0.9.0"
kvdb-rocksdb = "0.11.0"
kvdb = "0.10.0"
kvdb-rocksdb = "0.12.0"
sp-trie = { version = "3.0.0", path = "../../../primitives/trie" }
sp-core = { version = "3.0.0", path = "../../../primitives/core" }
sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
Expand All @@ -37,7 +37,7 @@ fs_extra = "1"
hex = "0.4.0"
rand = { version = "0.7.2", features = ["small_rng"] }
lazy_static = "1.4.0"
parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
parity-db = { version = "0.2.4" }
sc-transaction-pool = { version = "3.0.0", path = "../../../client/transaction-pool" }
futures = { version = "0.3.4", features = ["thread-pool"] }
4 changes: 4 additions & 0 deletions bin/node/browser-testing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@ futures = "0.3.9"

node-cli = { path = "../cli", default-features = false, features = ["browser"], version = "2.0.0"}
sc-rpc-api = { path = "../../../client/rpc-api", version = "0.9.0"}

# This is a HACK to make browser tests pass.
# enables [`instant/wasm_bindgen`]
parking_lot = { version = "0.11.1", features = ["wasm-bindgen"] }
1 change: 0 additions & 1 deletion bin/node/browser-testing/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ fn deserialize_rpc_result<T: DeserializeOwned>(js_value: JsValue) -> T {
#[wasm_bindgen_test]
async fn runs() {
let mut client = node_cli::start_client(None, "info".into())
.await
.unwrap();

// Check that the node handles rpc calls.
Expand Down
7 changes: 3 additions & 4 deletions bin/node/cli/src/browser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,12 @@ use browser_utils::{

/// Starts the client.
#[wasm_bindgen]
pub async fn start_client(chain_spec: Option<String>, log_level: String) -> Result<Client, JsValue> {
pub fn start_client(chain_spec: Option<String>, log_level: String) -> Result<Client, JsValue> {
start_inner(chain_spec, log_level)
.await
.map_err(|err| JsValue::from_str(&err.to_string()))
}

async fn start_inner(
fn start_inner(
chain_spec: Option<String>,
log_directives: String,
) -> Result<Client, Box<dyn std::error::Error>> {
Expand All @@ -44,7 +43,7 @@ async fn start_inner(
None => crate::chain_spec::development_config(),
};

let config = browser_configuration(chain_spec).await?;
let config = browser_configuration(chain_spec)?;

info!("Substrate browser node");
info!("✌️ version {}", config.impl_version);
Expand Down
4 changes: 2 additions & 2 deletions client/api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ futures = "0.3.1"
hash-db = { version = "0.15.2", default-features = false }
sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
sp-inherents = { version = "3.0.0", default-features = false, path = "../../primitives/inherents" }
kvdb = "0.9.0"
kvdb = "0.10.0"
log = "0.4.8"
parking_lot = "0.11.1"
lazy_static = "1.4.0"
Expand All @@ -43,7 +43,7 @@ sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-
prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }

[dev-dependencies]
kvdb-memorydb = "0.9.0"
kvdb-memorydb = "0.10.0"
sp-test-primitives = { version = "2.0.0", path = "../../primitives/test-primitives" }
substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime" }
thiserror = "1.0.21"
10 changes: 5 additions & 5 deletions client/db/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
parking_lot = "0.11.1"
log = "0.4.8"
kvdb = "0.9.0"
kvdb-rocksdb = { version = "0.11.0", optional = true }
kvdb-memorydb = "0.9.0"
kvdb = "0.10.0"
kvdb-rocksdb = { version = "0.12.0", optional = true }
kvdb-memorydb = "0.10.0"
linked-hash-map = "0.5.2"
hash-db = "0.15.2"
parity-util-mem = { version = "0.9.0", default-features = false, features = ["std"] }
parity-util-mem = { version = "0.10.0", default-features = false, features = ["std"] }
codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
blake2-rfc = "0.2.18"

Expand All @@ -43,7 +43,7 @@ sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
quickcheck = "1.0.3"
kvdb-rocksdb = "0.11.0"
kvdb-rocksdb = "0.12.0"
tempfile = "3"

[features]
Expand Down
2 changes: 1 addition & 1 deletion client/informant/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ansi_term = "0.12.1"
futures = "0.3.9"
futures-timer = "3.0.1"
log = "0.4.8"
parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
sc-client-api = { version = "3.0.0", path = "../api" }
sc-network = { version = "0.9.0", path = "../network" }
sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
Expand Down
2 changes: 1 addition & 1 deletion client/service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ sc-tracing = { version = "3.0.0", path = "../tracing" }
sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
tracing = "0.1.25"
tracing-futures = { version = "0.2.4" }
parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
async-trait = "0.1.42"

[target.'cfg(not(target_os = "unknown"))'.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion client/state-db/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ log = "0.4.11"
sc-client-api = { version = "3.0.0", path = "../api" }
sp-core = { version = "3.0.0", path = "../../primitives/core" }
codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
parity-util-mem-derive = "0.1.0"
2 changes: 1 addition & 1 deletion client/transaction-pool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ thiserror = "1.0.21"
futures = { version = "0.3.1", features = ["compat"] }
intervalier = "0.4.0"
log = "0.4.8"
parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
parking_lot = "0.11.1"
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
sc-client-api = { version = "3.0.0", path = "../api" }
Expand Down
2 changes: 1 addition & 1 deletion client/transaction-pool/graph/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ sp-utils = { version = "3.0.0", path = "../../../primitives/utils" }
sp-core = { version = "3.0.0", path = "../../../primitives/core" }
sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
sp-transaction-pool = { version = "3.0.0", path = "../../../primitives/transaction-pool" }
parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
linked-hash-map = "0.5.2"
retain_mut = "0.1.3"

Expand Down
2 changes: 1 addition & 1 deletion frame/support/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ log = { version = "0.4.14", default-features = false }
[dev-dependencies]
pretty_assertions = "0.6.1"
frame-system = { version = "3.0.0", path = "../system" }
parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }

[features]
default = ["std"]
Expand Down
Loading