diff --git a/Cargo.lock b/Cargo.lock index 97023d8aab06..645e9e43e49e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1054,9 +1054,9 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.9" +version = "0.99.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "298998b1cf6b5b2c8a7b023dfd45821825ce3ba8a8af55c921a0e734e4653f76" +checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -4698,7 +4698,7 @@ version = "0.1.0" dependencies = [ "assert_matches", "bitvec", - "derive_more 0.99.9", + "derive_more 0.99.11", "env_logger", "futures 0.3.5", "futures-timer 3.0.2", @@ -4751,7 +4751,7 @@ name = "polkadot-collator-protocol" version = "0.1.0" dependencies = [ "assert_matches", - "derive_more 0.99.9", + "derive_more 0.99.11", "env_logger", "futures 0.3.5", "futures-timer 3.0.2", @@ -4816,7 +4816,7 @@ dependencies = [ name = "polkadot-node-collation-generation" version = "0.1.0" dependencies = [ - "derive_more 0.99.9", + "derive_more 0.99.11", "futures 0.3.5", "log 0.4.11", "polkadot-erasure-coding", @@ -4833,7 +4833,7 @@ name = "polkadot-node-core-av-store" version = "0.1.0" dependencies = [ "assert_matches", - "derive_more 0.99.9", + "derive_more 0.99.11", "futures 0.3.5", "kvdb", "kvdb-memorydb", @@ -4855,7 +4855,7 @@ version = "0.1.0" dependencies = [ "assert_matches", "bitvec", - "derive_more 0.99.9", + "derive_more 0.99.11", "futures 0.3.5", "log 0.4.11", "polkadot-erasure-coding", @@ -4878,7 +4878,7 @@ name = "polkadot-node-core-bitfield-signing" version = "0.1.0" dependencies = [ "bitvec", - "derive_more 0.99.9", + "derive_more 0.99.11", "futures 0.3.5", "log 0.4.11", "polkadot-node-subsystem", @@ -4892,7 +4892,7 @@ dependencies = [ name = "polkadot-node-core-candidate-selection" version = "0.1.0" dependencies = [ - "derive_more 0.99.9", + "derive_more 0.99.11", "futures 0.3.5", "log 0.4.11", "polkadot-node-primitives", @@ -4907,7 +4907,7 @@ name = "polkadot-node-core-candidate-validation" version = "0.1.0" dependencies = [ "assert_matches", - "derive_more 0.99.9", + "derive_more 0.99.11", "futures 0.3.5", "log 0.4.11", "parity-scale-codec", @@ -4967,7 +4967,7 @@ name = "polkadot-node-core-provisioner" version = "0.1.0" dependencies = [ "bitvec", - "derive_more 0.99.9", + "derive_more 0.99.11", "futures 0.3.5", "futures-timer 3.0.2", "lazy_static", @@ -5023,7 +5023,7 @@ version = "0.1.0" dependencies = [ "assert_matches", "async-trait", - "derive_more 0.99.9", + "derive_more 0.99.11", "futures 0.3.5", "futures-timer 3.0.2", "log 0.4.11", @@ -5045,7 +5045,7 @@ name = "polkadot-node-subsystem-test-helpers" version = "0.1.0" dependencies = [ "async-trait", - "derive_more 0.99.9", + "derive_more 0.99.11", "futures 0.3.5", "futures-timer 3.0.2", "log 0.4.11", @@ -5068,7 +5068,7 @@ version = "0.1.0" dependencies = [ "assert_matches", "async-trait", - "derive_more 0.99.9", + "derive_more 0.99.11", "env_logger", "futures 0.3.5", "futures-timer 3.0.2", @@ -5113,7 +5113,7 @@ dependencies = [ name = "polkadot-parachain" version = "0.8.24" dependencies = [ - "derive_more 0.99.9", + "derive_more 0.99.11", "futures 0.3.5", "log 0.4.11", "parity-scale-codec", @@ -6491,7 +6491,7 @@ version = "0.8.0" source = "git+https://github.com/paritytech/substrate#025dd54ce646be3409fcf6e5549792a460a3b147" dependencies = [ "bytes 0.5.6", - "derive_more 0.99.9", + "derive_more 0.99.11", "either", "futures 0.3.5", "futures-timer 3.0.2", @@ -6591,7 +6591,7 @@ dependencies = [ "atty", "bip39", "chrono", - "derive_more 0.99.9", + "derive_more 0.99.11", "fdlimit", "futures 0.3.5", "hex", @@ -6636,7 +6636,7 @@ name = "sc-client-api" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#025dd54ce646be3409fcf6e5549792a460a3b147" dependencies = [ - "derive_more 0.99.9", + "derive_more 0.99.11", "fnv", "futures 0.3.5", "hash-db", @@ -6713,7 +6713,7 @@ name = "sc-consensus-babe" version = "0.8.0" source = "git+https://github.com/paritytech/substrate#025dd54ce646be3409fcf6e5549792a460a3b147" dependencies = [ - "derive_more 0.99.9", + "derive_more 0.99.11", "fork-tree", "futures 0.3.5", "futures-timer 3.0.2", @@ -6757,7 +6757,7 @@ name = "sc-consensus-babe-rpc" version = "0.8.0" source = "git+https://github.com/paritytech/substrate#025dd54ce646be3409fcf6e5549792a460a3b147" dependencies = [ - "derive_more 0.99.9", + "derive_more 0.99.11", "futures 0.3.5", "jsonrpc-core", "jsonrpc-core-client", @@ -6831,7 +6831,7 @@ name = "sc-executor" version = "0.8.0" source = "git+https://github.com/paritytech/substrate#025dd54ce646be3409fcf6e5549792a460a3b147" dependencies = [ - "derive_more 0.99.9", + "derive_more 0.99.11", "lazy_static", "libsecp256k1", "log 0.4.11", @@ -6859,7 +6859,7 @@ name = "sc-executor-common" version = "0.8.0" source = "git+https://github.com/paritytech/substrate#025dd54ce646be3409fcf6e5549792a460a3b147" dependencies = [ - "derive_more 0.99.9", + "derive_more 0.99.11", "log 0.4.11", "parity-scale-codec", "parity-wasm", @@ -6909,7 +6909,7 @@ name = "sc-finality-grandpa" version = "0.8.0" source = "git+https://github.com/paritytech/substrate#025dd54ce646be3409fcf6e5549792a460a3b147" dependencies = [ - "derive_more 0.99.9", + "derive_more 0.99.11", "finality-grandpa", "fork-tree", "futures 0.3.5", @@ -6946,7 +6946,7 @@ name = "sc-finality-grandpa-rpc" version = "0.8.0" source = "git+https://github.com/paritytech/substrate#025dd54ce646be3409fcf6e5549792a460a3b147" dependencies = [ - "derive_more 0.99.9", + "derive_more 0.99.11", "finality-grandpa", "futures 0.3.5", "jsonrpc-core", @@ -6988,7 +6988,7 @@ name = "sc-keystore" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#025dd54ce646be3409fcf6e5549792a460a3b147" dependencies = [ - "derive_more 0.99.9", + "derive_more 0.99.11", "hex", "merlin", "parking_lot 0.10.2", @@ -7028,7 +7028,7 @@ dependencies = [ "bitflags", "bs58", "bytes 0.5.6", - "derive_more 0.99.9", + "derive_more 0.99.11", "either", "erased-serde", "fnv", @@ -7173,7 +7173,7 @@ name = "sc-rpc-api" version = "0.8.0" source = "git+https://github.com/paritytech/substrate#025dd54ce646be3409fcf6e5549792a460a3b147" dependencies = [ - "derive_more 0.99.9", + "derive_more 0.99.11", "futures 0.3.5", "jsonrpc-core", "jsonrpc-core-client", @@ -7215,7 +7215,7 @@ name = "sc-service" version = "0.8.0" source = "git+https://github.com/paritytech/substrate#025dd54ce646be3409fcf6e5549792a460a3b147" dependencies = [ - "derive_more 0.99.9", + "derive_more 0.99.11", "directories", "exit-future", "futures 0.1.29", @@ -7331,7 +7331,7 @@ name = "sc-transaction-graph" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#025dd54ce646be3409fcf6e5549792a460a3b147" dependencies = [ - "derive_more 0.99.9", + "derive_more 0.99.11", "futures 0.3.5", "linked-hash-map", "log 0.4.11", @@ -7352,7 +7352,7 @@ name = "sc-transaction-pool" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#025dd54ce646be3409fcf6e5549792a460a3b147" dependencies = [ - "derive_more 0.99.9", + "derive_more 0.99.11", "futures 0.3.5", "futures-diagnose", "intervalier", @@ -7819,7 +7819,7 @@ name = "sp-allocator" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#025dd54ce646be3409fcf6e5549792a460a3b147" dependencies = [ - "derive_more 0.99.9", + "derive_more 0.99.11", "log 0.4.11", "sp-core", "sp-std", @@ -7918,7 +7918,7 @@ name = "sp-blockchain" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#025dd54ce646be3409fcf6e5549792a460a3b147" dependencies = [ - "derive_more 0.99.9", + "derive_more 0.99.11", "log 0.4.11", "lru 0.4.3", "parity-scale-codec", @@ -7944,7 +7944,7 @@ name = "sp-consensus" version = "0.8.0" source = "git+https://github.com/paritytech/substrate#025dd54ce646be3409fcf6e5549792a460a3b147" dependencies = [ - "derive_more 0.99.9", + "derive_more 0.99.11", "futures 0.3.5", "futures-timer 3.0.2", "libp2p", @@ -8013,7 +8013,7 @@ dependencies = [ "base58", "blake2-rfc", "byteorder 1.3.4", - "derive_more 0.99.9", + "derive_more 0.99.11", "dyn-clonable", "ed25519-dalek", "futures 0.3.5", @@ -8110,7 +8110,7 @@ name = "sp-inherents" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#025dd54ce646be3409fcf6e5549792a460a3b147" dependencies = [ - "derive_more 0.99.9", + "derive_more 0.99.11", "parity-scale-codec", "parking_lot 0.10.2", "sp-core", @@ -8355,7 +8355,7 @@ name = "sp-transaction-pool" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#025dd54ce646be3409fcf6e5549792a460a3b147" dependencies = [ - "derive_more 0.99.9", + "derive_more 0.99.11", "futures 0.3.5", "log 0.4.11", "parity-scale-codec", @@ -8607,7 +8607,7 @@ version = "0.8.0" source = "git+https://github.com/paritytech/substrate#025dd54ce646be3409fcf6e5549792a460a3b147" dependencies = [ "async-std", - "derive_more 0.99.9", + "derive_more 0.99.11", "futures-util", "hyper 0.13.6", "log 0.4.11", diff --git a/node/overseer/src/lib.rs b/node/overseer/src/lib.rs index 73453c5d2753..d343da2c6f2d 100644 --- a/node/overseer/src/lib.rs +++ b/node/overseer/src/lib.rs @@ -192,8 +192,8 @@ impl OverseerHandler { } /// Send some message to one of the `Subsystem`s. - pub async fn send_msg(&mut self, msg: AllMessages) -> SubsystemResult<()> { - self.events_tx.send(Event::MsgToSubsystem(msg)).await.map_err(Into::into) + pub async fn send_msg(&mut self, msg: impl Into) -> SubsystemResult<()> { + self.events_tx.send(Event::MsgToSubsystem(msg.into())).await.map_err(Into::into) } /// Inform the `Overseer` that that some block was finalized. diff --git a/node/subsystem/Cargo.toml b/node/subsystem/Cargo.toml index 6ad013c177f3..dfdac1e7cc12 100644 --- a/node/subsystem/Cargo.toml +++ b/node/subsystem/Cargo.toml @@ -7,7 +7,7 @@ description = "Subsystem traits and message definitions" [dependencies] async-trait = "0.1" -derive_more = "0.99.9" +derive_more = "0.99.11" futures = "0.3.5" futures-timer = "3.0.2" log = "0.4.8" diff --git a/node/subsystem/src/messages.rs b/node/subsystem/src/messages.rs index 9db4e7e33c91..c97bd0087f62 100644 --- a/node/subsystem/src/messages.rs +++ b/node/subsystem/src/messages.rs @@ -519,7 +519,7 @@ impl CollationGenerationMessage { } /// A message type tying together all message types that are used across Subsystems. -#[derive(Debug)] +#[derive(Debug, derive_more::From)] pub enum AllMessages { /// Message for the validation subsystem. CandidateValidation(CandidateValidationMessage),