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

Commit

Permalink
depend-o-pocalipse (#9450)
Browse files Browse the repository at this point in the history
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 tokio-rs/tracing#1429 )
  • Loading branch information
gilescope authored Aug 13, 2021
1 parent 52478c0 commit e4a0cc4
Show file tree
Hide file tree
Showing 129 changed files with 487 additions and 726 deletions.
217 changes: 3 additions & 214 deletions Cargo.lock

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion bin/node-template/node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ sc-executor = { version = "0.10.0-dev", path = "../../../client/executor", featu
sc-service = { version = "0.10.0-dev", path = "../../../client/service", features = ["wasmtime"] }
sc-telemetry = { version = "4.0.0-dev", path = "../../../client/telemetry" }
sc-keystore = { version = "4.0.0-dev", path = "../../../client/keystore" }
sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
sc-transaction-pool = { version = "4.0.0-dev", path = "../../../client/transaction-pool" }
sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../client/transaction-pool/api" }
sc-consensus-aura = { version = "0.10.0-dev", path = "../../../client/consensus/aura" }
Expand Down
9 changes: 5 additions & 4 deletions bin/node-template/pallets/template/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@ publish = false
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
"derive",
] }
frame-support = { default-features = false, version = "4.0.0-dev", path = "../../../../frame/support" }
frame-system = { default-features = false, version = "4.0.0-dev", path = "../../../../frame/system" }
frame-benchmarking = { default-features = false, version = "4.0.0-dev", path = "../../../../frame/benchmarking", optional = true }
frame-system = { default-features = false, version = "4.0.0-dev", path = "../../../../frame/system" }
frame-benchmarking = { default-features = false, version = "4.0.0-dev", path = "../../../../frame/benchmarking", optional = true }

