depend-o-pocalipse (#9450)

Remove unneeded dependencies and dev-dependencies.
Made self_destruct test not dependent on wasm bin size.  
Updated code related to deprecated warning on tracing-subscriber `scope()` 
( See https://github.com/tokio-rs/tracing/issues/1429 )
This commit is contained in:
Squirrel
2021-08-13 15:18:37 +01:00
committed by GitHub
parent 76504e56d7
commit 7e9b8d278e
129 changed files with 487 additions and 726 deletions
+1 -6
View File
@@ -24,19 +24,16 @@ sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/commo
sp-consensus-slots = { version = "0.10.0-dev", path = "../../../primitives/consensus/slots" }
derive_more = "0.99.2"
futures = "0.3.9"
futures-timer = "3.0.1"
sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
log = "0.4.8"
sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
sp-version = { version = "4.0.0-dev", path = "../../../primitives/version" }
sc-consensus-slots = { version = "0.10.0-dev", path = "../slots" }
sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
sc-telemetry = { version = "4.0.0-dev", path = "../../telemetry" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0" }
async-trait = "0.1.50"
# We enable it only for web-wasm check
# See https://docs.rs/getrandom/0.2.1/getrandom/#webassembly-support
@@ -46,11 +43,9 @@ getrandom = { version = "0.2", features = ["js"], optional = true }
sp-timestamp = { version = "4.0.0-dev", path = "../../../primitives/timestamp" }
sp-keyring = { version = "4.0.0-dev", path = "../../../primitives/keyring" }
sp-tracing = { version = "4.0.0-dev", path = "../../../primitives/tracing" }
sc-executor = { version = "0.10.0-dev", path = "../../executor" }
sc-keystore = { version = "4.0.0-dev", path = "../../keystore" }
sc-network = { version = "0.10.0-dev", path = "../../network" }
sc-network-test = { version = "0.8.0", path = "../../network/test" }
sc-service = { version = "0.10.0-dev", default-features = false, path = "../../service" }
substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
tempfile = "3.1.0"
parking_lot = "0.11.1"
+4 -8
View File
@@ -14,7 +14,9 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", features = [
"derive",
] }
sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" }
sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
@@ -37,14 +39,11 @@ sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain"
sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
sp-consensus-slots = { version = "0.10.0-dev", path = "../../../primitives/consensus/slots" }
sp-consensus-vrf = { version = "0.10.0-dev", path = "../../../primitives/consensus/vrf" }
sc-consensus-uncles = { version = "0.10.0-dev", path = "../uncles" }
sc-consensus-slots = { version = "0.10.0-dev", path = "../slots" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
sp-utils = { version = "4.0.0-dev", path = "../../../primitives/utils" }
fork-tree = { version = "3.0.0", path = "../../../utils/fork-tree" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0" }
futures = "0.3.9"
futures-timer = "3.0.1"
parking_lot = "0.11.1"
log = "0.4.8"
schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated"] }
@@ -56,12 +55,9 @@ async-trait = "0.1.50"
[dev-dependencies]
sp-timestamp = { version = "4.0.0-dev", path = "../../../primitives/timestamp" }
sp-keyring = { version = "4.0.0-dev", path = "../../../primitives/keyring" }
sp-tracing = { version = "4.0.0-dev", path = "../../../primitives/tracing" }
sc-executor = { version = "0.10.0-dev", path = "../../executor" }
sc-network = { version = "0.10.0-dev", path = "../../network" }
sc-network-test = { version = "0.8.0", path = "../../network/test" }
sc-service = { version = "0.10.0-dev", default-features = false, path = "../../service" }
substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
sc-block-builder = { version = "0.10.0-dev", path = "../../block-builder" }
rand_chacha = "0.2.2"
+2 -2
View File
@@ -20,8 +20,8 @@ futures = { version = "0.3.1", features = ["thread-pool"] }
futures-timer = "3.0.1"
sc-client-api = { version = "4.0.0-dev", path = "../../api" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
sp-core = { path = "../../../primitives/core", version = "4.0.0-dev"}
sp-consensus = { path = "../../../primitives/consensus/common", version = "0.10.0-dev"}
sp-core = { path = "../../../primitives/core", version = "4.0.0-dev" }
sp-consensus = { path = "../../../primitives/consensus/common", version = "0.10.0-dev" }
sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-machine" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
sp-utils = { version = "4.0.0-dev", path = "../../../primitives/utils" }
+3 -2
View File
@@ -561,12 +561,13 @@ where
// Ok, we found our node.
// and here we figure out which of the internal epochs
// of a genesis node to use based on their start slot.
PersistedEpochHeader::Genesis(ref epoch_0, ref epoch_1) =>
PersistedEpochHeader::Genesis(ref epoch_0, ref epoch_1) => {
if epoch_1.start_slot <= slot {
(EpochIdentifierPosition::Genesis1, epoch_1.clone())
} else {
(EpochIdentifierPosition::Genesis0, epoch_0.clone())
},
}
},
PersistedEpochHeader::Regular(ref epoch_n) =>
(EpochIdentifierPosition::Regular, epoch_n.clone()),
},
@@ -19,36 +19,33 @@ jsonrpc-core = "18.0.0"
jsonrpc-core-client = "18.0.0"
jsonrpc-derive = "18.0.0"
log = "0.4.8"
parking_lot = "0.11.1"
codec = { package = "parity-scale-codec", version = "2.0.0" }
serde = { version = "1.0", features=["derive"] }
serde = { version = "1.0", features = ["derive"] }
assert_matches = "1.3.0"
async-trait = "0.1.50"
sc-client-api = { path = "../../api", version = "4.0.0-dev"}
sc-client-api = { path = "../../api", version = "4.0.0-dev" }
sc-consensus = { version = "0.10.0-dev", path = "../../consensus/common" }
sc-consensus-babe = { path = "../../consensus/babe", version = "0.10.0-dev"}
sc-consensus-epochs = { path = "../../consensus/epochs", version = "0.10.0-dev"}
sp-consensus-babe = { path = "../../../primitives/consensus/babe", version = "0.10.0-dev"}
sc-consensus-babe = { path = "../../consensus/babe", version = "0.10.0-dev" }
sc-consensus-epochs = { path = "../../consensus/epochs", version = "0.10.0-dev" }
sp-consensus-babe = { path = "../../../primitives/consensus/babe", version = "0.10.0-dev" }
sc-transaction-pool = { path = "../../transaction-pool", version = "4.0.0-dev"}
sp-blockchain = { path = "../../../primitives/blockchain", version = "4.0.0-dev"}
sp-consensus = { path = "../../../primitives/consensus/common", version = "0.10.0-dev"}
sp-consensus-slots = { path = "../../../primitives/consensus/slots", version = "0.10.0-dev"}
sp-inherents = { path = "../../../primitives/inherents", version = "4.0.0-dev"}
sp-runtime = { path = "../../../primitives/runtime", version = "4.0.0-dev"}
sp-core = { path = "../../../primitives/core", version = "4.0.0-dev"}
sp-keystore = { path = "../../../primitives/keystore", version = "0.10.0-dev"}
sp-keyring = { path = "../../../primitives/keyring", version = "4.0.0-dev"}
sp-api = { path = "../../../primitives/api", version = "4.0.0-dev"}
sc-transaction-pool-api = { path = "../../../client/transaction-pool/api", version = "4.0.0-dev"}
sp-timestamp = { path = "../../../primitives/timestamp", version = "4.0.0-dev"}
sc-transaction-pool = { path = "../../transaction-pool", version = "4.0.0-dev" }
sp-blockchain = { path = "../../../primitives/blockchain", version = "4.0.0-dev" }
sp-consensus = { path = "../../../primitives/consensus/common", version = "0.10.0-dev" }
sp-consensus-slots = { path = "../../../primitives/consensus/slots", version = "0.10.0-dev" }
sp-inherents = { path = "../../../primitives/inherents", version = "4.0.0-dev" }
sp-runtime = { path = "../../../primitives/runtime", version = "4.0.0-dev" }
sp-core = { path = "../../../primitives/core", version = "4.0.0-dev" }
sp-keystore = { path = "../../../primitives/keystore", version = "0.10.0-dev" }
sp-api = { path = "../../../primitives/api", version = "4.0.0-dev" }
sc-transaction-pool-api = { path = "../../../client/transaction-pool/api", version = "4.0.0-dev" }
sp-timestamp = { path = "../../../primitives/timestamp", version = "4.0.0-dev" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0" }
[dev-dependencies]
tokio = { version = "0.2", features = ["rt-core", "macros"] }
sc-basic-authorship = { path = "../../basic-authorship", version = "0.10.0-dev"}
sc-basic-authorship = { path = "../../basic-authorship", version = "0.10.0-dev" }
substrate-test-runtime-client = { path = "../../../test-utils/runtime/client", version = "2.0.0" }
substrate-test-runtime-transaction-pool = { path = "../../../test-utils/runtime/transaction-pool", version = "2.0.0" }
tempfile = "3.1.0"
@@ -17,8 +17,6 @@ targets = ["x86_64-unknown-linux-gnu"]
codec = { package = "parity-scale-codec", version = "2.0.0" }
sc-client-api = { version = "4.0.0-dev", path = "../../api" }
sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
sp-trie = { version = "4.0.0-dev", path = "../../../primitives/trie" }
sp-application-crypto = { version = "4.0.0-dev", path = "../../../primitives/application-crypto" }
sp-arithmetic = { version = "4.0.0-dev", path = "../../../primitives/arithmetic" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
@@ -34,7 +32,6 @@ futures = "0.3.9"
futures-timer = "3.0.1"
log = "0.4.11"
thiserror = "1.0.21"
impl-trait-for-tuples = "0.2.1"
async-trait = "0.1.50"
[dev-dependencies]