From c7d9c58ce836305af6f1aa51fc639b98d256ed98 Mon Sep 17 00:00:00 2001 From: Qinxuan Chen Date: Wed, 27 Nov 2019 01:39:58 +0800 Subject: [PATCH] Update some dependencies: (#4207) - derive_more 0.15 -> 0.99 - strum 0.15 -> 0.16 - slog_derive 0.1 -> 0.2 Signed-off-by: koushiro --- substrate/Cargo.lock | 80 +++++++++---------- substrate/bin/node-template/Cargo.toml | 1 - substrate/client/Cargo.toml | 2 +- substrate/client/api/Cargo.toml | 2 +- substrate/client/api/src/error.rs | 7 ++ .../client/authority-discovery/Cargo.toml | 2 +- substrate/client/cli/Cargo.toml | 2 +- substrate/client/cli/src/error.rs | 2 + substrate/client/consensus/aura/Cargo.toml | 2 +- substrate/client/consensus/babe/Cargo.toml | 2 +- substrate/client/consensus/pow/Cargo.toml | 2 +- substrate/client/executor/Cargo.toml | 2 +- substrate/client/executor/src/error.rs | 4 + .../client/grafana-data-source/Cargo.toml | 2 +- substrate/client/keystore/Cargo.toml | 2 +- substrate/client/network/Cargo.toml | 4 +- substrate/client/rpc/api/Cargo.toml | 2 +- substrate/client/rpc/api/src/author/error.rs | 2 + substrate/client/service/Cargo.toml | 2 +- substrate/client/transaction-pool/Cargo.toml | 2 +- .../client/transaction-pool/graph/Cargo.toml | 2 +- .../client/transaction-pool/src/error.rs | 2 + .../primitives/consensus/common/Cargo.toml | 2 +- .../primitives/consensus/common/src/error.rs | 2 + substrate/primitives/inherents/Cargo.toml | 2 +- substrate/primitives/inherents/src/lib.rs | 2 +- substrate/primitives/keyring/Cargo.toml | 3 +- substrate/primitives/keyring/src/ed25519.rs | 2 +- substrate/primitives/keyring/src/sr25519.rs | 2 +- 29 files changed, 80 insertions(+), 65 deletions(-) diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock index 14c3ca0c6d..017bbd5904 100644 --- a/substrate/Cargo.lock +++ b/substrate/Cargo.lock @@ -917,15 +917,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "derive_more" -version = "0.15.0" +version = "0.99.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1716,7 +1713,7 @@ version = "2.0.0" dependencies = [ "async-std 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", - "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures-timer 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3214,7 +3211,6 @@ name = "node-template" version = "2.0.0" dependencies = [ "ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5104,12 +5100,12 @@ dependencies = [ [[package]] name = "slog_derive" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5390,18 +5386,21 @@ dependencies = [ [[package]] name = "strum" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "strum_macros 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "strum_macros" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5443,7 +5442,7 @@ name = "substrate-authority-discovery" version = "2.0.0" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures-timer 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "libp2p 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5564,7 +5563,7 @@ dependencies = [ "app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5596,7 +5595,7 @@ dependencies = [ name = "substrate-client" version = "2.0.0" dependencies = [ - "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5633,7 +5632,7 @@ dependencies = [ name = "substrate-client-api" version = "2.0.0" dependencies = [ - "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5698,7 +5697,7 @@ dependencies = [ name = "substrate-consensus-aura" version = "2.0.0" dependencies = [ - "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5748,7 +5747,7 @@ dependencies = [ name = "substrate-consensus-babe" version = "2.0.0" dependencies = [ - "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "fork-tree 2.0.0", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5811,7 +5810,7 @@ dependencies = [ name = "substrate-consensus-common" version = "2.0.0" dependencies = [ - "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures-timer 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libp2p 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5830,7 +5829,7 @@ dependencies = [ name = "substrate-consensus-pow" version = "2.0.0" dependencies = [ - "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5905,7 +5904,7 @@ dependencies = [ "cranelift-frontend 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", "cranelift-native 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", - "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libsecp256k1 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6007,7 +6006,7 @@ dependencies = [ name = "substrate-inherents" version = "2.0.0" dependencies = [ - "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-std 2.0.0", @@ -6020,8 +6019,7 @@ version = "2.0.0" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0", - "strum 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "strum_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "strum 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-primitives 2.0.0", ] @@ -6029,7 +6027,7 @@ dependencies = [ name = "substrate-keystore" version = "2.0.0" dependencies = [ - "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6046,7 +6044,7 @@ version = "2.0.0" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "erased-serde 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6068,7 +6066,7 @@ dependencies = [ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "slog_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "slog_derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "sr-arithmetic 2.0.0", "sr-primitives 2.0.0", @@ -6253,7 +6251,7 @@ dependencies = [ name = "substrate-rpc-api" version = "2.0.0" dependencies = [ - "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-core-client 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6363,7 +6361,7 @@ dependencies = [ name = "substrate-service" version = "2.0.0" dependencies = [ - "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "exit-future 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6592,7 +6590,7 @@ version = "2.0.0" dependencies = [ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6608,7 +6606,7 @@ dependencies = [ name = "substrate-transaction-pool" version = "2.0.0" dependencies = [ - "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -8021,7 +8019,7 @@ dependencies = [ "checksum cuckoofilter 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8dd43f7cfaffe0a386636a10baea2ee05cc50df3b77bea4a456c9572a939bf1f" "checksum curve25519-dalek 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8b7dcd30ba50cdf88b55b033456138b7c0ac4afdc436d82e1b79f370f24cc66d" "checksum data-encoding 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f4f47ca1860a761136924ddd2422ba77b2ea54fe8cc75b9040804a0d9d32ad97" -"checksum derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a141330240c921ec6d074a3e188a7c7ef95668bb95e7d44fa0e5778ec2a7afe" +"checksum derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2159be042979966de68315bce7034bb000c775f22e3e834e1c52ff78f041cae8" "checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" "checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" "checksum directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c" @@ -8345,7 +8343,7 @@ dependencies = [ "checksum slog-async 2.3.0 (git+https://github.com/paritytech/slog-async)" = "" "checksum slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddc0d2aff1f8f325ef660d9a0eb6e6dcd20b30b3f581a5897f58bf42d061c37a" "checksum slog-scope 4.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c44c89dd8b0ae4537d1ae318353eaf7840b4869c536e31c41e963d1ea523ee6" -"checksum slog_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9eff3b513cf2e0d1a60e1aba152dc72bedc5b05585722bb3cebd7bcb1e31b98f" +"checksum slog_derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a945ec7f7ce853e89ffa36be1e27dce9a43e82ff9093bf3461c30d5da74ed11b" "checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" "checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86" "checksum snow 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "91eecae35b461ed26bda7a76bea2cc5bda2bf4b8dd06761879f19e6fdd50c2dd" @@ -8360,8 +8358,8 @@ dependencies = [ "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" "checksum structopt 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c167b61c7d4c126927f5346a4327ce20abf8a186b8041bbeb1ce49e5db49587b" "checksum structopt-derive 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "519621841414165d2ad0d4c92be8f41844203f2b67e245f9345a5a12d40c69d7" -"checksum strum 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5d1c33039533f051704951680f1adfd468fd37ac46816ded0d9ee068e60f05f" -"checksum strum_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "47cd23f5c7dee395a00fa20135e2ec0fffcdfa151c56182966d7a3261343432e" +"checksum strum 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6138f8f88a16d90134763314e3fc76fa3ed6a7db4725d6acf9a3ef95a3188d22" +"checksum strum_macros 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0054a7df764039a6cd8592b9de84be4bec368ff081d203a7d5371cbfa8e65c81" "checksum substrate-bip39 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3be511be555a3633e71739a79e4ddff6a6aaa6579fa6114182a51d72c3eb93c5" "checksum subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" "checksum subtle 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab3af2eb31c42e8f0ccf43548232556c42737e01a96db6e1777b0be108e79799" diff --git a/substrate/bin/node-template/Cargo.toml b/substrate/bin/node-template/Cargo.toml index ff39373076..11373e8d71 100644 --- a/substrate/bin/node-template/Cargo.toml +++ b/substrate/bin/node-template/Cargo.toml @@ -10,7 +10,6 @@ name = "node-template" path = "src/main.rs" [dependencies] -derive_more = "0.15.0" futures = "0.3.1" futures01 = { package = "futures", version = "0.1.29" } ctrlc = { version = "3.1.3", features = ["termination"] } diff --git a/substrate/client/Cargo.toml b/substrate/client/Cargo.toml index 3f7c4df917..d7270dff37 100644 --- a/substrate/client/Cargo.toml +++ b/substrate/client/Cargo.toml @@ -9,7 +9,7 @@ block-builder = { package = "substrate-block-builder", path = "block-builder" } client-api = { package = "substrate-client-api", path = "api" } codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } consensus = { package = "substrate-consensus-common", path = "../primitives/consensus/common" } -derive_more = { version = "0.15.0" } +derive_more = { version = "0.99.2" } executor = { package = "substrate-executor", path = "executor" } externalities = { package = "substrate-externalities", path = "../primitives/externalities" } fnv = { version = "1.0.6" } diff --git a/substrate/client/api/Cargo.toml b/substrate/client/api/Cargo.toml index 4757d7af81..6af1086586 100644 --- a/substrate/client/api/Cargo.toml +++ b/substrate/client/api/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" block-builder = { package = "substrate-block-builder", path = "../block-builder" } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } consensus = { package = "substrate-consensus-common", path = "../../primitives/consensus/common" } -derive_more = { version = "0.15.0" } +derive_more = { version = "0.99.2" } executor = { package = "substrate-executor", path = "../executor" } externalities = { package = "substrate-externalities", path = "../../primitives/externalities" } fnv = { version = "1.0.6" } diff --git a/substrate/client/api/src/error.rs b/substrate/client/api/src/error.rs index 9059fe5393..871a1091c6 100644 --- a/substrate/client/api/src/error.rs +++ b/substrate/client/api/src/error.rs @@ -33,9 +33,11 @@ pub enum Error { Consensus(consensus::Error), /// Backend error. #[display(fmt = "Backend error: {}", _0)] + #[from(ignore)] Backend(String), /// Unknown block. #[display(fmt = "UnknownBlock: {}", _0)] + #[from(ignore)] UnknownBlock(String), /// The `apply_extrinsic` is not valid due to the given `TransactionValidityError`. #[display(fmt = "Extrinsic is not valid: {:?}", _0)] @@ -60,6 +62,7 @@ pub enum Error { JustificationDecode, /// Justification for header is correctly encoded, but invalid. #[display(fmt = "bad justification for header: {}", _0)] + #[from(ignore)] BadJustification(String), /// Not available on light client. #[display(fmt = "This method is not currently available when running in light client mode")] @@ -78,15 +81,18 @@ pub enum Error { CallResultDecode(&'static str, codec::Error), /// Error converting a parameter between runtime and node. #[display(fmt = "Error converting `{}` between runtime and node", _0)] + #[from(ignore)] RuntimeParamConversion(String), /// Changes tries are not supported. #[display(fmt = "Changes tries are not supported by the runtime")] ChangesTriesNotSupported, /// Key changes query has failed. #[display(fmt = "Failed to check changes proof: {}", _0)] + #[from(ignore)] ChangesTrieAccessFailed(String), /// Last finalized block not parent of current. #[display(fmt = "Did not finalize blocks in sequential order.")] + #[from(ignore)] NonSequentialFinalization(String), /// Safety violation: new best block not descendent of last finalized. #[display(fmt = "Potential long-range attack: block not in finalized chain.")] @@ -99,6 +105,7 @@ pub enum Error { InvalidStateRoot, /// A convenience variant for String #[display(fmt = "{}", _0)] + #[from(ignore)] Msg(String), } diff --git a/substrate/client/authority-discovery/Cargo.toml b/substrate/client/authority-discovery/Cargo.toml index c45eb41684..5447119dc7 100644 --- a/substrate/client/authority-discovery/Cargo.toml +++ b/substrate/client/authority-discovery/Cargo.toml @@ -13,7 +13,7 @@ authority-discovery-primitives = { package = "substrate-authority-discovery-prim bytes = "0.4.12" client-api = { package = "substrate-client-api", path = "../api" } codec = { package = "parity-scale-codec", default-features = false, version = "1.0.3" } -derive_more = "0.15.0" +derive_more = "0.99.2" futures = "0.3.1" futures-timer = "2.0" keystore = { package = "substrate-keystore", path = "../keystore" } diff --git a/substrate/client/cli/Cargo.toml b/substrate/client/cli/Cargo.toml index af3be8dc94..a2b5940e74 100644 --- a/substrate/client/cli/Cargo.toml +++ b/substrate/client/cli/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] clap = "2.33.0" -derive_more = "0.15.0" +derive_more = "0.99.2" env_logger = "0.7.0" log = "0.4.8" atty = "0.2.13" diff --git a/substrate/client/cli/src/error.rs b/substrate/client/cli/src/error.rs index 6b42773bb8..ab07c0e842 100644 --- a/substrate/client/cli/src/error.rs +++ b/substrate/client/cli/src/error.rs @@ -33,11 +33,13 @@ pub enum Error { /// Client error Client(client_api::error::Error), /// Input error + #[from(ignore)] Input(String), /// Invalid listen multiaddress #[display(fmt="Invalid listen multiaddress")] InvalidListenMultiaddress, /// Other uncategorized error. + #[from(ignore)] Other(String), } diff --git a/substrate/client/consensus/aura/Cargo.toml b/substrate/client/consensus/aura/Cargo.toml index 7ef9b514f0..17da93826c 100644 --- a/substrate/client/consensus/aura/Cargo.toml +++ b/substrate/client/consensus/aura/Cargo.toml @@ -13,7 +13,7 @@ client = { package = "substrate-client", path = "../../" } client-api = { package = "substrate-client-api", path = "../../api" } codec = { package = "parity-scale-codec", version = "1.0.0" } consensus_common = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } -derive_more = "0.15.0" +derive_more = "0.99.2" futures = { version = "0.3.1", features = ["compat"] } futures01 = { package = "futures", version = "0.1" } futures-timer = "0.4.0" diff --git a/substrate/client/consensus/babe/Cargo.toml b/substrate/client/consensus/babe/Cargo.toml index c23bd1b84c..2baf4835d8 100644 --- a/substrate/client/consensus/babe/Cargo.toml +++ b/substrate/client/consensus/babe/Cargo.toml @@ -38,7 +38,7 @@ schnorrkel = { version = "0.8.5", features = ["preaudit_deprecated"] } rand = "0.7.2" merlin = "1.2.1" pdqselect = "0.1.0" -derive_more = "0.15.0" +derive_more = "0.99.2" [dev-dependencies] keyring = { package = "substrate-keyring", path = "../../../primitives/keyring" } diff --git a/substrate/client/consensus/pow/Cargo.toml b/substrate/client/consensus/pow/Cargo.toml index 455986e2f6..8ed1af9923 100644 --- a/substrate/client/consensus/pow/Cargo.toml +++ b/substrate/client/consensus/pow/Cargo.toml @@ -17,4 +17,4 @@ consensus-common = { package = "substrate-consensus-common", path = "../../../pr log = "0.4.8" futures = { version = "0.3.1", features = ["compat"] } sp-timestamp = { path = "../../../primitives/timestamp" } -derive_more = "0.15.0" +derive_more = "0.99.2" diff --git a/substrate/client/executor/Cargo.toml b/substrate/client/executor/Cargo.toml index 619b974cb6..8c46990395 100644 --- a/substrate/client/executor/Cargo.toml +++ b/substrate/client/executor/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -derive_more = "0.15.0" +derive_more = "0.99.2" codec = { package = "parity-scale-codec", version = "1.0.0" } runtime_io = { package = "sr-io", path = "../../primitives/sr-io" } primitives = { package = "substrate-primitives", path = "../../primitives/core" } diff --git a/substrate/client/executor/src/error.rs b/substrate/client/executor/src/error.rs index 58a84e0990..84ae79a789 100644 --- a/substrate/client/executor/src/error.rs +++ b/substrate/client/executor/src/error.rs @@ -37,12 +37,15 @@ pub enum Error { #[cfg(feature = "wasmtime")] Wasmtime(ActionError), /// Error in the API. Parameter is an error message. + #[from(ignore)] ApiError(String), /// Method is not found #[display(fmt="Method not found: '{}'", _0)] + #[from(ignore)] MethodNotFound(String), /// Code is invalid (expected single byte) #[display(fmt="Invalid Code: {}", _0)] + #[from(ignore)] InvalidCode(String), /// Could not get runtime version. #[display(fmt="On-chain runtime does not specify version")] @@ -70,6 +73,7 @@ pub enum Error { #[display(fmt="The runtime has the `start` function")] RuntimeHasStartFn, /// Some other error occurred + #[from(ignore)] Other(String), /// Some error occurred in the allocator #[display(fmt="Error in allocator: {}", _0)] diff --git a/substrate/client/grafana-data-source/Cargo.toml b/substrate/client/grafana-data-source/Cargo.toml index 597d036c58..6e9b2685ae 100644 --- a/substrate/client/grafana-data-source/Cargo.toml +++ b/substrate/client/grafana-data-source/Cargo.toml @@ -18,7 +18,7 @@ chrono = { version = "0.4", features = ["serde"] } lazy_static = "1.4" parking_lot = "0.9" futures-timer = "2.0" -derive_more = "0.15" +derive_more = "0.99" [target.'cfg(not(target_os = "unknown"))'.dependencies] async-std = { version = "1.0.1", features = ["unstable"] } diff --git a/substrate/client/keystore/Cargo.toml b/substrate/client/keystore/Cargo.toml index 9923a7f357..ef788d864f 100644 --- a/substrate/client/keystore/Cargo.toml +++ b/substrate/client/keystore/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -derive_more = "0.15.0" +derive_more = "0.99.2" primitives = { package = "substrate-primitives", path = "../../primitives/core" } app-crypto = { package = "substrate-application-crypto", path = "../../primitives/application-crypto" } hex = "0.3.2" diff --git a/substrate/client/network/Cargo.toml b/substrate/client/network/Cargo.toml index 2feea5fe9d..9691cd5c3c 100644 --- a/substrate/client/network/Cargo.toml +++ b/substrate/client/network/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] bytes = "0.4.12" -derive_more = "0.15.0" +derive_more = "0.99.2" either = "1.5.3" log = "0.4.8" parking_lot = "0.9.0" @@ -37,7 +37,7 @@ peerset = { package = "substrate-peerset", path = "../../primitives/peerset" } serde = { version = "1.0.101", features = ["derive"] } serde_json = "1.0.41" slog = { version = "2.5.2", features = ["nested-values"] } -slog_derive = "0.1.1" +slog_derive = "0.2.0" smallvec = "0.6.10" tokio-io = "0.1.12" tokio = { version = "0.1.22", optional = true } diff --git a/substrate/client/rpc/api/Cargo.toml b/substrate/client/rpc/api/Cargo.toml index 906efeaffb..621d487f3a 100644 --- a/substrate/client/rpc/api/Cargo.toml +++ b/substrate/client/rpc/api/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.0.0" } -derive_more = "0.15.0" +derive_more = "0.99.2" futures = { version = "0.3.1", features = ["compat"] } jsonrpc-core = "14.0.3" jsonrpc-core-client = "14.0.3" diff --git a/substrate/client/rpc/api/src/author/error.rs b/substrate/client/rpc/api/src/author/error.rs index 8e4f887768..d1c943ef44 100644 --- a/substrate/client/rpc/api/src/author/error.rs +++ b/substrate/client/rpc/api/src/author/error.rs @@ -30,12 +30,14 @@ pub type FutureResult = Box pub enum Error { /// Client error. #[display(fmt="Client error: {}", _0)] + #[from(ignore)] Client(Box), /// Transaction pool error, #[display(fmt="Transaction pool error: {}", _0)] Pool(txpool::error::Error), /// Verification error #[display(fmt="Extrinsic verification error: {}", _0)] + #[from(ignore)] Verification(Box), /// Incorrect extrinsic format. #[display(fmt="Invalid extrinsic format: {}", _0)] diff --git a/substrate/client/service/Cargo.toml b/substrate/client/service/Cargo.toml index 81f6aabbe0..f1c3669c47 100644 --- a/substrate/client/service/Cargo.toml +++ b/substrate/client/service/Cargo.toml @@ -14,7 +14,7 @@ wasmtime = [ ] [dependencies] -derive_more = "0.15.0" +derive_more = "0.99.2" futures = "0.1.29" futures03 = { package = "futures", version = "0.3.1", features = ["compat"] } parking_lot = "0.9.0" diff --git a/substrate/client/transaction-pool/Cargo.toml b/substrate/client/transaction-pool/Cargo.toml index 60bf0c005c..de19d9d19a 100644 --- a/substrate/client/transaction-pool/Cargo.toml +++ b/substrate/client/transaction-pool/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.0.0" } -derive_more = "0.15.0" +derive_more = "0.99.2" futures = { version = "0.3.1", features = ["thread-pool"] } log = "0.4.8" parking_lot = "0.9.0" diff --git a/substrate/client/transaction-pool/graph/Cargo.toml b/substrate/client/transaction-pool/graph/Cargo.toml index c81e59e17f..63b1c54aac 100644 --- a/substrate/client/transaction-pool/graph/Cargo.toml +++ b/substrate/client/transaction-pool/graph/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -derive_more = "0.15.0" +derive_more = "0.99.2" futures = "0.3.1" log = "0.4.8" parking_lot = "0.9.0" diff --git a/substrate/client/transaction-pool/src/error.rs b/substrate/client/transaction-pool/src/error.rs index ae0a058e5c..83667d4cbc 100644 --- a/substrate/client/transaction-pool/src/error.rs +++ b/substrate/client/transaction-pool/src/error.rs @@ -25,8 +25,10 @@ pub enum Error { /// Pool error. Pool(txpool::error::Error), /// Error while converting a `BlockId`. + #[from(ignore)] BlockIdConversion(String), /// Error while calling the runtime api. + #[from(ignore)] RuntimeApi(String), } diff --git a/substrate/primitives/consensus/common/Cargo.toml b/substrate/primitives/consensus/common/Cargo.toml index 11a266ac9d..02dc7b579f 100644 --- a/substrate/primitives/consensus/common/Cargo.toml +++ b/substrate/primitives/consensus/common/Cargo.toml @@ -6,7 +6,7 @@ description = "Common utilities for substrate consensus" edition = "2018" [dependencies] -derive_more = "0.15.0" +derive_more = "0.99.2" libp2p = { version = "0.13.0", default-features = false } log = "0.4.8" primitives = { package = "substrate-primitives", path= "../../core" } diff --git a/substrate/primitives/consensus/common/src/error.rs b/substrate/primitives/consensus/common/src/error.rs index 16781b04ff..0455a553cc 100644 --- a/substrate/primitives/consensus/common/src/error.rs +++ b/substrate/primitives/consensus/common/src/error.rs @@ -67,9 +67,11 @@ pub enum Error { Other(Box), /// Error from the client while importing #[display(fmt="Import failed: {}", _0)] + #[from(ignore)] ClientImport(String), /// Error from the client while importing #[display(fmt="Chain lookup failed: {}", _0)] + #[from(ignore)] ChainLookup(String), } diff --git a/substrate/primitives/inherents/Cargo.toml b/substrate/primitives/inherents/Cargo.toml index 108cb15e9c..f01bb9d3a9 100644 --- a/substrate/primitives/inherents/Cargo.toml +++ b/substrate/primitives/inherents/Cargo.toml @@ -9,7 +9,7 @@ parking_lot = { version = "0.9.0", optional = true } rstd = { package = "sr-std", path = "../sr-std", default-features = false } primitives = { package = "substrate-primitives", path = "../core", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.6", default-features = false, features = ["derive"] } -derive_more = { version = "0.15.0", optional = true } +derive_more = { version = "0.99.2", optional = true } [features] default = [ "std" ] diff --git a/substrate/primitives/inherents/src/lib.rs b/substrate/primitives/inherents/src/lib.rs index 25512f4fca..b398e43997 100644 --- a/substrate/primitives/inherents/src/lib.rs +++ b/substrate/primitives/inherents/src/lib.rs @@ -44,8 +44,8 @@ use parking_lot::RwLock; use std::{sync::Arc, format}; /// An error that can occur within the inherent data system. -#[derive(Debug, Encode, Decode, derive_more::Display)] #[cfg(feature = "std")] +#[derive(Debug, Encode, Decode, derive_more::Display)] pub struct Error(String); #[cfg(feature = "std")] diff --git a/substrate/primitives/keyring/Cargo.toml b/substrate/primitives/keyring/Cargo.toml index cc0e2836ba..5960f7be16 100644 --- a/substrate/primitives/keyring/Cargo.toml +++ b/substrate/primitives/keyring/Cargo.toml @@ -8,5 +8,4 @@ edition = "2018" primitives = { package = "substrate-primitives", path = "../core" } sr-primitives = { path = "../sr-primitives" } lazy_static = "1.4.0" -strum = "0.15.0" -strum_macros = "0.15.0" +strum = { version = "0.16.0", features = ["derive"] } diff --git a/substrate/primitives/keyring/src/ed25519.rs b/substrate/primitives/keyring/src/ed25519.rs index c1a357fc0e..4a3e090c76 100644 --- a/substrate/primitives/keyring/src/ed25519.rs +++ b/substrate/primitives/keyring/src/ed25519.rs @@ -23,7 +23,7 @@ pub use primitives::ed25519; use sr_primitives::AccountId32; /// Set of test accounts. -#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, strum_macros::Display, strum_macros::EnumIter)] +#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, strum::Display, strum::EnumIter)] pub enum Keyring { Alice, Bob, diff --git a/substrate/primitives/keyring/src/sr25519.rs b/substrate/primitives/keyring/src/sr25519.rs index b37b2bdf9b..ff132d8968 100644 --- a/substrate/primitives/keyring/src/sr25519.rs +++ b/substrate/primitives/keyring/src/sr25519.rs @@ -24,7 +24,7 @@ pub use primitives::sr25519; use sr_primitives::AccountId32; /// Set of test accounts. -#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, strum_macros::Display, strum_macros::EnumIter)] +#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, strum::Display, strum::EnumIter)] pub enum Keyring { Alice, Bob,