diff --git a/Cargo.lock b/Cargo.lock index c1d7c71a5423d5bbd93a6d39c766bfbb7cb738d4..0d42a044819989edcc21fdeb2be1a4ad7fa37832 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1255,38 +1255,24 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "frame-system-benchmarking", - "frame-try-runtime", - "pallet-atomic-swap", "pallet-authority-members", "pallet-babe", "pallet-balances", "pallet-certification", - "pallet-collective", "pallet-distance", "pallet-duniter-account", "pallet-duniter-wot", - "pallet-grandpa", "pallet-identity", - "pallet-im-online", "pallet-membership", - "pallet-multisig", "pallet-offences", - "pallet-oneshot-account", - "pallet-preimage", "pallet-provide-randomness", - "pallet-proxy", "pallet-quota", - "pallet-scheduler", "pallet-session", "pallet-smith-members", - "pallet-sudo", "pallet-timestamp", "pallet-transaction-payment", "pallet-treasury", "pallet-universal-dividend", - "pallet-upgrade-origin", - "pallet-utility", "parity-scale-codec", "scale-info", "serde", @@ -2287,7 +2273,6 @@ dependencies = [ "portpicker", "serde_json", "sp-core", - "sp-core-hashing", "sp-keyring", "sp-runtime", "subxt", @@ -2300,7 +2285,6 @@ version = "1.0.0" dependencies = [ "anyhow", "countmap", - "hex-literal", "parity-scale-codec", "sp-core", "sp-runtime", @@ -6540,7 +6524,6 @@ dependencies = [ name = "pallet-duniter-test-parameters" version = "1.0.0" dependencies = [ - "frame-benchmarking", "frame-support", "frame-system", "pallet-duniter-test-parameters-macro", @@ -10770,14 +10753,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "sp-core-hashing" -version = "16.0.0" -source = "git+https://github.com/duniter/duniter-polkadot-sdk?branch=duniter-substrate-v1.16.0#90e77c4c212232c85b81fbd9e83064a3e7586db7" -dependencies = [ - "sp-crypto-hashing", -] - [[package]] name = "sp-crypto-hashing" version = "0.1.0" diff --git a/end2end-tests/Cargo.toml b/end2end-tests/Cargo.toml index d045afbb890d7429f99f0cb14e798b5ef738795a..a88a2395501c50d4216502a75145fa90e38e81ae 100644 --- a/end2end-tests/Cargo.toml +++ b/end2end-tests/Cargo.toml @@ -20,7 +20,6 @@ std = [ "distance-oracle/std", "hex/std", "serde_json/std", - "sp-core-hashing/std", "sp-core/std", "sp-runtime/std", ] @@ -42,7 +41,6 @@ notify-debouncer-mini = { workspace = true } portpicker = { workspace = true } serde_json = { workspace = true } sp-core = { workspace = true } -sp-core-hashing = { workspace = true } sp-keyring = { workspace = true } sp-runtime = { workspace = true } subxt = { workspace = true, features = [ diff --git a/live-tests/Cargo.toml b/live-tests/Cargo.toml index 620bfd4b534cee4e3aa0fff458e2094ee59b4c55..3faa5c2eb7d4f8cca2a185b3f274da7ce260f6bd 100644 --- a/live-tests/Cargo.toml +++ b/live-tests/Cargo.toml @@ -12,7 +12,6 @@ version.workspace = true anyhow = { workspace = true } codec = { workspace = true } countmap = { workspace = true } -hex-literal = { workspace = true } sp-core = { workspace = true } sp-runtime = { workspace = true } subxt = { workspace = true, features = [ diff --git a/node/src/cli.rs b/node/src/cli.rs index 175ffa56a601623feb9a1ffcc87836a6576178c4..a494a87277526392ea467bd24b12c5e60f1d553c 100644 --- a/node/src/cli.rs +++ b/node/src/cli.rs @@ -80,14 +80,6 @@ pub enum Subcommand { /// The pallet benchmarking moved to the `pallet` sub-command. #[clap(subcommand)] Benchmark(Box<frame_benchmarking_cli::BenchmarkCmd>), - - /// Try some command against runtime state. - #[cfg(feature = "try-runtime")] - TryRuntime, - - /// Try some command against runtime state. Note: `try-runtime` feature must be enabled. - #[cfg(not(feature = "try-runtime"))] - TryRuntime, } /// Block authoring scheme to be used by the node diff --git a/node/src/command.rs b/node/src/command.rs index be3e2b16f35cb1ad9af28f837fb71d25cd9ca367..29af1944580fb2cbd3d0cef340c20c0fb9e2b70d 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -362,12 +362,6 @@ pub fn run() -> sc_cli::Result<()> { You can enable it with `--features runtime-benchmarks`." .into()) } - #[cfg(feature = "try-runtime")] - Some(Subcommand::TryRuntime) => Err(try_runtime_cli::DEPRECATION_NOTICE.into()), - #[cfg(not(feature = "try-runtime"))] - Some(Subcommand::TryRuntime) => Err("TryRuntime wasn't enabled when building the node. \ - You can enable it with `--features try-runtime`." - .into()), None => { let runner = cli.create_runner(&cli.run)?; runner.run_node_until_exit(|mut config| async move { diff --git a/pallets/duniter-test-parameters/Cargo.toml b/pallets/duniter-test-parameters/Cargo.toml index 7e58faf1a3287ac8631cd40b1dd131895e035738..0aa8a0d60ca9fae5d9ab1ebeb7b02fb516c51dc3 100644 --- a/pallets/duniter-test-parameters/Cargo.toml +++ b/pallets/duniter-test-parameters/Cargo.toml @@ -11,14 +11,12 @@ version.workspace = true [features] default = ["std"] runtime-benchmarks = [ - "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", ] std = [ "codec/std", - "frame-benchmarking?/std", "frame-support/std", "frame-system/std", "scale-info/std", @@ -39,7 +37,6 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { workspace = true, features = ["derive"] } -frame-benchmarking = { workspace = true, optional = true } frame-support = { workspace = true } frame-system = { workspace = true } pallet-duniter-test-parameters-macro = { workspace = true } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 028f83930f847e246b9677c5584c2fb9ece77dc0..3bce7226e7e879e37e1718482350df827cfe9228 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -16,35 +16,23 @@ constant-fees = [] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", - "frame-system-benchmarking/runtime-benchmarks", "frame-system/runtime-benchmarks", "pallet-authority-members/runtime-benchmarks", "pallet-babe/runtime-benchmarks", "pallet-balances/runtime-benchmarks", "pallet-certification/runtime-benchmarks", - "pallet-collective/runtime-benchmarks", "pallet-distance/runtime-benchmarks", "pallet-duniter-account/runtime-benchmarks", "pallet-duniter-wot/runtime-benchmarks", - "pallet-grandpa/runtime-benchmarks", "pallet-identity/runtime-benchmarks", - "pallet-im-online/runtime-benchmarks", "pallet-membership/runtime-benchmarks", - "pallet-multisig/runtime-benchmarks", "pallet-offences/runtime-benchmarks", - "pallet-oneshot-account/runtime-benchmarks", - "pallet-preimage/runtime-benchmarks", "pallet-provide-randomness/runtime-benchmarks", - "pallet-proxy/runtime-benchmarks", "pallet-quota/runtime-benchmarks", - "pallet-scheduler/runtime-benchmarks", "pallet-smith-members/runtime-benchmarks", - "pallet-sudo/runtime-benchmarks", "pallet-timestamp/runtime-benchmarks", "pallet-treasury/runtime-benchmarks", "pallet-universal-dividend/runtime-benchmarks", - "pallet-upgrade-origin/runtime-benchmarks", - "pallet-utility/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", ] @@ -53,38 +41,24 @@ std = [ "duniter-primitives/std", "frame-benchmarking/std", "frame-support/std", - "frame-system-benchmarking?/std", "frame-system/std", - "frame-try-runtime/std", "pallet-authority-members/std", - "pallet-atomic-swap/std", "pallet-babe/std", "pallet-balances/std", "pallet-certification/std", - "pallet-collective/std", "pallet-distance/std", "pallet-duniter-account/std", "pallet-duniter-wot/std", - "pallet-grandpa/std", "pallet-identity/std", - "pallet-im-online/std", "pallet-membership/std", - "pallet-multisig/std", "pallet-offences/std", - "pallet-oneshot-account/std", - "pallet-preimage/std", "pallet-provide-randomness/std", - "pallet-proxy/std", "pallet-quota/std", - "pallet-scheduler/std", "pallet-session/std", "pallet-smith-members/std", - "pallet-sudo/std", "pallet-timestamp/std", "pallet-treasury/std", "pallet-universal-dividend/std", - "pallet-upgrade-origin/std", - "pallet-utility/std", "scale-info/std", "serde/std", "sp-arithmetic/std", @@ -99,37 +73,24 @@ try-runtime = [ "duniter-primitives/try-runtime", "frame-support/try-runtime", "frame-system/try-runtime", - "frame-try-runtime/try-runtime", "pallet-authority-members/try-runtime", - "pallet-atomic-swap/try-runtime", "pallet-babe/try-runtime", "pallet-balances/try-runtime", "pallet-certification/try-runtime", - "pallet-collective/try-runtime", "pallet-distance/try-runtime", "pallet-duniter-account/try-runtime", "pallet-duniter-wot/try-runtime", - "pallet-grandpa/try-runtime", "pallet-identity/try-runtime", - "pallet-im-online/try-runtime", "pallet-membership/try-runtime", - "pallet-multisig/try-runtime", "pallet-offences/try-runtime", - "pallet-oneshot-account/try-runtime", - "pallet-preimage/try-runtime", "pallet-provide-randomness/try-runtime", - "pallet-proxy/try-runtime", "pallet-quota/try-runtime", - "pallet-scheduler/try-runtime", "pallet-session/try-runtime", "pallet-smith-members/try-runtime", - "pallet-sudo/try-runtime", "pallet-timestamp/try-runtime", "pallet-transaction-payment/try-runtime", "pallet-treasury/try-runtime", "pallet-universal-dividend/try-runtime", - "pallet-upgrade-origin/try-runtime", - "pallet-utility/try-runtime", "sp-membership/try-runtime", "sp-runtime/try-runtime", ] @@ -140,38 +101,24 @@ duniter-primitives = { workspace = true } frame-benchmarking = { workspace = true } frame-support = { workspace = true } frame-system = { workspace = true } -frame-system-benchmarking = { workspace = true, optional = true } -frame-try-runtime = { workspace = true, optional = true } pallet-authority-members = { workspace = true } -pallet-atomic-swap = { workspace = true } pallet-babe = { workspace = true } pallet-balances = { workspace = true } pallet-certification = { workspace = true } -pallet-collective = { workspace = true } pallet-distance = { workspace = true } pallet-duniter-account = { workspace = true } pallet-duniter-wot = { workspace = true } -pallet-grandpa = { workspace = true } pallet-identity = { workspace = true } -pallet-im-online = { workspace = true } pallet-membership = { workspace = true } -pallet-multisig = { workspace = true } pallet-offences = { workspace = true } -pallet-oneshot-account = { workspace = true } -pallet-preimage = { workspace = true } pallet-provide-randomness = { workspace = true } -pallet-proxy = { workspace = true } pallet-quota = { workspace = true } -pallet-scheduler = { workspace = true } pallet-session = { workspace = true } pallet-smith-members = { workspace = true } -pallet-sudo = { workspace = true } pallet-timestamp = { workspace = true } pallet-transaction-payment = { workspace = true } pallet-treasury = { workspace = true } pallet-universal-dividend = { workspace = true } -pallet-upgrade-origin = { workspace = true } -pallet-utility = { workspace = true } scale-info = { workspace = true, features = ["derive"] } serde = { workspace = true } smallvec = { workspace = true }