[dev-dependencies]
serde = { version = "1.0.126" }
sp-core = { default-features = false, version = "4.0.0-dev", path = "../../../../primitives/core" }
sp-io = { default-features = false, version = "4.0.0-dev", path = "../../../../primitives/io" }
sp-runtime = { default-features = false, version = "4.0.0-dev", path = "../../../../primitives/runtime" }
Expand Down
5 changes: 3 additions & 2 deletions bin/node/bench/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ log = "0.4.8"
node-primitives = { version = "2.0.0", path = "../primitives" }
node-testing = { version = "3.0.0-dev", path = "../testing" }
node-runtime = { version = "3.0.0-dev", path = "../runtime" }
sc-cli = { version = "0.10.0-dev", path = "../../../client/cli" }
sc-client-api = { version = "4.0.0-dev", path = "../../../client/api/" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-machine" }
Expand All @@ -36,7 +35,9 @@ 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.10.0", default-features = false, features = ["primitive-types"] }
parity-util-mem = { version = "0.10.0", default-features = false, features = [
"primitive-types",
] }
parity-db = { version = "0.3" }
sc-transaction-pool = { version = "4.0.0-dev", path = "../../../client/transaction-pool" }
sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../client/transaction-pool/api" }
Expand Down
8 changes: 3 additions & 5 deletions bin/node/browser-testing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,16 @@ edition = "2018"
license = "Apache-2.0"

[dependencies]
futures-timer = "3.0.2"
libp2p = { version = "0.37.1", default-features = false }
jsonrpc-core = "18.0.0"
serde = "1.0.126"
serde_json = "1.0.48"
wasm-bindgen = { version = "=0.2.73", features = ["serde-serialize"] }
wasm-bindgen-futures = "0.4.18"
wasm-bindgen-test = "0.3.18"
futures = "0.3.9"

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

# This is a HACK to make browser tests pass.
# enables [`instant/wasm_bindgen`]
Expand Down
46 changes: 20 additions & 26 deletions bin/node/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,9 @@ hex-literal = "0.3.1"
log = "0.4.8"
rand = "0.7.2"
structopt = { version = "0.3.8", optional = true }
parking_lot = "0.11.1"

# primitives
sp-authority-discovery = { version = "4.0.0-dev", path = "../../../primitives/authority-discovery" }
sp-authority-discovery = { version = "4.0.0-dev", path = "../../../primitives/authority-discovery" }
sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" }
grandpa-primitives = { version = "4.0.0-dev", package = "sp-finality-grandpa", path = "../../../primitives/finality-grandpa" }
sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
Expand All @@ -54,7 +53,6 @@ sp-authorship = { version = "4.0.0-dev", path = "../../../primitives/authorship"
sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
sp-keyring = { version = "4.0.0-dev", path = "../../../primitives/keyring" }
sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
sp-transaction-pool = { version = "4.0.0-dev", path = "../../../primitives/transaction-pool" }
sp-transaction-storage-proof = { version = "4.0.0-dev", path = "../../../primitives/transaction-storage-proof" }
Expand All @@ -70,28 +68,17 @@ sc-consensus-slots = { version = "0.10.0-dev", path = "../../../client/consensus
sc-consensus-babe = { version = "0.10.0-dev", path = "../../../client/consensus/babe" }
sc-consensus-uncles = { version = "0.10.0-dev", path = "../../../client/consensus/uncles" }
grandpa = { version = "0.10.0-dev", package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
sc-client-db = { version = "0.10.0-dev", default-features = false, path = "../../../client/db" }
sc-offchain = { version = "4.0.0-dev", path = "../../../client/offchain" }
sc-rpc = { version = "4.0.0-dev", path = "../../../client/rpc" }
sc-basic-authorship = { version = "0.10.0-dev", path = "../../../client/basic-authorship" }
sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service" }
sc-tracing = { version = "4.0.0-dev", path = "../../../client/tracing" }
sc-telemetry = { version = "4.0.0-dev", path = "../../../client/telemetry" }
sc-authority-discovery = { version = "0.10.0-dev", path = "../../../client/authority-discovery" }
sc-authority-discovery = { version = "0.10.0-dev", path = "../../../client/authority-discovery" }
sc-sync-state-rpc = { version = "0.10.0-dev", path = "../../../client/sync-state-rpc" }

# frame dependencies
pallet-indices = { version = "4.0.0-dev", path = "../../../frame/indices" }
pallet-timestamp = { version = "4.0.0-dev", default-features = false, path = "../../../frame/timestamp" }
pallet-contracts = { version = "4.0.0-dev", path = "../../../frame/contracts" }
frame-system = { version = "4.0.0-dev", path = "../../../frame/system" }
pallet-balances = { version = "4.0.0-dev", path = "../../../frame/balances" }
pallet-transaction-payment = { version = "4.0.0-dev", path = "../../../frame/transaction-payment" }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../../../frame/support" }
pallet-im-online = { version = "4.0.0-dev", default-features = false, path = "../../../frame/im-online" }
pallet-authority-discovery = { version = "4.0.0-dev", path = "../../../frame/authority-discovery" }
pallet-staking = { version = "4.0.0-dev", path = "../../../frame/staking" }
pallet-grandpa = { version = "4.0.0-dev", path = "../../../frame/grandpa" }

# node-specific dependencies
node-runtime = { version = "3.0.0-dev", path = "../runtime" }
Expand All @@ -108,14 +95,24 @@ try-runtime-cli = { version = "0.10.0-dev", optional = true, path = "../../../ut
# WASM-specific dependencies
wasm-bindgen = { version = "0.2.73", optional = true }
wasm-bindgen-futures = { version = "0.4.18", optional = true }
browser-utils = { package = "substrate-browser-utils", path = "../../../utils/browser", optional = true, version = "0.10.0-dev"}
libp2p-wasm-ext = { version = "0.28", features = ["websocket"], optional = true }
browser-utils = { package = "substrate-browser-utils", path = "../../../utils/browser", optional = true, version = "0.10.0-dev" }
libp2p-wasm-ext = { version = "0.28", features = [
"websocket",
], optional = true }

[target.'cfg(target_arch="x86_64")'.dependencies]
node-executor = { version = "3.0.0-dev", path = "../executor", features = [ "wasmtime" ] }
sc-cli = { version = "0.10.0-dev", optional = true, path = "../../../client/cli", features = [ "wasmtime" ] }
sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service", features = [ "wasmtime" ] }
sp-trie = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/trie", features = ["memory-tracker"] }
node-executor = { version = "3.0.0-dev", path = "../executor", features = [
"wasmtime",
] }
sc-cli = { version = "0.10.0-dev", optional = true, path = "../../../client/cli", features = [
"wasmtime",
] }
sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service", features = [
"wasmtime",
] }
sp-trie = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/trie", features = [
"memory-tracker",
] }

[dev-dependencies]
sc-keystore = { version = "4.0.0-dev", path = "../../../client/keystore" }
Expand Down Expand Up @@ -148,7 +145,7 @@ path = "../../../client/cli"
optional = true

[features]
default = [ "cli" ]
default = ["cli"]
browser = [
"browser-utils",
"wasm-bindgen",
Expand All @@ -172,7 +169,4 @@ runtime-benchmarks = [
]
# Enable features that allow the runtime to be tried and debugged. Name might be subject to change
# in the near future.
try-runtime = [
"node-runtime/try-runtime",
"try-runtime-cli",
]
try-runtime = ["node-runtime/try-runtime", "try-runtime-cli"]
5 changes: 3 additions & 2 deletions bin/node/cli/tests/export_import_flow.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,9 @@ impl<'a> ExportImportRevertExecutor<'a> {
let sub_command_str = sub_command.to_string();
// Adding "--binary" if need be.
let arguments: Vec<&str> = match format_opt {
FormatOpt::Binary =>
vec![&sub_command_str, "--dev", "--pruning", "archive", "--binary", "-d"],
FormatOpt::Binary => {
vec![&sub_command_str, "--dev", "--pruning", "archive", "--binary", "-d"]
},
FormatOpt::Json => vec![&sub_command_str, "--dev", "--pruning", "archive", "-d"],
};

Expand Down
15 changes: 2 additions & 13 deletions bin/node/executor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@ node-runtime = { version = "3.0.0-dev", path = "../runtime" }
sc-executor = { version = "0.10.0-dev", path = "../../../client/executor" }
sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-machine" }
sp-trie = { version = "4.0.0-dev", path = "../../../primitives/trie" }
trie-root = "0.16.0"
frame-benchmarking = { version = "4.0.0-dev", path = "../../../frame/benchmarking" }

[dev-dependencies]
Expand All @@ -31,28 +29,19 @@ frame-system = { version = "4.0.0-dev", path = "../../../frame/system" }
node-testing = { version = "3.0.0-dev", path = "../testing" }
pallet-balances = { version = "4.0.0-dev", path = "../../../frame/balances" }
pallet-contracts = { version = "4.0.0-dev", path = "../../../frame/contracts" }
pallet-grandpa = { version = "4.0.0-dev", path = "../../../frame/grandpa" }
pallet-im-online = { version = "4.0.0-dev", path = "../../../frame/im-online" }
pallet-indices = { version = "4.0.0-dev", path = "../../../frame/indices" }
pallet-session = { version = "4.0.0-dev", path = "../../../frame/session" }
pallet-timestamp = { version = "4.0.0-dev", path = "../../../frame/timestamp" }
pallet-transaction-payment = { version = "4.0.0-dev", path = "../../../frame/transaction-payment" }
pallet-treasury = { version = "4.0.0-dev", path = "../../../frame/treasury" }
sp-application-crypto = { version = "4.0.0-dev", path = "../../../primitives/application-crypto" }
sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
sp-externalities = { version = "0.10.0-dev", path = "../../../primitives/externalities" }
substrate-test-client = { version = "2.0.0", path = "../../../test-utils/client" }
wat = "1.0"
futures = "0.3.9"

[features]
wasmtime = [
"sc-executor/wasmtime",
]
wasmi-errno = [
"sc-executor/wasmi-errno",
]
wasmtime = ["sc-executor/wasmtime"]
wasmi-errno = ["sc-executor/wasmi-errno"]
stress-test = []

[[bench]]
Expand Down
1 change: 0 additions & 1 deletion bin/node/inspect/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0" }
derive_more = "0.99"
log = "0.4.8"
sc-cli = { version = "0.10.0-dev", path = "../../../client/cli" }
sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service" }
Expand Down
8 changes: 3 additions & 5 deletions bin/node/primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,14 @@ repository = "https:/paritytech/substrate/"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
"derive",
] }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../../../frame/system" }
sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/application-crypto" }
sp-core = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/core" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }

[dev-dependencies]
sp-serializer = { version = "3.0.0", path = "../../../primitives/serializer" }
pretty_assertions = "0.6.1"

[features]
default = ["std"]
std = [
Expand Down
5 changes: 3 additions & 2 deletions bin/node/rpc-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
futures = "0.3.16"
jsonrpc-core-client = { version = "18.0.0", default-features = false, features = ["http"] }
log = "0.4.8"
jsonrpc-core-client = { version = "18.0.0", default-features = false, features = [
"http",
] }
node-primitives = { version = "2.0.0", path = "../primitives" }
sp-tracing = { version = "4.0.0-dev", path = "../../../primitives/tracing" }
sc-rpc = { version = "4.0.0-dev", path = "../../../client/rpc" }
1 change: 0 additions & 1 deletion bin/node/rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ sc-consensus-epochs = { version = "0.10.0-dev", path = "../../../client/consensu
sc-chain-spec = { version = "4.0.0-dev", path = "../../../client/chain-spec" }
sc-finality-grandpa = { version = "0.10.0-dev", path = "../../../client/finality-grandpa" }
sc-finality-grandpa-rpc = { version = "0.10.0-dev", path = "../../../client/finality-grandpa/rpc" }
sc-keystore = { version = "4.0.0-dev", path = "../../../client/keystore" }
sc-rpc-api = { version = "0.10.0-dev", path = "../../../client/rpc-api" }
sc-rpc = { version = "4.0.0-dev", path = "../../../client/rpc" }
sc-sync-state-rpc = { version = "0.10.0-dev", path = "../../../client/sync-state-rpc" }
Expand Down
17 changes: 10 additions & 7 deletions bin/node/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,18 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]

# third-party dependencies
codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = [
"derive",
"max-encoded-len",
] }
static_assertions = "1.1.0"
hex-literal = { version = "0.3.1", optional = true }
log = { version = "0.4.14", default-features = false }

# primitives
sp-authority-discovery = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/authority-discovery" }
sp-consensus-babe = { version = "0.10.0-dev", default-features = false, path = "../../../primitives/consensus/babe" }
sp-block-builder = { path = "../../../primitives/block-builder", default-features = false, version = "4.0.0-dev"}
sp-block-builder = { path = "../../../primitives/block-builder", default-features = false, version = "4.0.0-dev" }
sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/inherents" }
node-primitives = { version = "2.0.0", default-features = false, path = "../primitives" }
sp-offchain = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/offchain" }
Expand Down Expand Up @@ -73,7 +76,9 @@ pallet-offences-benchmarking = { version = "4.0.0-dev", path = "../../../frame/o
pallet-proxy = { version = "4.0.0-dev", default-features = false, path = "../../../frame/proxy" }
pallet-randomness-collective-flip = { version = "4.0.0-dev", default-features = false, path = "../../../frame/randomness-collective-flip" }
pallet-recovery = { version = "4.0.0-dev", default-features = false, path = "../../../frame/recovery" }
pallet-session = { version = "4.0.0-dev", features = ["historical"], path = "../../../frame/session", default-features = false }
pallet-session = { version = "4.0.0-dev", features = [
"historical",
], path = "../../../frame/session", default-features = false }
pallet-session-benchmarking = { version = "4.0.0-dev", path = "../../../frame/session/benchmarking", default-features = false, optional = true }
pallet-staking = { version = "4.0.0-dev", default-features = false, path = "../../../frame/staking" }
pallet-staking-reward-curve = { version = "4.0.0-dev", default-features = false, path = "../../../frame/staking/reward-curve" }
Expand All @@ -98,7 +103,7 @@ sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }

[features]
default = ["std"]
with-tracing = [ "frame-executive/with-tracing" ]
with-tracing = ["frame-executive/with-tracing"]
std = [
"sp-authority-discovery/std",
"pallet-assets/std",
Expand Down Expand Up @@ -247,6 +252,4 @@ try-runtime = [
]
# Make contract callable functions marked as __unstable__ available. Do not enable
# on live chains as those are subject to change.
contracts-unstable-interface = [
"pallet-contracts/unstable-interface"
]
contracts-unstable-interface = ["pallet-contracts/unstable-interface"]
12 changes: 0 additions & 12 deletions bin/node/test-runner-example/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ publish = false
test-runner = { path = "../../../test-utils/test-runner" }

frame-system = { path = "../../../frame/system" }
frame-support = { path = "../../../frame/support" }
frame-benchmarking = { path = "../../../frame/benchmarking" }
pallet-balances = { path = "../../../frame/balances" }
pallet-sudo = { path = "../../../frame/sudo" }
pallet-transaction-payment = { path = "../../../frame/transaction-payment" }

node-runtime = { path = "../runtime" }
Expand All @@ -25,16 +22,7 @@ sc-consensus-babe = { path = "../../../client/consensus/babe" }
sc-consensus-manual-seal = { path = "../../../client/consensus/manual-seal" }
sc-service = { default-features = false, path = "../../../client/service" }
sc-executor = { path = "../../../client/executor" }
sc-client-api = { path = "../../../client/api" }
sc-network = { path = "../../../client/network" }
sc-informant = { path = "../../../client/informant" }
sc-consensus = { path = "../../../client/consensus/common" }

sp-runtime = { path = "../../../primitives/runtime" }
sp-keyring = { path = "../../../primitives/keyring" }
sp-timestamp = { path = "../../../primitives/timestamp" }
sp-api = { path = "../../../primitives/api" }
sp-inherents = { path = "../../../primitives/inherents" }
sp-keystore = { path = "../../../primitives/keystore" }

log = "0.4.14"
Loading

0 comments on commit e4a0cc4

Please sign in to comment.