From 9047bbb39228d5961965a42e36d15af4a93d3f30 Mon Sep 17 00:00:00 2001 From: Shaun Wang Date: Thu, 18 Mar 2021 23:10:17 +1300 Subject: [PATCH] Companion for #8372 (Replace 'Module' with 'Pallet' in construct_runtime macro) (#2629) * Replace 'Module' with 'Pallet'. * "Update Substrate" * fix babe usage * fix benchmark Co-authored-by: parity-processbot <> Co-authored-by: thiolliere --- polkadot/Cargo.lock | 292 +++++++++--------- .../bridges/bin/millau/runtime/src/lib.rs | 32 +- .../bridges/bin/rialto/runtime/src/lib.rs | 62 ++-- .../bridges/modules/call-dispatch/src/lib.rs | 4 +- .../modules/currency-exchange/src/lib.rs | 4 +- polkadot/bridges/modules/ethereum/src/mock.rs | 4 +- .../modules/finality-verifier/src/lib.rs | 4 +- .../modules/finality-verifier/src/mock.rs | 6 +- .../message-lane/src/instant_payments.rs | 4 +- .../bridges/modules/message-lane/src/mock.rs | 8 +- .../modules/shift-session-manager/src/lib.rs | 6 +- .../bridges/modules/substrate/src/mock.rs | 4 +- polkadot/runtime/common/src/auctions.rs | 30 +- polkadot/runtime/common/src/claims.rs | 8 +- polkadot/runtime/common/src/crowdloan.rs | 22 +- polkadot/runtime/common/src/impls.rs | 12 +- .../runtime/common/src/integration_tests.rs | 22 +- polkadot/runtime/common/src/lib.rs | 4 +- polkadot/runtime/common/src/mock.rs | 4 +- .../runtime/common/src/paras_registrar.rs | 10 +- polkadot/runtime/common/src/purchase.rs | 10 +- polkadot/runtime/common/src/slots.rs | 12 +- polkadot/runtime/kusama/src/lib.rs | 74 ++--- polkadot/runtime/parachains/src/dmp.rs | 2 +- polkadot/runtime/parachains/src/hrmp.rs | 2 +- polkadot/runtime/parachains/src/inclusion.rs | 12 +- .../parachains/src/inclusion_inherent.rs | 6 +- polkadot/runtime/parachains/src/mock.rs | 26 +- polkadot/runtime/parachains/src/paras.rs | 6 +- .../parachains/src/runtime_api_impl/v1.rs | 8 +- polkadot/runtime/parachains/src/scheduler.rs | 4 +- polkadot/runtime/polkadot/src/lib.rs | 70 ++--- polkadot/runtime/rococo/src/lib.rs | 60 ++-- .../runtime/rococo/src/propose_parachain.rs | 8 +- polkadot/runtime/test-runtime/src/lib.rs | 54 ++-- polkadot/runtime/westend/src/lib.rs | 88 +++--- 36 files changed, 491 insertions(+), 493 deletions(-) diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock index 6b53e9089c..329d9e4841 100644 --- a/polkadot/Cargo.lock +++ b/polkadot/Cargo.lock @@ -1,7 +1,5 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 - [[package]] name = "Inflector" version = "0.11.4" @@ -1654,7 +1652,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "parity-scale-codec", ] @@ -1672,7 +1670,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "3.1.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-support", "frame-system", @@ -1691,7 +1689,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "Inflector", "chrono", @@ -1714,7 +1712,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-support", "frame-system", @@ -1727,7 +1725,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-support", "frame-system", @@ -1743,7 +1741,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "13.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "parity-scale-codec", "serde", @@ -1754,7 +1752,7 @@ dependencies = [ [[package]] name = "frame-support" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "bitflags", "frame-metadata", @@ -1780,7 +1778,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -1792,7 +1790,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.0.0", @@ -1804,7 +1802,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "proc-macro2", "quote", @@ -1814,7 +1812,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-metadata", "frame-support", @@ -1835,7 +1833,7 @@ dependencies = [ [[package]] name = "frame-system" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1852,7 +1850,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-benchmarking", "frame-support", @@ -1866,7 +1864,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "parity-scale-codec", "sp-api", @@ -1875,7 +1873,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-support", "parity-scale-codec", @@ -4177,7 +4175,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b" [[package]] name = "pallet-authority-discovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-support", "frame-system", @@ -4193,7 +4191,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-support", "frame-system", @@ -4208,7 +4206,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4232,7 +4230,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4247,7 +4245,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4262,7 +4260,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4279,7 +4277,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4294,7 +4292,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4315,7 +4313,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4331,7 +4329,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4353,7 +4351,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4369,7 +4367,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4389,7 +4387,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4406,7 +4404,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-support", "frame-system", @@ -4420,7 +4418,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4436,7 +4434,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-support", "frame-system", @@ -4450,7 +4448,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-support", "frame-system", @@ -4466,7 +4464,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4488,7 +4486,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4504,7 +4502,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-support", "frame-system", @@ -4517,7 +4515,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "enumflags2", "frame-support", @@ -4532,7 +4530,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4548,7 +4546,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-support", "frame-system", @@ -4568,7 +4566,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4584,7 +4582,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-support", "frame-system", @@ -4598,7 +4596,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4622,7 +4620,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -4633,7 +4631,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-support", "frame-system", @@ -4647,7 +4645,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4666,7 +4664,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4681,7 +4679,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-support", "frame-system", @@ -4697,7 +4695,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4714,7 +4712,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -4725,7 +4723,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4741,7 +4739,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4757,7 +4755,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "enumflags2", "frame-benchmarking", @@ -6924,7 +6922,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "env_logger 0.8.2", "hex-literal", @@ -7180,7 +7178,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "async-trait", "derive_more", @@ -7208,7 +7206,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -7231,7 +7229,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -7247,7 +7245,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7268,7 +7266,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -7279,7 +7277,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "chrono", "fdlimit", @@ -7317,7 +7315,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "derive_more", "fnv", @@ -7351,7 +7349,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "blake2-rfc", "hash-db", @@ -7381,7 +7379,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "sc-client-api", "sp-blockchain", @@ -7392,7 +7390,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "derive_more", "fork-tree", @@ -7438,7 +7436,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "derive_more", "futures 0.3.12", @@ -7462,7 +7460,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "fork-tree", "parity-scale-codec", @@ -7475,7 +7473,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -7502,7 +7500,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "log", "sc-client-api", @@ -7516,7 +7514,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "derive_more", "lazy_static", @@ -7545,7 +7543,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "derive_more", "parity-scale-codec", @@ -7561,7 +7559,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "log", "parity-scale-codec", @@ -7576,7 +7574,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "log", "parity-scale-codec", @@ -7594,7 +7592,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "derive_more", "dyn-clone", @@ -7633,7 +7631,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "derive_more", "finality-grandpa", @@ -7657,7 +7655,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-warp-sync" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "derive_more", "futures 0.3.12", @@ -7678,7 +7676,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "ansi_term 0.12.1", "futures 0.3.12", @@ -7696,7 +7694,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "async-trait", "derive_more", @@ -7716,7 +7714,7 @@ dependencies = [ [[package]] name = "sc-light" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "hash-db", "lazy_static", @@ -7735,7 +7733,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "async-std", "async-trait", @@ -7788,7 +7786,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -7804,7 +7802,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "bytes 0.5.6", "fnv", @@ -7832,7 +7830,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "futures 0.3.12", "libp2p", @@ -7845,7 +7843,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7854,7 +7852,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "futures 0.3.12", "hash-db", @@ -7888,7 +7886,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "derive_more", "futures 0.3.12", @@ -7912,7 +7910,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "futures 0.1.29", "jsonrpc-core", @@ -7930,7 +7928,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "directories", "exit-future", @@ -7993,7 +7991,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "log", "parity-scale-codec", @@ -8008,7 +8006,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -8028,7 +8026,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "chrono", "futures 0.3.12", @@ -8048,7 +8046,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "ansi_term 0.12.1", "atty", @@ -8075,7 +8073,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -8086,7 +8084,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "derive_more", "futures 0.3.12", @@ -8108,7 +8106,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "futures 0.3.12", "futures-diagnose", @@ -8514,7 +8512,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "log", "sp-core", @@ -8526,7 +8524,7 @@ dependencies = [ [[package]] name = "sp-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "hash-db", "log", @@ -8543,7 +8541,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "blake2-rfc", "proc-macro-crate 1.0.0", @@ -8555,7 +8553,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "parity-scale-codec", "serde", @@ -8567,7 +8565,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "integer-sqrt", "num-traits", @@ -8580,7 +8578,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "parity-scale-codec", "sp-api", @@ -8592,7 +8590,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -8603,7 +8601,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "parity-scale-codec", "sp-api", @@ -8615,7 +8613,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "futures 0.3.12", "log", @@ -8633,7 +8631,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "serde", "serde_json", @@ -8642,7 +8640,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -8668,7 +8666,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "merlin", "parity-scale-codec", @@ -8689,7 +8687,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -8699,7 +8697,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -8711,7 +8709,7 @@ dependencies = [ [[package]] name = "sp-core" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "base58", "blake2-rfc", @@ -8755,7 +8753,7 @@ dependencies = [ [[package]] name = "sp-database" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -8764,7 +8762,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "proc-macro2", "quote", @@ -8774,7 +8772,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "environmental", "parity-scale-codec", @@ -8785,7 +8783,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "finality-grandpa", "log", @@ -8802,7 +8800,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "parity-scale-codec", "parking_lot 0.11.1", @@ -8814,7 +8812,7 @@ dependencies = [ [[package]] name = "sp-io" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "futures 0.3.12", "hash-db", @@ -8838,7 +8836,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "lazy_static", "sp-core", @@ -8849,7 +8847,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "async-trait", "derive_more", @@ -8866,7 +8864,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "parity-scale-codec", "serde", @@ -8879,7 +8877,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -8890,7 +8888,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "sp-api", "sp-core", @@ -8900,7 +8898,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "backtrace", ] @@ -8908,7 +8906,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "serde", "sp-core", @@ -8917,7 +8915,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "either", "hash256-std-hasher", @@ -8938,7 +8936,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8955,7 +8953,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "Inflector", "proc-macro-crate 1.0.0", @@ -8967,7 +8965,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "serde", "serde_json", @@ -8976,7 +8974,7 @@ dependencies = [ [[package]] name = "sp-session" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "parity-scale-codec", "sp-api", @@ -8989,7 +8987,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -8999,7 +8997,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "hash-db", "log", @@ -9021,12 +9019,12 @@ dependencies = [ [[package]] name = "sp-std" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" [[package]] name = "sp-storage" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9039,7 +9037,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "log", "sp-core", @@ -9052,7 +9050,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "parity-scale-codec", "sp-api", @@ -9065,7 +9063,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "log", "parity-scale-codec", @@ -9078,7 +9076,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "derive_more", "futures 0.3.12", @@ -9094,7 +9092,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "hash-db", "memory-db", @@ -9108,7 +9106,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "futures 0.3.12", "futures-core", @@ -9120,7 +9118,7 @@ dependencies = [ [[package]] name = "sp-version" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9132,7 +9130,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9264,7 +9262,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "chrono", "console_error_panic_hook", @@ -9290,7 +9288,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "platforms", ] @@ -9298,7 +9296,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.12", @@ -9321,7 +9319,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "async-std", "derive_more", @@ -9335,7 +9333,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "futures 0.1.29", "futures 0.3.12", @@ -9363,7 +9361,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "futures 0.3.12", "substrate-test-utils-derive", @@ -9373,7 +9371,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "proc-macro-crate 1.0.0", "quote", @@ -10056,7 +10054,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" [[package]] name = "try-runtime-cli" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a0161f3b224a0607b351ae23b41621b01126a893" +source = "git+https://github.com/paritytech/substrate#cc24950837d3a98727b12ba9229f2aabb67f411c" dependencies = [ "frame-try-runtime", "log", diff --git a/polkadot/bridges/bin/millau/runtime/src/lib.rs b/polkadot/bridges/bin/millau/runtime/src/lib.rs index 7446a72f2b..7b686f1047 100644 --- a/polkadot/bridges/bin/millau/runtime/src/lib.rs +++ b/polkadot/bridges/bin/millau/runtime/src/lib.rs @@ -354,7 +354,7 @@ impl pallet_message_lane::Config for Runtime { type LaneMessageVerifier = crate::rialto_messages::ToRialtoMessageVerifier; type MessageDeliveryAndDispatchPayment = pallet_message_lane::instant_payments::InstantCurrencyPayments< Runtime, - pallet_balances::Module, + pallet_balances::Pallet, GetDeliveryConfirmationTransactionFee, RootAccountForPayments, >; @@ -369,20 +369,20 @@ construct_runtime!( NodeBlock = opaque::Block, UncheckedExtrinsic = UncheckedExtrinsic { - BridgeRialto: pallet_substrate_bridge::{Module, Call, Storage, Config}, - BridgeRialtoMessageLane: pallet_message_lane::{Module, Call, Storage, Event}, - BridgeCallDispatch: pallet_bridge_call_dispatch::{Module, Event}, - BridgeFinalityVerifier: pallet_finality_verifier::{Module, Call}, - System: frame_system::{Module, Call, Config, Storage, Event}, - RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Module, Call, Storage}, - Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent}, - Aura: pallet_aura::{Module, Config}, - Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event}, - Balances: pallet_balances::{Module, Call, Storage, Config, Event}, - TransactionPayment: pallet_transaction_payment::{Module, Storage}, - Sudo: pallet_sudo::{Module, Call, Config, Storage, Event}, - Session: pallet_session::{Module, Call, Storage, Event, Config}, - ShiftSessionManager: pallet_shift_session_manager::{Module}, + BridgeRialto: pallet_substrate_bridge::{Pallet, Call, Storage, Config}, + BridgeRialtoMessageLane: pallet_message_lane::{Pallet, Call, Storage, Event}, + BridgeCallDispatch: pallet_bridge_call_dispatch::{Pallet, Event}, + BridgeFinalityVerifier: pallet_finality_verifier::{Pallet, Call}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, + RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Call, Storage}, + Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, + Aura: pallet_aura::{Pallet, Config}, + Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage}, + Sudo: pallet_sudo::{Pallet, Call, Config, Storage, Event}, + Session: pallet_session::{Pallet, Call, Storage, Event, Config}, + ShiftSessionManager: pallet_shift_session_manager::{Pallet}, } ); @@ -414,7 +414,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various modules. pub type Executive = - frame_executive::Executive, Runtime, AllModules>; + frame_executive::Executive, Runtime, AllPallets>; impl_runtime_apis! { impl sp_api::Core for Runtime { diff --git a/polkadot/bridges/bin/rialto/runtime/src/lib.rs b/polkadot/bridges/bin/rialto/runtime/src/lib.rs index a904fb2c08..3221264b53 100644 --- a/polkadot/bridges/bin/rialto/runtime/src/lib.rs +++ b/polkadot/bridges/bin/rialto/runtime/src/lib.rs @@ -276,7 +276,7 @@ impl bp_currency_exchange::DepositInto for DepositInto { fn deposit_into(recipient: Self::Recipient, amount: Self::Amount) -> bp_currency_exchange::Result<()> { // let balances module make all checks for us (it won't allow depositing lower than existential // deposit, balance overflow, ...) - let deposited = as Currency>::deposit_creating(&recipient, amount); + let deposited = as Currency>::deposit_creating(&recipient, amount); // I'm dropping deposited here explicitly to illustrate the fact that it'll update `TotalIssuance` // on drop @@ -461,7 +461,7 @@ impl pallet_message_lane::Config for Runtime { type LaneMessageVerifier = crate::millau_messages::ToMillauMessageVerifier; type MessageDeliveryAndDispatchPayment = pallet_message_lane::instant_payments::InstantCurrencyPayments< Runtime, - pallet_balances::Module, + pallet_balances::Pallet, GetDeliveryConfirmationTransactionFee, RootAccountForPayments, >; @@ -476,24 +476,24 @@ construct_runtime!( NodeBlock = opaque::Block, UncheckedExtrinsic = UncheckedExtrinsic { - BridgeRialtoPoA: pallet_bridge_eth_poa::::{Module, Call, Config, Storage, ValidateUnsigned}, - BridgeKovan: pallet_bridge_eth_poa::::{Module, Call, Config, Storage, ValidateUnsigned}, - BridgeRialtoCurrencyExchange: pallet_bridge_currency_exchange::::{Module, Call}, - BridgeKovanCurrencyExchange: pallet_bridge_currency_exchange::::{Module, Call}, - BridgeMillau: pallet_substrate_bridge::{Module, Call, Storage, Config}, - BridgeFinalityVerifier: pallet_finality_verifier::{Module, Call}, - BridgeCallDispatch: pallet_bridge_call_dispatch::{Module, Event}, - BridgeMillauMessageLane: pallet_message_lane::{Module, Call, Storage, Event}, - System: frame_system::{Module, Call, Config, Storage, Event}, - RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Module, Call, Storage}, - Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent}, - Aura: pallet_aura::{Module, Config}, - Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event}, - Balances: pallet_balances::{Module, Call, Storage, Config, Event}, - TransactionPayment: pallet_transaction_payment::{Module, Storage}, - Sudo: pallet_sudo::{Module, Call, Config, Storage, Event}, - Session: pallet_session::{Module, Call, Storage, Event, Config}, - ShiftSessionManager: pallet_shift_session_manager::{Module}, + BridgeRialtoPoA: pallet_bridge_eth_poa::::{Pallet, Call, Config, Storage, ValidateUnsigned}, + BridgeKovan: pallet_bridge_eth_poa::::{Pallet, Call, Config, Storage, ValidateUnsigned}, + BridgeRialtoCurrencyExchange: pallet_bridge_currency_exchange::::{Pallet, Call}, + BridgeKovanCurrencyExchange: pallet_bridge_currency_exchange::::{Pallet, Call}, + BridgeMillau: pallet_substrate_bridge::{Pallet, Call, Storage, Config}, + BridgeFinalityVerifier: pallet_finality_verifier::{Pallet, Call}, + BridgeCallDispatch: pallet_bridge_call_dispatch::{Pallet, Event}, + BridgeMillauMessageLane: pallet_message_lane::{Pallet, Call, Storage, Event}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, + RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Call, Storage}, + Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, + Aura: pallet_aura::{Pallet, Config}, + Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage}, + Sudo: pallet_sudo::{Pallet, Call, Config, Storage, Event}, + Session: pallet_session::{Pallet, Call, Storage, Event, Config}, + ShiftSessionManager: pallet_shift_session_manager::{Pallet}, } ); @@ -525,7 +525,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various modules. pub type Executive = - frame_executive::Executive, Runtime, AllModules>; + frame_executive::Executive, Runtime, AllPallets>; impl_runtime_apis! { impl sp_api::Core for Runtime { @@ -854,11 +854,11 @@ impl_runtime_apis! { } fn account_balance(account: &Self::AccountId) -> Self::OutboundMessageFee { - pallet_balances::Module::::free_balance(account) + pallet_balances::Pallet::::free_balance(account) } fn endow_account(account: &Self::AccountId) { - pallet_balances::Module::::make_free_balance_be( + pallet_balances::Pallet::::make_free_balance_be( account, Balance::MAX / 100, ); @@ -1037,7 +1037,7 @@ mod tests { ext.execute_with(|| { // initially issuance is zero assert_eq!( - as Currency>::total_issuance(), + as Currency>::total_issuance(), 0, ); @@ -1045,14 +1045,14 @@ mod tests { let account: AccountId = [1u8; 32].into(); let initial_amount = ExistentialDeposit::get(); let deposited = - as Currency>::deposit_creating(&account, initial_amount); + as Currency>::deposit_creating(&account, initial_amount); drop(deposited); assert_eq!( - as Currency>::total_issuance(), + as Currency>::total_issuance(), initial_amount, ); assert_eq!( - as Currency>::free_balance(&account), + as Currency>::free_balance(&account), initial_amount, ); @@ -1061,7 +1061,7 @@ mod tests { // check that total issuance has changed by `run_deposit_into_test` assert_eq!( - as Currency>::total_issuance(), + as Currency>::total_issuance(), initial_amount + total_issuance_change, ); }); @@ -1115,7 +1115,7 @@ mod tests { fn deposit_into_existing_account_works() { run_deposit_into_test(|existing_account| { let initial_amount = - as Currency>::free_balance(&existing_account); + as Currency>::free_balance(&existing_account); let additional_amount = 10_000; >::DepositInto::deposit_into( existing_account.clone(), @@ -1123,7 +1123,7 @@ mod tests { ) .unwrap(); assert_eq!( - as Currency>::free_balance(&existing_account), + as Currency>::free_balance(&existing_account), initial_amount + additional_amount, ); additional_amount @@ -1142,7 +1142,7 @@ mod tests { ) .unwrap(); assert_eq!( - as Currency>::free_balance(&new_account), + as Currency>::free_balance(&new_account), initial_amount + additional_amount, ); additional_amount diff --git a/polkadot/bridges/modules/call-dispatch/src/lib.rs b/polkadot/bridges/modules/call-dispatch/src/lib.rs index 7f41322455..426b3180a1 100644 --- a/polkadot/bridges/modules/call-dispatch/src/lib.rs +++ b/polkadot/bridges/modules/call-dispatch/src/lib.rs @@ -451,8 +451,8 @@ mod tests { NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Module, Call, Config, Storage, Event}, - CallDispatch: call_dispatch::{Module, Call, Event}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, + CallDispatch: call_dispatch::{Pallet, Call, Event}, } } diff --git a/polkadot/bridges/modules/currency-exchange/src/lib.rs b/polkadot/bridges/modules/currency-exchange/src/lib.rs index 7c7d7e4a4d..ef35ddc043 100644 --- a/polkadot/bridges/modules/currency-exchange/src/lib.rs +++ b/polkadot/bridges/modules/currency-exchange/src/lib.rs @@ -326,8 +326,8 @@ mod tests { NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Module, Call, Config, Storage, Event}, - Exchange: pallet_bridge_currency_exchange::{Module}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, + Exchange: pallet_bridge_currency_exchange::{Pallet}, } } diff --git a/polkadot/bridges/modules/ethereum/src/mock.rs b/polkadot/bridges/modules/ethereum/src/mock.rs index 6808062d4d..74f566a576 100644 --- a/polkadot/bridges/modules/ethereum/src/mock.rs +++ b/polkadot/bridges/modules/ethereum/src/mock.rs @@ -44,8 +44,8 @@ frame_support::construct_runtime! { NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Module, Call, Config, Storage, Event}, - Ethereum: pallet_ethereum::{Module, Call}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, + Ethereum: pallet_ethereum::{Pallet, Call}, } } diff --git a/polkadot/bridges/modules/finality-verifier/src/lib.rs b/polkadot/bridges/modules/finality-verifier/src/lib.rs index a87bd75b99..d799cc27f3 100644 --- a/polkadot/bridges/modules/finality-verifier/src/lib.rs +++ b/polkadot/bridges/modules/finality-verifier/src/lib.rs @@ -215,8 +215,8 @@ mod tests { fn next_block() { use frame_support::traits::OnInitialize; - let current_number = frame_system::Module::::block_number(); - frame_system::Module::::set_block_number(current_number + 1); + let current_number = frame_system::Pallet::::block_number(); + frame_system::Pallet::::set_block_number(current_number + 1); let _ = Module::::on_initialize(current_number); } diff --git a/polkadot/bridges/modules/finality-verifier/src/mock.rs b/polkadot/bridges/modules/finality-verifier/src/mock.rs index 26890d9d23..08f5fb0a43 100644 --- a/polkadot/bridges/modules/finality-verifier/src/mock.rs +++ b/polkadot/bridges/modules/finality-verifier/src/mock.rs @@ -41,9 +41,9 @@ construct_runtime! { NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Module, Call, Config, Storage, Event}, - Bridge: pallet_substrate_bridge::{Module}, - FinalityVerifier: finality_verifier::{Module}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, + Bridge: pallet_substrate_bridge::{Pallet}, + FinalityVerifier: finality_verifier::{Pallet}, } } diff --git a/polkadot/bridges/modules/message-lane/src/instant_payments.rs b/polkadot/bridges/modules/message-lane/src/instant_payments.rs index 63c94e6ffd..af5d2cdc41 100644 --- a/polkadot/bridges/modules/message-lane/src/instant_payments.rs +++ b/polkadot/bridges/modules/message-lane/src/instant_payments.rs @@ -59,7 +59,7 @@ where fn initialize(relayer_fund_account: &T::AccountId) -> usize { assert!( - frame_system::Module::::account_exists(relayer_fund_account), + frame_system::Pallet::::account_exists(relayer_fund_account), "The relayer fund account ({:?}) must exist for the message lanes pallet to work correctly.", relayer_fund_account, ); @@ -189,7 +189,7 @@ mod tests { use crate::mock::{run_test, AccountId as TestAccountId, Balance as TestBalance, TestRuntime}; use bp_message_lane::source_chain::RelayerRewards; - type Balances = pallet_balances::Module; + type Balances = pallet_balances::Pallet; const RELAYER_1: TestAccountId = 1; const RELAYER_2: TestAccountId = 2; diff --git a/polkadot/bridges/modules/message-lane/src/mock.rs b/polkadot/bridges/modules/message-lane/src/mock.rs index cf14ca105c..e16ae0c0a3 100644 --- a/polkadot/bridges/modules/message-lane/src/mock.rs +++ b/polkadot/bridges/modules/message-lane/src/mock.rs @@ -64,9 +64,9 @@ frame_support::construct_runtime! { NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Module, Call, Config, Storage, Event}, - Balances: pallet_balances::{Module, Call, Event}, - MessageLane: pallet_message_lane::{Module, Call, Event}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, + Balances: pallet_balances::{Pallet, Call, Event}, + MessageLane: pallet_message_lane::{Pallet, Call, Event}, } } @@ -112,7 +112,7 @@ impl pallet_balances::Config for TestRuntime { type DustRemoval = (); type Event = Event; type ExistentialDeposit = ExistentialDeposit; - type AccountStore = frame_system::Module; + type AccountStore = frame_system::Pallet; type WeightInfo = (); } diff --git a/polkadot/bridges/modules/shift-session-manager/src/lib.rs b/polkadot/bridges/modules/shift-session-manager/src/lib.rs index 6fc92d73ec..7520d499fb 100644 --- a/polkadot/bridges/modules/shift-session-manager/src/lib.rs +++ b/polkadot/bridges/modules/shift-session-manager/src/lib.rs @@ -110,8 +110,8 @@ mod tests { NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Module, Call, Config, Storage, Event}, - Session: pallet_session::{Module}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, + Session: pallet_session::{Pallet}, } } @@ -193,7 +193,7 @@ mod tests { BasicExternalities::execute_with_storage(&mut t, || { for (ref k, ..) in &keys { - frame_system::Module::::inc_providers(k); + frame_system::Pallet::::inc_providers(k); } }); diff --git a/polkadot/bridges/modules/substrate/src/mock.rs b/polkadot/bridges/modules/substrate/src/mock.rs index 85782b7ea4..ee20c952dd 100644 --- a/polkadot/bridges/modules/substrate/src/mock.rs +++ b/polkadot/bridges/modules/substrate/src/mock.rs @@ -47,8 +47,8 @@ frame_support::construct_runtime! { NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Module, Call, Config, Storage, Event}, - Substrate: pallet_substrate::{Module, Call}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, + Substrate: pallet_substrate::{Pallet, Call}, } } diff --git a/polkadot/runtime/common/src/auctions.rs b/polkadot/runtime/common/src/auctions.rs index 63f9fd14aa..6f5b05cd38 100644 --- a/polkadot/runtime/common/src/auctions.rs +++ b/polkadot/runtime/common/src/auctions.rs @@ -231,7 +231,7 @@ decl_module! { let n = AuctionCounter::mutate(|n| { *n += 1; *n }); // Set the information. - let ending = frame_system::Module::::block_number().saturating_add(duration); + let ending = frame_system::Pallet::::block_number().saturating_add(duration); AuctionInfo::::put((lease_period_index, ending)); Self::deposit_event(RawEvent::AuctionStarted(n, lease_period_index, ending)) @@ -313,7 +313,7 @@ impl Module { let late_end = early_end.saturating_add(T::EndingPeriod::get()); // We need to check that the auction isn't in the period where it has definitely ended, but yeah we keep the // info around because we haven't yet decided *exactly* when in the `EndingPeriod` that it ended. - let now = frame_system::Module::::block_number(); + let now = frame_system::Pallet::::block_number(); now < late_end }) } @@ -334,7 +334,7 @@ impl Module { let n = AuctionCounter::mutate(|n| { *n += 1; *n }); // Set the information. - let ending = frame_system::Module::::block_number().saturating_add(duration); + let ending = frame_system::Pallet::::block_number().saturating_add(duration); AuctionInfo::::put((lease_period_index, ending)); Self::deposit_event(RawEvent::AuctionStarted(n, lease_period_index, ending)); @@ -365,7 +365,7 @@ impl Module { // We need to check that the auction isn't in the period where it has definitely ended, but yeah we keep the // info around because we haven't yet decided *exactly* when in the `EndingPeriod` that it ended. - let now = frame_system::Module::::block_number(); + let now = frame_system::Pallet::::block_number(); ensure!(now < late_end, Error::::AuctionEnded); // Our range. @@ -373,7 +373,7 @@ impl Module { // Range as an array index. let range_index = range as u8 as usize; // The offset into the auction ending set. - let offset = Self::is_ending(frame_system::Module::::block_number()).unwrap_or_default(); + let offset = Self::is_ending(frame_system::Pallet::::block_number()).unwrap_or_default(); // The current winning ranges. let mut current_winning = Winning::::get(offset) .or_else(|| offset.checked_sub(&One::one()).and_then(Winning::::get)) @@ -601,9 +601,9 @@ mod tests { NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Module, Call, Config, Storage, Event}, - Balances: pallet_balances::{Module, Call, Storage, Config, Event}, - Auctions: auctions::{Module, Call, Storage, Event}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + Auctions: auctions::{Pallet, Call, Storage, Event}, } ); @@ -737,7 +737,7 @@ mod tests { if let Some((output, known_since)) = &*p.borrow() { (*output, *known_since) } else { - (H256::zero(), frame_system::Module::::block_number()) + (H256::zero(), frame_system::Pallet::::block_number()) } }) } @@ -1323,7 +1323,7 @@ mod benchmarking { use frame_benchmarking::{benchmarks, whitelisted_caller, account, impl_benchmark_test_suite}; fn assert_last_event(generic_event: ::Event) { - let events = frame_system::Module::::events(); + let events = frame_system::Pallet::::events(); let system_event: ::Event = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; @@ -1386,7 +1386,7 @@ mod benchmarking { // Create a new auction let duration: T::BlockNumber = 99u32.into(); let lease_period_index = LeasePeriodOf::::zero(); - let now = frame_system::Module::::block_number(); + let now = frame_system::Pallet::::block_number(); Auctions::::new_auction(RawOrigin::Root.into(), duration, lease_period_index)?; let auction_index = AuctionCounter::get(); @@ -1425,14 +1425,14 @@ mod benchmarking { } // Move ahead to the block we want to initialize - frame_system::Module::::set_block_number(duration + now + T::EndingPeriod::get()); + frame_system::Pallet::::set_block_number(duration + now + T::EndingPeriod::get()); // Trigger epoch change for new random number value: { - pallet_babe::Module::::on_initialize(duration + now + T::EndingPeriod::get()); - let authorities = pallet_babe::Module::::authorities(); + pallet_babe::Pallet::::on_initialize(duration + now + T::EndingPeriod::get()); + let authorities = pallet_babe::Pallet::::authorities(); let next_authorities = authorities.clone(); - pallet_babe::Module::::enact_epoch_change(authorities, next_authorities); + pallet_babe::Pallet::::enact_epoch_change(authorities, next_authorities); } }: { diff --git a/polkadot/runtime/common/src/claims.rs b/polkadot/runtime/common/src/claims.rs index 17570e830b..718199619d 100644 --- a/polkadot/runtime/common/src/claims.rs +++ b/polkadot/runtime/common/src/claims.rs @@ -624,10 +624,10 @@ mod tests { NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Module, Call, Config, Storage, Event}, - Balances: pallet_balances::{Module, Call, Storage, Config, Event}, - Vesting: pallet_vesting::{Module, Call, Storage, Config, Event}, - Claims: claims::{Module, Call, Storage, Config, Event, ValidateUnsigned}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + Vesting: pallet_vesting::{Pallet, Call, Storage, Config, Event}, + Claims: claims::{Pallet, Call, Storage, Config, Event, ValidateUnsigned}, } ); diff --git a/polkadot/runtime/common/src/crowdloan.rs b/polkadot/runtime/common/src/crowdloan.rs index 9b6c664ca7..fb63e1e966 100644 --- a/polkadot/runtime/common/src/crowdloan.rs +++ b/polkadot/runtime/common/src/crowdloan.rs @@ -312,7 +312,7 @@ decl_module! { ensure!(first_slot <= last_slot, Error::::LastSlotBeforeFirstSlot); let last_slot_limit = first_slot.checked_add(&3u32.into()).ok_or(Error::::FirstSlotTooFarInFuture)?; ensure!(last_slot <= last_slot_limit, Error::::LastSlotTooFarInFuture); - ensure!(end > >::block_number(), Error::::CannotEndInPast); + ensure!(end > >::block_number(), Error::::CannotEndInPast); // There should not be an existing fund. ensure!(!Funds::::contains_key(index), Error::::FundNotEnded); @@ -363,7 +363,7 @@ decl_module! { ensure!(fund.raised <= fund.cap, Error::::CapExceeded); // Make sure crowdloan has not ended - let now = >::block_number(); + let now = >::block_number(); ensure!(now < fund.end, Error::::ContributionPeriodOver); let old_balance = Self::contribution_get(fund.trie_index, &who); @@ -437,7 +437,7 @@ decl_module! { let mut fund = Self::funds(index).ok_or(Error::::InvalidParaId)?; // `fund.end` can represent the end of a failed crowdsale or the beginning of retirement - let now = frame_system::Module::::block_number(); + let now = frame_system::Pallet::::block_number(); let current_lease_period = T::Auctioneer::lease_period_index(); ensure!(now >= fund.end || current_lease_period > fund.last_slot, Error::::FundNotEnded); @@ -471,7 +471,7 @@ decl_module! { ensure_signed(origin)?; let fund = Self::funds(index).ok_or(Error::::InvalidParaId)?; - let now = frame_system::Module::::block_number(); + let now = frame_system::Pallet::::block_number(); let dissolution = fund.end.saturating_add(T::RetirementPeriod::get()); ensure!((fund.retiring && now >= dissolution) || fund.raised.is_zero(), Error::::NotReadyToDissolve); @@ -626,9 +626,9 @@ mod tests { NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Module, Call, Config, Storage, Event}, - Balances: pallet_balances::{Module, Call, Storage, Config, Event}, - Crowdloan: crowdloan::{Module, Call, Storage, Event}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + Crowdloan: crowdloan::{Pallet, Call, Storage, Event}, } ); @@ -1256,7 +1256,7 @@ mod benchmarking { use frame_benchmarking::{benchmarks, whitelisted_caller, account, impl_benchmark_test_suite}; fn assert_last_event(generic_event: ::Event) { - let events = frame_system::Module::::events(); + let events = frame_system::Pallet::::events(); let system_event: ::Event = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; @@ -1350,7 +1350,7 @@ mod benchmarking { let caller: T::AccountId = whitelisted_caller(); let contributor = account("contributor", 0, 0); contribute_fund::(&contributor, fund_index); - frame_system::Module::::set_block_number(200u32.into()); + frame_system::Pallet::::set_block_number(200u32.into()); }: _(RawOrigin::Signed(caller), contributor.clone(), fund_index) verify { assert_last_event::(RawEvent::Withdrew(contributor, fund_index, T::MinContribution::get()).into()); @@ -1370,7 +1370,7 @@ mod benchmarking { contribute_fund::(&account("last_contributor", 0, 0), fund_index); let caller: T::AccountId = whitelisted_caller(); - frame_system::Module::::set_block_number(T::BlockNumber::max_value()); + frame_system::Pallet::::set_block_number(T::BlockNumber::max_value()); Crowdloan::::withdraw( RawOrigin::Signed(caller.clone()).into(), account("last_contributor", 0, 0), @@ -1404,7 +1404,7 @@ mod benchmarking { let lease_period_index = T::Auctioneer::lease_period_index(); let duration = end_block - .checked_sub(&frame_system::Module::::block_number()) + .checked_sub(&frame_system::Pallet::::block_number()) .ok_or("duration of auction less than zero")?; T::Auctioneer::new_auction(duration, lease_period_index)?; diff --git a/polkadot/runtime/common/src/impls.rs b/polkadot/runtime/common/src/impls.rs index ecbe720733..866bbedcfc 100644 --- a/polkadot/runtime/common/src/impls.rs +++ b/polkadot/runtime/common/src/impls.rs @@ -31,8 +31,8 @@ where fn on_nonzero_unbalanced(amount: NegativeImbalance) { let numeric_amount = amount.peek(); let author = >::author(); - >::resolve_creating(&>::author(), amount); - >::deposit_event(pallet_balances::Event::Deposit(author, numeric_amount)); + >::resolve_creating(&>::author(), amount); + >::deposit_event(pallet_balances::Event::Deposit(author, numeric_amount)); } } @@ -84,9 +84,9 @@ mod tests { NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Module, Call, Config, Storage, Event}, - Balances: pallet_balances::{Module, Call, Storage, Config, Event}, - Treasury: pallet_treasury::{Module, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event}, } ); @@ -144,7 +144,7 @@ mod tests { } impl pallet_treasury::Config for Test { - type Currency = pallet_balances::Module; + type Currency = pallet_balances::Pallet; type ApproveOrigin = frame_system::EnsureRoot; type RejectOrigin = frame_system::EnsureRoot; type Event = Event; diff --git a/polkadot/runtime/common/src/integration_tests.rs b/polkadot/runtime/common/src/integration_tests.rs index 13617ac8d5..30e330dbd3 100644 --- a/polkadot/runtime/common/src/integration_tests.rs +++ b/polkadot/runtime/common/src/integration_tests.rs @@ -59,19 +59,19 @@ frame_support::construct_runtime!( UncheckedExtrinsic = UncheckedExtrinsic, { // System Stuff - System: frame_system::{Module, Call, Config, Storage, Event}, - Balances: pallet_balances::{Module, Call, Storage, Config, Event}, - Babe: pallet_babe::{Module, Call, Storage, Config, ValidateUnsigned}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned}, // Parachains Runtime - Configuration: configuration::{Module, Call, Storage, Config}, - Paras: paras::{Module, Origin, Call, Storage, Config}, + Configuration: configuration::{Pallet, Call, Storage, Config}, + Paras: paras::{Pallet, Origin, Call, Storage, Config}, // Para Onboarding Pallets - Registrar: paras_registrar::{Module, Call, Storage, Event}, - Auctions: auctions::{Module, Call, Storage, Event}, - Crowdloan: crowdloan::{Module, Call, Storage, Event}, - Slots: slots::{Module, Call, Storage, Event}, + Registrar: paras_registrar::{Pallet, Call, Storage, Event}, + Auctions: auctions::{Pallet, Call, Storage, Event}, + Crowdloan: crowdloan::{Pallet, Call, Storage, Event}, + Slots: slots::{Pallet, Call, Storage, Event}, } ); @@ -271,12 +271,12 @@ fn run_to_block(n: u32) { assert!(System::block_number() < n); while System::block_number() < n { let block_number = System::block_number(); - AllModules::on_finalize(block_number); + AllPallets::on_finalize(block_number); System::on_finalize(block_number); System::set_block_number(block_number + 1); System::on_initialize(block_number + 1); maybe_new_session(block_number + 1); - AllModules::on_initialize(block_number + 1); + AllPallets::on_initialize(block_number + 1); } } diff --git a/polkadot/runtime/common/src/lib.rs b/polkadot/runtime/common/src/lib.rs index a160095d4c..8f4a591a52 100644 --- a/polkadot/runtime/common/src/lib.rs +++ b/polkadot/runtime/common/src/lib.rs @@ -55,7 +55,7 @@ pub use pallet_balances::Call as BalancesCall; /// Implementations of some helper traits passed into runtime modules as associated types. pub use impls::ToAuthor; -pub type NegativeImbalance = as Currency<::AccountId>>::NegativeImbalance; +pub type NegativeImbalance = as Currency<::AccountId>>::NegativeImbalance; /// The sequence of bytes a valid wasm module binary always starts with. Apart from that it's also a /// valid wasm module. @@ -212,7 +212,7 @@ mod multiplier_tests { NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Module, Call, Config, Storage, Event} + System: frame_system::{Pallet, Call, Config, Storage, Event} } ); diff --git a/polkadot/runtime/common/src/mock.rs b/polkadot/runtime/common/src/mock.rs index 8e23d707e7..93f639ae8a 100644 --- a/polkadot/runtime/common/src/mock.rs +++ b/polkadot/runtime/common/src/mock.rs @@ -99,7 +99,7 @@ impl Registrar for TestRegistrar { } fn make_parachain(id: ParaId) -> DispatchResult { - OPERATIONS.with(|x| x.borrow_mut().push((id, frame_system::Module::::block_number().saturated_into(), true))); + OPERATIONS.with(|x| x.borrow_mut().push((id, frame_system::Pallet::::block_number().saturated_into(), true))); PARATHREADS.with(|x| { let mut parathreads = x.borrow_mut(); match parathreads.binary_search(&id) { @@ -119,7 +119,7 @@ impl Registrar for TestRegistrar { Ok(()) } fn make_parathread(id: ParaId) -> DispatchResult { - OPERATIONS.with(|x| x.borrow_mut().push((id, frame_system::Module::::block_number().saturated_into(), false))); + OPERATIONS.with(|x| x.borrow_mut().push((id, frame_system::Pallet::::block_number().saturated_into(), false))); PARACHAINS.with(|x| { let mut parachains = x.borrow_mut(); match parachains.binary_search(&id) { diff --git a/polkadot/runtime/common/src/paras_registrar.rs b/polkadot/runtime/common/src/paras_registrar.rs index a2d4b92522..9e49ce8ec5 100644 --- a/polkadot/runtime/common/src/paras_registrar.rs +++ b/polkadot/runtime/common/src/paras_registrar.rs @@ -427,10 +427,10 @@ mod tests { NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Module, Call, Config, Storage, Event}, - Balances: pallet_balances::{Module, Call, Storage, Config, Event}, - Parachains: paras::{Module, Origin, Call, Storage, Config}, - Registrar: paras_registrar::{Module, Call, Storage, Event}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + Parachains: paras::{Pallet, Origin, Call, Storage, Config}, + Registrar: paras_registrar::{Pallet, Call, Storage, Event}, } ); @@ -853,7 +853,7 @@ mod benchmarking { use frame_benchmarking::{benchmarks, whitelisted_caller}; fn assert_last_event(generic_event: ::Event) { - let events = frame_system::Module::::events(); + let events = frame_system::Pallet::::events(); let system_event: ::Event = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; diff --git a/polkadot/runtime/common/src/purchase.rs b/polkadot/runtime/common/src/purchase.rs index 284f24feb0..c1306e61cb 100644 --- a/polkadot/runtime/common/src/purchase.rs +++ b/polkadot/runtime/common/src/purchase.rs @@ -332,7 +332,7 @@ decl_module! { #[weight = T::DbWeight::get().writes(1)] fn set_unlock_block(origin, unlock_block: T::BlockNumber) { T::ConfigurationOrigin::ensure_origin(origin)?; - ensure!(unlock_block > frame_system::Module::::block_number(), Error::::InvalidUnlockBlock); + ensure!(unlock_block > frame_system::Pallet::::block_number(), Error::::InvalidUnlockBlock); // Possibly this is worse than having the caller account be the payment account? UnlockBlock::::set(unlock_block); Self::deposit_event(RawEvent::UnlockBlockUpdated(unlock_block)); @@ -414,10 +414,10 @@ mod tests { NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Module, Call, Config, Storage, Event}, - Balances: pallet_balances::{Module, Call, Storage, Config, Event}, - Vesting: pallet_vesting::{Module, Call, Storage, Config, Event}, - Purchase: purchase::{Module, Call, Storage, Event}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + Vesting: pallet_vesting::{Pallet, Call, Storage, Config, Event}, + Purchase: purchase::{Pallet, Call, Storage, Event}, } ); diff --git a/polkadot/runtime/common/src/slots.rs b/polkadot/runtime/common/src/slots.rs index fdd86ad402..f1a5a5199c 100644 --- a/polkadot/runtime/common/src/slots.rs +++ b/polkadot/runtime/common/src/slots.rs @@ -354,7 +354,7 @@ impl Leaser for Module { } fn lease_period_index() -> Self::LeasePeriod { - >::block_number() / T::LeasePeriod::get() + >::block_number() / T::LeasePeriod::get() } } @@ -383,10 +383,10 @@ mod tests { NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Module, Call, Config, Storage, Event}, - Balances: pallet_balances::{Module, Call, Storage, Config, Event}, - Slots: slots::{Module, Call, Storage, Event}, - RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Module, Call, Storage}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + Slots: slots::{Pallet, Call, Storage, Event}, + RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Call, Storage}, } ); @@ -667,7 +667,7 @@ mod benchmarking { use crate::slots::Module as Slots; fn assert_last_event(generic_event: ::Event) { - let events = frame_system::Module::::events(); + let events = frame_system::Pallet::::events(); let system_event: ::Event = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs index 40d2dac9a3..cbeb9297c6 100644 --- a/polkadot/runtime/kusama/src/lib.rs +++ b/polkadot/runtime/kusama/src/lib.rs @@ -968,70 +968,70 @@ construct_runtime! { UncheckedExtrinsic = UncheckedExtrinsic { // Basic stuff; balances is uncallable initially. - System: frame_system::{Module, Call, Storage, Config, Event} = 0, - RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Module, Storage} = 32, + System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, + RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 32, // Must be before session. - Babe: pallet_babe::{Module, Call, Storage, Config, ValidateUnsigned} = 1, + Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned} = 1, - Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent} = 2, - Indices: pallet_indices::{Module, Call, Storage, Config, Event} = 3, - Balances: pallet_balances::{Module, Call, Storage, Config, Event} = 4, - TransactionPayment: pallet_transaction_payment::{Module, Storage} = 33, + Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2, + Indices: pallet_indices::{Pallet, Call, Storage, Config, Event} = 3, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 4, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 33, // Consensus support. - Authorship: pallet_authorship::{Module, Call, Storage} = 5, - Staking: pallet_staking::{Module, Call, Storage, Config, Event, ValidateUnsigned} = 6, - Offences: pallet_offences::{Module, Call, Storage, Event} = 7, - Historical: session_historical::{Module} = 34, - Session: pallet_session::{Module, Call, Storage, Event, Config} = 8, - Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event, ValidateUnsigned} = 10, - ImOnline: pallet_im_online::{Module, Call, Storage, Event, ValidateUnsigned, Config} = 11, - AuthorityDiscovery: pallet_authority_discovery::{Module, Call, Config} = 12, + Authorship: pallet_authorship::{Pallet, Call, Storage} = 5, + Staking: pallet_staking::{Pallet, Call, Storage, Config, Event, ValidateUnsigned} = 6, + Offences: pallet_offences::{Pallet, Call, Storage, Event} = 7, + Historical: session_historical::{Pallet} = 34, + Session: pallet_session::{Pallet, Call, Storage, Event, Config} = 8, + Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event, ValidateUnsigned} = 10, + ImOnline: pallet_im_online::{Pallet, Call, Storage, Event, ValidateUnsigned, Config} = 11, + AuthorityDiscovery: pallet_authority_discovery::{Pallet, Call, Config} = 12, // Governance stuff; uncallable initially. - Democracy: pallet_democracy::{Module, Call, Storage, Config, Event} = 13, - Council: pallet_collective::::{Module, Call, Storage, Origin, Event, Config} = 14, - TechnicalCommittee: pallet_collective::::{Module, Call, Storage, Origin, Event, Config} = 15, - ElectionsPhragmen: pallet_elections_phragmen::{Module, Call, Storage, Event, Config} = 16, - TechnicalMembership: pallet_membership::::{Module, Call, Storage, Event, Config} = 17, - Treasury: pallet_treasury::{Module, Call, Storage, Config, Event} = 18, + Democracy: pallet_democracy::{Pallet, Call, Storage, Config, Event} = 13, + Council: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 14, + TechnicalCommittee: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 15, + ElectionsPhragmen: pallet_elections_phragmen::{Pallet, Call, Storage, Event, Config} = 16, + TechnicalMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 17, + Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event} = 18, // Claims. Usable initially. - Claims: claims::{Module, Call, Storage, Event, Config, ValidateUnsigned} = 19, + Claims: claims::{Pallet, Call, Storage, Event, Config, ValidateUnsigned} = 19, // Utility module. - Utility: pallet_utility::{Module, Call, Event} = 24, + Utility: pallet_utility::{Pallet, Call, Event} = 24, // Less simple identity module. - Identity: pallet_identity::{Module, Call, Storage, Event} = 25, + Identity: pallet_identity::{Pallet, Call, Storage, Event} = 25, // Society module. - Society: pallet_society::{Module, Call, Storage, Event} = 26, + Society: pallet_society::{Pallet, Call, Storage, Event} = 26, // Social recovery module. - Recovery: pallet_recovery::{Module, Call, Storage, Event} = 27, + Recovery: pallet_recovery::{Pallet, Call, Storage, Event} = 27, // Vesting. Usable initially, but removed once all vesting is finished. - Vesting: pallet_vesting::{Module, Call, Storage, Event, Config} = 28, + Vesting: pallet_vesting::{Pallet, Call, Storage, Event, Config} = 28, // System scheduler. - Scheduler: pallet_scheduler::{Module, Call, Storage, Event} = 29, + Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event} = 29, // Proxy module. Late addition. - Proxy: pallet_proxy::{Module, Call, Storage, Event} = 30, + Proxy: pallet_proxy::{Pallet, Call, Storage, Event} = 30, // Multisig module. Late addition. - Multisig: pallet_multisig::{Module, Call, Storage, Event} = 31, + Multisig: pallet_multisig::{Pallet, Call, Storage, Event} = 31, // Bounties module. - Bounties: pallet_bounties::{Module, Call, Storage, Event} = 35, + Bounties: pallet_bounties::{Pallet, Call, Storage, Event} = 35, // Tips module. - Tips: pallet_tips::{Module, Call, Storage, Event} = 36, + Tips: pallet_tips::{Pallet, Call, Storage, Event} = 36, // Election pallet. Only works with staking, but placed here to maintain indices. - ElectionProviderMultiPhase: pallet_election_provider_multi_phase::{Module, Call, Storage, Event, ValidateUnsigned} = 37, + ElectionProviderMultiPhase: pallet_election_provider_multi_phase::{Pallet, Call, Storage, Event, ValidateUnsigned} = 37, } } @@ -1083,7 +1083,7 @@ pub type Executive = frame_executive::Executive< Block, frame_system::ChainContext, Runtime, - AllModules, + AllPallets, BabeEpochConfigMigrations, >; /// The payload being signed in the transactions. @@ -1350,9 +1350,9 @@ sp_api::impl_runtime_apis! { // Trying to add benchmarks directly to the Session Pallet caused cyclic dependency issues. // To get around that, we separated the Session benchmarks into its own crate, which is why // we need these two lines below. - use pallet_session_benchmarking::Module as SessionBench; - use pallet_offences_benchmarking::Module as OffencesBench; - use frame_system_benchmarking::Module as SystemBench; + use pallet_session_benchmarking::Pallet as SessionBench; + use pallet_offences_benchmarking::Pallet as OffencesBench; + use frame_system_benchmarking::Pallet as SystemBench; impl pallet_session_benchmarking::Config for Runtime {} impl pallet_offences_benchmarking::Config for Runtime {} diff --git a/polkadot/runtime/parachains/src/dmp.rs b/polkadot/runtime/parachains/src/dmp.rs index 43d40745d3..023996762d 100644 --- a/polkadot/runtime/parachains/src/dmp.rs +++ b/polkadot/runtime/parachains/src/dmp.rs @@ -145,7 +145,7 @@ impl Module { let inbound = InboundDownwardMessage { msg, - sent_at: >::block_number(), + sent_at: >::block_number(), }; // obtain the new link in the MQC and update the head. diff --git a/polkadot/runtime/parachains/src/hrmp.rs b/polkadot/runtime/parachains/src/hrmp.rs index 78535b9c57..e7116ebecc 100644 --- a/polkadot/runtime/parachains/src/hrmp.rs +++ b/polkadot/runtime/parachains/src/hrmp.rs @@ -809,7 +809,7 @@ impl Module { out_hrmp_msgs: Vec>, ) -> Weight { let mut weight = 0; - let now = >::block_number(); + let now = >::block_number(); for out_msg in out_hrmp_msgs { let channel_id = HrmpChannelId { diff --git a/polkadot/runtime/parachains/src/inclusion.rs b/polkadot/runtime/parachains/src/inclusion.rs index c3cf7067e0..998ed8f25c 100644 --- a/polkadot/runtime/parachains/src/inclusion.rs +++ b/polkadot/runtime/parachains/src/inclusion.rs @@ -260,7 +260,7 @@ impl Module { let mut last_index = None; let signing_context = SigningContext { - parent_hash: >::parent_hash(), + parent_hash: >::parent_hash(), session_index, }; @@ -296,7 +296,7 @@ impl Module { } } - let now = >::block_number(); + let now = >::block_number(); for signed_bitfield in signed_bitfields { for (bit_idx, _) in signed_bitfield.payload().0.iter().enumerate().filter(|(_, is_av)| **is_av) @@ -390,11 +390,11 @@ impl Module { } let validators = shared::Module::::active_validator_keys(); - let parent_hash = >::parent_hash(); + let parent_hash = >::parent_hash(); // At the moment we assume (and in fact enforce, below) that the relay-parent is always one // before of the block where we include a candidate (i.e. this code path). - let now = >::block_number(); + let now = >::block_number(); let relay_parent_number = now - One::one(); let check_cx = CandidateCheckContext::::new(now, relay_parent_number); @@ -612,7 +612,7 @@ impl Module { ) -> bool { // This function is meant to be called from the runtime APIs against the relay-parent, hence // `relay_parent_number` is equal to `now`. - let now = >::block_number(); + let now = >::block_number(); let relay_parent_number = now; let check_cx = CandidateCheckContext::::new(now, relay_parent_number); @@ -1133,7 +1133,7 @@ mod tests { } fn make_vdata_hash(para_id: ParaId) -> Option { - let relay_parent_number = >::block_number() - 1; + let relay_parent_number = >::block_number() - 1; let persisted_validation_data = crate::util::make_persisted_validation_data::( para_id, diff --git a/polkadot/runtime/parachains/src/inclusion_inherent.rs b/polkadot/runtime/parachains/src/inclusion_inherent.rs index 9d2238d2c0..364ab2d0a0 100644 --- a/polkadot/runtime/parachains/src/inclusion_inherent.rs +++ b/polkadot/runtime/parachains/src/inclusion_inherent.rs @@ -100,7 +100,7 @@ decl_module! { ensure!(!::exists(), Error::::TooManyInclusionInherents); // Check that the submitted parent header indeed corresponds to the previous block hash. - let parent_hash = >::parent_hash(); + let parent_hash = >::parent_hash(); ensure!( parent_header.hash().as_ref() == parent_hash.as_ref(), Error::::InvalidParentHeader, @@ -130,7 +130,7 @@ decl_module! { >::clear(); >::schedule( freed, - >::block_number(), + >::block_number(), ); let backed_candidates = limit_backed_candidates::(backed_candidates); @@ -197,7 +197,7 @@ fn limit_backed_candidates( // the weight of the inclusion inherent is already included in the current block weight, // so our operation is simple: if the block is currently overloaded, make this intrinsic smaller - if frame_system::Module::::block_weight().total() > ::BlockWeights::get().max_block { + if frame_system::Pallet::::block_weight().total() > ::BlockWeights::get().max_block { Vec::new() } else { backed_candidates diff --git a/polkadot/runtime/parachains/src/mock.rs b/polkadot/runtime/parachains/src/mock.rs index ab22ced8d1..7861b81e85 100644 --- a/polkadot/runtime/parachains/src/mock.rs +++ b/polkadot/runtime/parachains/src/mock.rs @@ -40,18 +40,18 @@ frame_support::construct_runtime!( NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Module, Call, Config, Storage, Event}, - Balances: pallet_balances::{Module, Call, Storage, Config, Event}, - Paras: paras::{Module, Origin, Call, Storage, Config}, - Configuration: configuration::{Module, Call, Storage, Config}, - Shared: shared::{Module, Call, Storage}, - Inclusion: inclusion::{Module, Call, Storage, Event}, - Scheduler: scheduler::{Module, Call, Storage}, - Initializer: initializer::{Module, Call, Storage}, - Dmp: dmp::{Module, Call, Storage}, - Ump: ump::{Module, Call, Storage}, - Hrmp: hrmp::{Module, Call, Storage, Event}, - SessionInfo: session_info::{Module, Call, Storage}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + Paras: paras::{Pallet, Origin, Call, Storage, Config}, + Configuration: configuration::{Pallet, Call, Storage, Config}, + Shared: shared::{Pallet, Call, Storage}, + Inclusion: inclusion::{Pallet, Call, Storage, Event}, + Scheduler: scheduler::{Pallet, Call, Storage}, + Initializer: initializer::{Pallet, Call, Storage}, + Dmp: dmp::{Pallet, Call, Storage}, + Ump: ump::{Pallet, Call, Storage}, + Hrmp: hrmp::{Pallet, Call, Storage, Event}, + SessionInfo: session_info::{Pallet, Call, Storage}, } ); @@ -121,7 +121,7 @@ impl crate::ump::Config for Test { impl crate::hrmp::Config for Test { type Event = Event; type Origin = Origin; - type Currency = pallet_balances::Module; + type Currency = pallet_balances::Pallet; } impl crate::scheduler::Config for Test { } diff --git a/polkadot/runtime/parachains/src/paras.rs b/polkadot/runtime/parachains/src/paras.rs index 3a6b741600..8ec2261b03 100644 --- a/polkadot/runtime/parachains/src/paras.rs +++ b/polkadot/runtime/parachains/src/paras.rs @@ -367,7 +367,7 @@ impl Module { fn apply_actions_queue(session: SessionIndex) -> Vec { let actions = ActionsQueue::take(session); let mut parachains = ::Parachains::get(); - let now = >::block_number(); + let now = >::block_number(); let mut outgoing = Vec::new(); for para in actions { @@ -643,7 +643,7 @@ impl Module { CurrentCode::insert(&id, &new_code); // `now` is only used for registering pruning as part of `fn note_past_code` - let now = >::block_number(); + let now = >::block_number(); let weight = Self::note_past_code( id, @@ -675,7 +675,7 @@ impl Module { at: T::BlockNumber, assume_intermediate: Option, ) -> Option { - let now = >::block_number(); + let now = >::block_number(); let config = >::config(); if assume_intermediate.as_ref().map_or(false, |i| &at <= i) { diff --git a/polkadot/runtime/parachains/src/runtime_api_impl/v1.rs b/polkadot/runtime/parachains/src/runtime_api_impl/v1.rs index fd9b6ccfa3..aecc059c56 100644 --- a/polkadot/runtime/parachains/src/runtime_api_impl/v1.rs +++ b/polkadot/runtime/parachains/src/runtime_api_impl/v1.rs @@ -40,7 +40,7 @@ pub fn validator_groups() -> ( Vec>, GroupRotationInfo, ) { - let now = >::block_number() + One::one(); + let now = >::block_number() + One::one(); let groups = >::validator_groups(); let rotation_info = >::group_rotation_info(now); @@ -54,7 +54,7 @@ pub fn availability_cores() -> Vec>::parachains(); let config = >::config(); - let now = >::block_number() + One::one(); + let now = >::block_number() + One::one(); >::clear(); >::schedule(Vec::new(), now); @@ -202,7 +202,7 @@ pub fn persisted_validation_data( assumption: OccupiedCoreAssumption, ) -> Option> { use parity_scale_codec::Decode as _; - let relay_parent_number = >::block_number(); + let relay_parent_number = >::block_number(); let relay_parent_storage_root = Hash::decode(&mut &sp_io::storage::root()[..]) .expect("storage root must decode to the Hash type; qed"); with_assumption::(para_id, assumption, || { @@ -292,7 +292,7 @@ where { use inclusion::Event as RawEvent; - >::events().into_iter() + >::events().into_iter() .filter_map(|record| extract_event(record.event)) .map(|event| match event { RawEvent::::CandidateBacked(c, h, core, group) diff --git a/polkadot/runtime/parachains/src/scheduler.rs b/polkadot/runtime/parachains/src/scheduler.rs index f142cef5be..b105ce2de4 100644 --- a/polkadot/runtime/parachains/src/scheduler.rs +++ b/polkadot/runtime/parachains/src/scheduler.rs @@ -323,7 +323,7 @@ impl Module { }); ParathreadQueue::set(thread_queue); - let now = >::block_number() + One::one(); + let now = >::block_number() + One::one(); >::set(now); } @@ -587,7 +587,7 @@ impl Module { /// https://github.com/rust-lang/rust/issues/73226 /// which prevents us from testing the code if using `impl Trait`. pub(crate) fn availability_timeout_predicate() -> Option bool>> { - let now = >::block_number(); + let now = >::block_number(); let config = >::config(); let session_start = >::get(); diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs index 950f72a40c..6a68cfee9f 100644 --- a/polkadot/runtime/polkadot/src/lib.rs +++ b/polkadot/runtime/polkadot/src/lib.rs @@ -973,60 +973,60 @@ construct_runtime! { UncheckedExtrinsic = UncheckedExtrinsic { // Basic stuff; balances is uncallable initially. - System: frame_system::{Module, Call, Storage, Config, Event} = 0, - RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Module, Storage} = 31, - Scheduler: pallet_scheduler::{Module, Call, Storage, Event} = 1, + System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, + RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 31, + Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event} = 1, // Must be before session. - Babe: pallet_babe::{Module, Call, Storage, Config, ValidateUnsigned} = 2, + Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned} = 2, - Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent} = 3, - Indices: pallet_indices::{Module, Call, Storage, Config, Event} = 4, - Balances: pallet_balances::{Module, Call, Storage, Config, Event} = 5, - TransactionPayment: pallet_transaction_payment::{Module, Storage} = 32, + Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3, + Indices: pallet_indices::{Pallet, Call, Storage, Config, Event} = 4, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 5, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 32, // Consensus support. - Authorship: pallet_authorship::{Module, Call, Storage} = 6, - Staking: pallet_staking::{Module, Call, Storage, Config, Event, ValidateUnsigned} = 7, - Offences: pallet_offences::{Module, Call, Storage, Event} = 8, - Historical: session_historical::{Module} = 33, - Session: pallet_session::{Module, Call, Storage, Event, Config} = 9, - Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event, ValidateUnsigned} = 11, - ImOnline: pallet_im_online::{Module, Call, Storage, Event, ValidateUnsigned, Config} = 12, - AuthorityDiscovery: pallet_authority_discovery::{Module, Call, Config} = 13, + Authorship: pallet_authorship::{Pallet, Call, Storage} = 6, + Staking: pallet_staking::{Pallet, Call, Storage, Config, Event, ValidateUnsigned} = 7, + Offences: pallet_offences::{Pallet, Call, Storage, Event} = 8, + Historical: session_historical::{Pallet} = 33, + Session: pallet_session::{Pallet, Call, Storage, Event, Config} = 9, + Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event, ValidateUnsigned} = 11, + ImOnline: pallet_im_online::{Pallet, Call, Storage, Event, ValidateUnsigned, Config} = 12, + AuthorityDiscovery: pallet_authority_discovery::{Pallet, Call, Config} = 13, // Governance stuff. - Democracy: pallet_democracy::{Module, Call, Storage, Config, Event} = 14, - Council: pallet_collective::::{Module, Call, Storage, Origin, Event, Config} = 15, - TechnicalCommittee: pallet_collective::::{Module, Call, Storage, Origin, Event, Config} = 16, - ElectionsPhragmen: pallet_elections_phragmen::{Module, Call, Storage, Event, Config} = 17, - TechnicalMembership: pallet_membership::::{Module, Call, Storage, Event, Config} = 18, - Treasury: pallet_treasury::{Module, Call, Storage, Config, Event} = 19, + Democracy: pallet_democracy::{Pallet, Call, Storage, Config, Event} = 14, + Council: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 15, + TechnicalCommittee: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 16, + ElectionsPhragmen: pallet_elections_phragmen::{Pallet, Call, Storage, Event, Config} = 17, + TechnicalMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 18, + Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event} = 19, // Claims. Usable initially. - Claims: claims::{Module, Call, Storage, Event, Config, ValidateUnsigned} = 24, + Claims: claims::{Pallet, Call, Storage, Event, Config, ValidateUnsigned} = 24, // Vesting. Usable initially, but removed once all vesting is finished. - Vesting: pallet_vesting::{Module, Call, Storage, Event, Config} = 25, + Vesting: pallet_vesting::{Pallet, Call, Storage, Event, Config} = 25, // Cunning utilities. Usable initially. - Utility: pallet_utility::{Module, Call, Event} = 26, + Utility: pallet_utility::{Pallet, Call, Event} = 26, // Identity. Late addition. - Identity: pallet_identity::{Module, Call, Storage, Event} = 28, + Identity: pallet_identity::{Pallet, Call, Storage, Event} = 28, // Proxy module. Late addition. - Proxy: pallet_proxy::{Module, Call, Storage, Event} = 29, + Proxy: pallet_proxy::{Pallet, Call, Storage, Event} = 29, // Multisig dispatch. Late addition. - Multisig: pallet_multisig::{Module, Call, Storage, Event} = 30, + Multisig: pallet_multisig::{Pallet, Call, Storage, Event} = 30, // Bounties module. - Bounties: pallet_bounties::{Module, Call, Storage, Event} = 34, + Bounties: pallet_bounties::{Pallet, Call, Storage, Event} = 34, // Tips module. - Tips: pallet_tips::{Module, Call, Storage, Event} = 35, + Tips: pallet_tips::{Pallet, Call, Storage, Event} = 35, // Election pallet. Only works with staking, but placed here to maintain indices. - ElectionProviderMultiPhase: pallet_election_provider_multi_phase::{Module, Call, Storage, Event, ValidateUnsigned} = 36, + ElectionProviderMultiPhase: pallet_election_provider_multi_phase::{Pallet, Call, Storage, Event, ValidateUnsigned} = 36, } } @@ -1077,7 +1077,7 @@ pub type Executive = frame_executive::Executive< Block, frame_system::ChainContext, Runtime, - AllModules, + AllPallets, (BabeEpochConfigMigrations, FixPolkadotCouncilVotersDeposit), >; /// The payload being signed in transactions. @@ -1391,9 +1391,9 @@ sp_api::impl_runtime_apis! { // Trying to add benchmarks directly to the Session Pallet caused cyclic dependency issues. // To get around that, we separated the Session benchmarks into its own crate, which is why // we need these two lines below. - use pallet_session_benchmarking::Module as SessionBench; - use pallet_offences_benchmarking::Module as OffencesBench; - use frame_system_benchmarking::Module as SystemBench; + use pallet_session_benchmarking::Pallet as SessionBench; + use pallet_offences_benchmarking::Pallet as OffencesBench; + use frame_system_benchmarking::Pallet as SystemBench; impl pallet_session_benchmarking::Config for Runtime {} impl pallet_offences_benchmarking::Config for Runtime {} diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs index da66665fc4..f3575182f9 100644 --- a/polkadot/runtime/rococo/src/lib.rs +++ b/polkadot/runtime/rococo/src/lib.rs @@ -154,7 +154,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various modules. -pub type Executive = frame_executive::Executive, Runtime, AllModules>; +pub type Executive = frame_executive::Executive, Runtime, AllPallets>; /// The payload being signed in transactions. pub type SignedPayload = generic::SignedPayload; @@ -175,47 +175,47 @@ construct_runtime! { NodeBlock = primitives::v1::Block, UncheckedExtrinsic = UncheckedExtrinsic { - System: frame_system::{Module, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, // Must be before session. - Babe: pallet_babe::{Module, Call, Storage, Config, ValidateUnsigned}, + Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned}, - Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent}, - Indices: pallet_indices::{Module, Call, Storage, Config, Event}, - Balances: pallet_balances::{Module, Call, Storage, Config, Event}, - TransactionPayment: pallet_transaction_payment::{Module, Storage}, + Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, + Indices: pallet_indices::{Pallet, Call, Storage, Config, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage}, // Consensus support. - Authorship: pallet_authorship::{Module, Call, Storage}, - Offences: pallet_offences::{Module, Call, Storage, Event}, - Historical: session_historical::{Module}, - Session: pallet_session::{Module, Call, Storage, Event, Config}, - Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event, ValidateUnsigned}, - ImOnline: pallet_im_online::{Module, Call, Storage, Event, ValidateUnsigned, Config}, - AuthorityDiscovery: pallet_authority_discovery::{Module, Call, Config}, + Authorship: pallet_authorship::{Pallet, Call, Storage}, + Offences: pallet_offences::{Pallet, Call, Storage, Event}, + Historical: session_historical::{Pallet}, + Session: pallet_session::{Pallet, Call, Storage, Event, Config}, + Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event, ValidateUnsigned}, + ImOnline: pallet_im_online::{Pallet, Call, Storage, Event, ValidateUnsigned, Config}, + AuthorityDiscovery: pallet_authority_discovery::{Pallet, Call, Config}, // Parachains modules. - ParachainsOrigin: parachains_origin::{Module, Origin}, - ParachainsConfiguration: parachains_configuration::{Module, Call, Storage, Config}, - Shared: parachains_shared::{Module, Call, Storage}, - Inclusion: parachains_inclusion::{Module, Call, Storage, Event}, - InclusionInherent: parachains_inclusion_inherent::{Module, Call, Storage, Inherent}, - Scheduler: parachains_scheduler::{Module, Call, Storage}, - Paras: parachains_paras::{Module, Call, Storage}, - Initializer: parachains_initializer::{Module, Call, Storage}, - Dmp: parachains_dmp::{Module, Call, Storage}, - Ump: parachains_ump::{Module, Call, Storage}, - Hrmp: parachains_hrmp::{Module, Call, Storage, Event}, - SessionInfo: parachains_session_info::{Module, Call, Storage}, + ParachainsOrigin: parachains_origin::{Pallet, Origin}, + ParachainsConfiguration: parachains_configuration::{Pallet, Call, Storage, Config}, + Shared: parachains_shared::{Pallet, Call, Storage}, + Inclusion: parachains_inclusion::{Pallet, Call, Storage, Event}, + InclusionInherent: parachains_inclusion_inherent::{Pallet, Call, Storage, Inherent}, + Scheduler: parachains_scheduler::{Pallet, Call, Storage}, + Paras: parachains_paras::{Pallet, Call, Storage}, + Initializer: parachains_initializer::{Pallet, Call, Storage}, + Dmp: parachains_dmp::{Pallet, Call, Storage}, + Ump: parachains_ump::{Pallet, Call, Storage}, + Hrmp: parachains_hrmp::{Pallet, Call, Storage, Event}, + SessionInfo: parachains_session_info::{Pallet, Call, Storage}, - Registrar: paras_registrar::{Module, Call, Storage, Event}, - ParasSudoWrapper: paras_sudo_wrapper::{Module, Call}, + Registrar: paras_registrar::{Pallet, Call, Storage, Event}, + ParasSudoWrapper: paras_sudo_wrapper::{Pallet, Call}, // Sudo - Sudo: pallet_sudo::{Module, Call, Storage, Event, Config}, + Sudo: pallet_sudo::{Pallet, Call, Storage, Event, Config}, // Propose parachain pallet. - ProposeParachain: propose_parachain::{Module, Call, Storage, Event}, + ProposeParachain: propose_parachain::{Pallet, Call, Storage, Event}, } } diff --git a/polkadot/runtime/rococo/src/propose_parachain.rs b/polkadot/runtime/rococo/src/propose_parachain.rs index b68b1ece94..7c50a26a13 100644 --- a/polkadot/runtime/rococo/src/propose_parachain.rs +++ b/polkadot/runtime/rococo/src/propose_parachain.rs @@ -215,7 +215,7 @@ decl_module! { } )?; - pallet_balances::Module::::reserve(&who, T::ProposeDeposit::get())?; + pallet_balances::Pallet::::reserve(&who, T::ProposeDeposit::get())?; let proposal = Proposal { name: name.clone(), @@ -269,7 +269,7 @@ decl_module! { Proposals::::remove(¶_id); ParachainValidationCode::remove(¶_id); - pallet_balances::Module::::unreserve(&proposal.proposer, T::ProposeDeposit::get()); + pallet_balances::Pallet::::unreserve(&proposal.proposer, T::ProposeDeposit::get()); } /// Deregister a parachain that was already successfully registered in the relay chain. @@ -290,7 +290,7 @@ decl_module! { ParachainInfo::::remove(¶_id); info.validators.into_iter().for_each(|v| ValidatorsToRetire::::append(v)); - pallet_balances::Module::::unreserve(&info.proposer, T::ProposeDeposit::get()); + pallet_balances::Pallet::::unreserve(&info.proposer, T::ProposeDeposit::get()); } /// Add new validators to the set. @@ -392,7 +392,7 @@ impl pallet_session::SessionManager for Module { Self::deposit_event(RawEvent::ParachainRegistered(*id)); // Add some funds to the Parachain - let _ = pallet_balances::Module::::deposit_creating(&id.into_account(), proposal.balance); + let _ = pallet_balances::Pallet::::deposit_creating(&id.into_account(), proposal.balance); let info = RegisteredParachainInfo { proposer: proposal.proposer, diff --git a/polkadot/runtime/test-runtime/src/lib.rs b/polkadot/runtime/test-runtime/src/lib.rs index 797399480d..9b947c7489 100644 --- a/polkadot/runtime/test-runtime/src/lib.rs +++ b/polkadot/runtime/test-runtime/src/lib.rs @@ -502,44 +502,44 @@ construct_runtime! { UncheckedExtrinsic = UncheckedExtrinsic { // Basic stuff; balances is uncallable initially. - System: frame_system::{Module, Call, Storage, Config, Event}, - RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Module, Storage}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, + RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage}, // Must be before session. - Babe: pallet_babe::{Module, Call, Storage, Config}, + Babe: pallet_babe::{Pallet, Call, Storage, Config}, - Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent}, - Indices: pallet_indices::{Module, Call, Storage, Config, Event}, - Balances: pallet_balances::{Module, Call, Storage, Config, Event}, - TransactionPayment: pallet_transaction_payment::{Module, Storage}, + Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, + Indices: pallet_indices::{Pallet, Call, Storage, Config, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage}, // Consensus support. - Authorship: pallet_authorship::{Module, Call, Storage}, - Staking: pallet_staking::{Module, Call, Storage, Config, Event, ValidateUnsigned}, - Offences: pallet_offences::{Module, Call, Storage, Event}, - Historical: session_historical::{Module}, - Session: pallet_session::{Module, Call, Storage, Event, Config}, - Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event}, - AuthorityDiscovery: pallet_authority_discovery::{Module, Call, Config}, + Authorship: pallet_authorship::{Pallet, Call, Storage}, + Staking: pallet_staking::{Pallet, Call, Storage, Config, Event, ValidateUnsigned}, + Offences: pallet_offences::{Pallet, Call, Storage, Event}, + Historical: session_historical::{Pallet}, + Session: pallet_session::{Pallet, Call, Storage, Event, Config}, + Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event}, + AuthorityDiscovery: pallet_authority_discovery::{Pallet, Call, Config}, // Claims. Usable initially. - Claims: claims::{Module, Call, Storage, Event, Config, ValidateUnsigned}, + Claims: claims::{Pallet, Call, Storage, Event, Config, ValidateUnsigned}, // Vesting. Usable initially, but removed once all vesting is finished. - Vesting: pallet_vesting::{Module, Call, Storage, Event, Config}, + Vesting: pallet_vesting::{Pallet, Call, Storage, Event, Config}, // Parachains runtime modules - ParachainsConfiguration: parachains_configuration::{Module, Call, Storage, Config}, - Inclusion: parachains_inclusion::{Module, Call, Storage, Event}, - InclusionInherent: parachains_inclusion_inherent::{Module, Call, Storage, Inherent}, - Initializer: parachains_initializer::{Module, Call, Storage}, - Paras: parachains_paras::{Module, Call, Storage, Origin}, - Scheduler: parachains_scheduler::{Module, Call, Storage}, - ParasSudoWrapper: paras_sudo_wrapper::{Module, Call}, - SessionInfo: parachains_session_info::{Module, Call, Storage}, - Hrmp: parachains_hrmp::{Module, Call, Storage, Event}, + ParachainsConfiguration: parachains_configuration::{Pallet, Call, Storage, Config}, + Inclusion: parachains_inclusion::{Pallet, Call, Storage, Event}, + InclusionInherent: parachains_inclusion_inherent::{Pallet, Call, Storage, Inherent}, + Initializer: parachains_initializer::{Pallet, Call, Storage}, + Paras: parachains_paras::{Pallet, Call, Storage, Origin}, + Scheduler: parachains_scheduler::{Pallet, Call, Storage}, + ParasSudoWrapper: paras_sudo_wrapper::{Pallet, Call}, + SessionInfo: parachains_session_info::{Pallet, Call, Storage}, + Hrmp: parachains_hrmp::{Pallet, Call, Storage, Event}, - Sudo: pallet_sudo::{Module, Call, Storage, Config, Event}, + Sudo: pallet_sudo::{Pallet, Call, Storage, Config, Event}, } } @@ -568,7 +568,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various modules. -pub type Executive = frame_executive::Executive, Runtime, AllModules>; +pub type Executive = frame_executive::Executive, Runtime, AllPallets>; /// The payload being signed in transactions. pub type SignedPayload = generic::SignedPayload; diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs index fbd93ba866..6802f45dd2 100644 --- a/polkadot/runtime/westend/src/lib.rs +++ b/polkadot/runtime/westend/src/lib.rs @@ -824,73 +824,73 @@ construct_runtime! { UncheckedExtrinsic = UncheckedExtrinsic { // Basic stuff; balances is uncallable initially. - System: frame_system::{Module, Call, Storage, Config, Event} = 0, - RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Module, Storage} = 25, + System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, + RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 25, // Must be before session. - Babe: pallet_babe::{Module, Call, Storage, Config, ValidateUnsigned} = 1, + Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned} = 1, - Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent} = 2, - Indices: pallet_indices::{Module, Call, Storage, Config, Event} = 3, - Balances: pallet_balances::{Module, Call, Storage, Config, Event} = 4, - TransactionPayment: pallet_transaction_payment::{Module, Storage} = 26, + Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2, + Indices: pallet_indices::{Pallet, Call, Storage, Config, Event} = 3, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 4, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 26, // Consensus support. - Authorship: pallet_authorship::{Module, Call, Storage} = 5, - Staking: pallet_staking::{Module, Call, Storage, Config, Event, ValidateUnsigned} = 6, - Offences: pallet_offences::{Module, Call, Storage, Event} = 7, - Historical: session_historical::{Module} = 27, - Session: pallet_session::{Module, Call, Storage, Event, Config} = 8, - Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event, ValidateUnsigned} = 10, - ImOnline: pallet_im_online::{Module, Call, Storage, Event, ValidateUnsigned, Config} = 11, - AuthorityDiscovery: pallet_authority_discovery::{Module, Call, Config} = 12, + Authorship: pallet_authorship::{Pallet, Call, Storage} = 5, + Staking: pallet_staking::{Pallet, Call, Storage, Config, Event, ValidateUnsigned} = 6, + Offences: pallet_offences::{Pallet, Call, Storage, Event} = 7, + Historical: session_historical::{Pallet} = 27, + Session: pallet_session::{Pallet, Call, Storage, Event, Config} = 8, + Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event, ValidateUnsigned} = 10, + ImOnline: pallet_im_online::{Pallet, Call, Storage, Event, ValidateUnsigned, Config} = 11, + AuthorityDiscovery: pallet_authority_discovery::{Pallet, Call, Config} = 12, // Utility module. - Utility: pallet_utility::{Module, Call, Event} = 16, + Utility: pallet_utility::{Pallet, Call, Event} = 16, // Less simple identity module. - Identity: pallet_identity::{Module, Call, Storage, Event} = 17, + Identity: pallet_identity::{Pallet, Call, Storage, Event} = 17, // Social recovery module. - Recovery: pallet_recovery::{Module, Call, Storage, Event} = 18, + Recovery: pallet_recovery::{Pallet, Call, Storage, Event} = 18, // Vesting. Usable initially, but removed once all vesting is finished. - Vesting: pallet_vesting::{Module, Call, Storage, Event, Config} = 19, + Vesting: pallet_vesting::{Pallet, Call, Storage, Event, Config} = 19, // System scheduler. - Scheduler: pallet_scheduler::{Module, Call, Storage, Event} = 20, + Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event} = 20, // Sudo. - Sudo: pallet_sudo::{Module, Call, Storage, Event, Config} = 21, + Sudo: pallet_sudo::{Pallet, Call, Storage, Event, Config} = 21, // Proxy module. Late addition. - Proxy: pallet_proxy::{Module, Call, Storage, Event} = 22, + Proxy: pallet_proxy::{Pallet, Call, Storage, Event} = 22, // Multisig module. Late addition. - Multisig: pallet_multisig::{Module, Call, Storage, Event} = 23, + Multisig: pallet_multisig::{Pallet, Call, Storage, Event} = 23, // Election pallet. Only works with staking, but placed here to maintain indices. - ElectionProviderMultiPhase: pallet_election_provider_multi_phase::{Module, Call, Storage, Event, ValidateUnsigned} = 24, + ElectionProviderMultiPhase: pallet_election_provider_multi_phase::{Pallet, Call, Storage, Event, ValidateUnsigned} = 24, // Parachains Runtime - ParachainsOrigin: parachains_origin::{Module, Origin} = 28, - ParachainsConfiguration: parachains_configuration::{Module, Call, Storage, Config} = 29, - Shared: parachains_shared::{Module, Call, Storage} = 30, - Inclusion: parachains_inclusion::{Module, Call, Storage, Event} = 31, - InclusionInherent: parachains_inclusion_inherent::{Module, Call, Storage, Inherent} = 32, - ParachainsScheduler: parachains_scheduler::{Module, Call, Storage} = 33, - Paras: parachains_paras::{Module, Call, Storage} = 34, - Initializer: parachains_initializer::{Module, Call, Storage} = 35, - Dmp: parachains_dmp::{Module, Call, Storage} = 36, - Ump: parachains_ump::{Module, Call, Storage} = 37, - Hrmp: parachains_hrmp::{Module, Call, Storage, Event} = 38, - ParachainsSessionInfo: parachains_session_info::{Module, Call, Storage} = 39, + ParachainsOrigin: parachains_origin::{Pallet, Origin} = 28, + ParachainsConfiguration: parachains_configuration::{Pallet, Call, Storage, Config} = 29, + Shared: parachains_shared::{Pallet, Call, Storage} = 30, + Inclusion: parachains_inclusion::{Pallet, Call, Storage, Event} = 31, + InclusionInherent: parachains_inclusion_inherent::{Pallet, Call, Storage, Inherent} = 32, + ParachainsScheduler: parachains_scheduler::{Pallet, Call, Storage} = 33, + Paras: parachains_paras::{Pallet, Call, Storage} = 34, + Initializer: parachains_initializer::{Pallet, Call, Storage} = 35, + Dmp: parachains_dmp::{Pallet, Call, Storage} = 36, + Ump: parachains_ump::{Pallet, Call, Storage} = 37, + Hrmp: parachains_hrmp::{Pallet, Call, Storage, Event} = 38, + ParachainsSessionInfo: parachains_session_info::{Pallet, Call, Storage} = 39, // Parachain Onboarding Pallets - Registrar: paras_registrar::{Module, Call, Storage, Event} = 40, - Auctions: auctions::{Module, Call, Storage, Event} = 41, - Crowdloan: crowdloan::{Module, Call, Storage, Event} = 42, - Slots: slots::{Module, Call, Storage, Event} = 43, + Registrar: paras_registrar::{Pallet, Call, Storage, Event} = 40, + Auctions: auctions::{Pallet, Call, Storage, Event} = 41, + Crowdloan: crowdloan::{Pallet, Call, Storage, Event} = 42, + Slots: slots::{Pallet, Call, Storage, Event} = 43, } } @@ -939,7 +939,7 @@ pub type Executive = frame_executive::Executive< Block, frame_system::ChainContext, Runtime, - AllModules, + AllPallets, BabeEpochConfigMigrations, >; /// The payload being signed in transactions. @@ -1207,9 +1207,9 @@ sp_api::impl_runtime_apis! { // Trying to add benchmarks directly to the Session Pallet caused cyclic dependency issues. // To get around that, we separated the Session benchmarks into its own crate, which is why // we need these two lines below. - use pallet_session_benchmarking::Module as SessionBench; - use pallet_offences_benchmarking::Module as OffencesBench; - use frame_system_benchmarking::Module as SystemBench; + use pallet_session_benchmarking::Pallet as SessionBench; + use pallet_offences_benchmarking::Pallet as OffencesBench; + use frame_system_benchmarking::Pallet as SystemBench; impl pallet_session_benchmarking::Config for Runtime {} impl pallet_offences_benchmarking::Config for Runtime {}