Unverified Commit 3e7b8330 authored by emostov's avatar emostov
Browse files

Merge branch 'master' of https://github.com/paritytech/polkadot into...

Merge branch 'master' of https://github.com/paritytech/polkadot into zeke-npos-solver-trait-companion
parents 55f79932 9e2d216d
Pipeline #155608 failed with stages
in 8 minutes and 32 seconds
This diff is collapsed.
......@@ -16,8 +16,8 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
log = "0.4.13"
thiserror = "1.0.26"
structopt = { version = "0.3.21", optional = true }
futures = "0.3.15"
structopt = { version = "0.3.23", optional = true }
futures = "0.3.17"
service = { package = "polkadot-service", path = "../node/service", default-features = false, optional = true }
polkadot-node-core-pvf = { path = "../node/core/pvf", optional = true }
......
......@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
futures = "0.3.15"
futures = "0.3.17"
tracing = "0.1.26"
polkadot-erasure-coding = { path = "../../erasure-coding" }
polkadot-node-primitives = { path = "../primitives" }
......
......@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
futures = "0.3.15"
futures = "0.3.17"
futures-timer = "3.0.2"
parity-scale-codec = { version = "2.0.0", default-features = false, features = ["bit-vec", "derive"] }
tracing = "0.1.26"
......
......@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
futures = "0.3.15"
futures = "0.3.17"
futures-timer = "3.0.2"
kvdb = "0.10.0"
thiserror = "1.0.26"
......
......@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
futures = "0.3.15"
futures = "0.3.17"
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-primitives = { path = "../../../primitives" }
polkadot-node-primitives = { path = "../../primitives" }
......@@ -23,6 +23,6 @@ sp-application-crypto = { git = "https://github.com/paritytech/substrate", branc
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
futures = { version = "0.3.15", features = ["thread-pool"] }
futures = { version = "0.3.17", features = ["thread-pool"] }
assert_matches = "1.4.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
......@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
futures = "0.3.15"
futures = "0.3.17"
tracing = "0.1.26"
polkadot-primitives = { path = "../../../primitives" }
polkadot-node-subsystem = { path = "../../subsystem" }
......
......@@ -6,7 +6,7 @@ edition = "2018"
[dependencies]
async-trait = "0.1.51"
futures = "0.3.15"
futures = "0.3.17"
tracing = "0.1.26"
sp-maybe-compressed-blob = { package = "sp-maybe-compressed-blob", git = "https://github.com/paritytech/substrate", branch = "master" }
......@@ -23,7 +23,7 @@ polkadot-node-core-pvf = { path = "../pvf" }
[dev-dependencies]
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
futures = { version = "0.3.15", features = ["thread-pool"] }
futures = { version = "0.3.17", features = ["thread-pool"] }
assert_matches = "1.4.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
......@@ -69,8 +69,10 @@ pub struct Config {
/// The candidate validation subsystem.
pub struct CandidateValidationSubsystem {
metrics: Metrics,
pvf_metrics: polkadot_node_core_pvf::Metrics,
#[allow(missing_docs)]
pub metrics: Metrics,
#[allow(missing_docs)]
pub pvf_metrics: polkadot_node_core_pvf::Metrics,
config: Config,
}
......
......@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
futures = "0.3.15"
futures = "0.3.17"
tracing = "0.1.26"
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-primitives = { path = "../../../primitives" }
......@@ -15,7 +15,7 @@ sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "mas
sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
[dev-dependencies]
futures = { version = "0.3.15", features = ["thread-pool"] }
futures = { version = "0.3.17", features = ["thread-pool"] }
maplit = "1.0.2"
parity-scale-codec = "2.0.0"
polkadot-node-primitives = { path = "../../primitives" }
......
......@@ -6,7 +6,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
futures = "0.3.15"
futures = "0.3.17"
futures-timer = "3"
tracing = "0.1.26"
polkadot-primitives = { path = "../../../primitives" }
......
......@@ -6,7 +6,7 @@ edition = "2018"
[dependencies]
bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
futures = "0.3.12"
futures = "0.3.17"
tracing = "0.1.26"
parity-scale-codec = "2"
kvdb = "0.10.0"
......
......@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
futures = "0.3.12"
futures = "0.3.17"
thiserror = "1.0.26"
tracing = "0.1.26"
......
......@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
futures = "0.3.15"
futures = "0.3.17"
futures-timer = "3.0.2"
tracing = "0.1.26"
thiserror = "1.0.26"
......
......@@ -6,7 +6,7 @@ edition = "2018"
[dependencies]
bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
futures = "0.3.15"
futures = "0.3.17"
tracing = "0.1.26"
thiserror = "1.0.26"
polkadot-primitives = { path = "../../../primitives" }
......
......@@ -13,7 +13,7 @@ always-assert = "0.1"
async-std = { version = "1.8.0", features = ["attributes"] }
async-process = "1.1.0"
assert_matches = "1.4.0"
futures = "0.3.15"
futures = "0.3.17"
futures-timer = "3.0.2"
libc = "0.2.101"
slotmap = "1.0"
......
......@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
futures = "0.3.15"
futures = "0.3.17"
tracing = "0.1.26"
memory-lru = "0.1.0"
parity-util-mem = { version = "0.10.0", default-features = false }
......@@ -21,6 +21,6 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }
[dev-dependencies]
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
futures = { version = "0.3.15", features = ["thread-pool"] }
futures = { version = "0.3.17", features = ["thread-pool"] }
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
polkadot-node-primitives = { path = "../../primitives" }
......@@ -25,5 +25,5 @@ polkadot-node-core-pvf = { path = "../core/pvf" }
parity-util-mem = { version = "0.10.0", default-features = false, features = ["jemalloc-global"] }
color-eyre = { version = "0.5.11", default-features = false }
assert_matches = "1.5"
structopt = "0.3.21"
structopt = "0.3.23"
async-trait = "0.1.51"
......@@ -34,9 +34,8 @@ use polkadot_cli::{
// Import extra types relevant to the particular
// subsystem.
use polkadot_node_core_candidate_validation::{CandidateValidationSubsystem, Metrics};
use polkadot_node_core_candidate_validation::CandidateValidationSubsystem;
use polkadot_node_subsystem::messages::CandidateValidationMessage;
use polkadot_node_subsystem_util::metrics::Metrics as _;
// Filter wrapping related types.
use malus::*;
......@@ -88,14 +87,16 @@ impl OverseerGen for BehaveMaleficient {
// modify the subsystem(s) as needed:
let all_subsystems = create_default_subsystems(args)?.replace_candidate_validation(
// create the filtered subsystem
FilteredSubsystem::new(
CandidateValidationSubsystem::with_config(
candidate_validation_config,
Metrics::register(registry)?,
polkadot_node_core_pvf::Metrics::register(registry)?,
),
Skippy::default(),
),
|orig: CandidateValidationSubsystem| {
FilteredSubsystem::new(
CandidateValidationSubsystem::with_config(
candidate_validation_config,
orig.metrics,
orig.pvf_metrics,
),
Skippy::default(),
)
},
);
Overseer::new(leaves, all_subsystems, registry, runtime_client, spawner)
......
......@@ -6,9 +6,9 @@ edition = "2018"
description = "Channels with attached Meters"
[dependencies]
futures = "0.3.15"
futures = "0.3.17"
futures-timer = "3.0.2"
derive_more = "0.99"
[dev-dependencies]
futures = { version = "0.3.15", features = ["thread-pool"] }
futures = { version = "0.3.17", features = ["thread-pool"] }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment