diff --git a/Cargo.lock b/Cargo.lock index 3a661ed15d242..c44ac1f9f1575 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1269,9 +1269,9 @@ dependencies = [ [[package]] name = "environmental" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516aa8d7a71cb00a1c4146f0798549b93d083d4f189b3ced8f3de6b8f11ee6c4" +checksum = "6576a1755ddffd988788025e75bce9e74b018f7cc226198fe931d077911c6d7e" [[package]] name = "erased-serde" @@ -1505,14 +1505,14 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" -version = "2.0.0" +version = "2.0.1" dependencies = [ "parity-scale-codec", ] [[package]] name = "frame-benchmarking" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support", "frame-system", @@ -1530,7 +1530,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-benchmarking", "parity-scale-codec", @@ -1547,7 +1547,7 @@ dependencies = [ [[package]] name = "frame-executive" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support", "frame-system", @@ -1567,7 +1567,7 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "12.0.0" +version = "12.0.1" dependencies = [ "parity-scale-codec", "serde", @@ -1577,7 +1577,7 @@ dependencies = [ [[package]] name = "frame-support" -version = "2.0.0" +version = "2.0.1" dependencies = [ "bitmask", "frame-metadata", @@ -1604,7 +1604,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support-procedural-tools", "proc-macro2", @@ -1614,7 +1614,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1625,7 +1625,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" -version = "2.0.0" +version = "2.0.1" dependencies = [ "proc-macro2", "quote", @@ -1634,7 +1634,7 @@ dependencies = [ [[package]] name = "frame-support-test" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-metadata", "frame-support", @@ -1653,7 +1653,7 @@ dependencies = [ [[package]] name = "frame-system" -version = "2.0.0" +version = "2.0.1" dependencies = [ "criterion", "frame-support", @@ -1671,7 +1671,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -1686,7 +1686,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" -version = "2.0.0" +version = "2.0.1" dependencies = [ "parity-scale-codec", "sp-api", @@ -3844,7 +3844,7 @@ dependencies = [ [[package]] name = "node-runtime" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-benchmarking", "frame-executive", @@ -4191,7 +4191,7 @@ dependencies = [ [[package]] name = "pallet-assets" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support", "frame-system", @@ -4205,7 +4205,7 @@ dependencies = [ [[package]] name = "pallet-atomic-swap" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support", "frame-system", @@ -4220,7 +4220,7 @@ dependencies = [ [[package]] name = "pallet-aura" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support", "frame-system", @@ -4242,7 +4242,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support", "frame-system", @@ -4260,7 +4260,7 @@ dependencies = [ [[package]] name = "pallet-authorship" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support", "frame-system", @@ -4276,7 +4276,7 @@ dependencies = [ [[package]] name = "pallet-babe" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4305,7 +4305,7 @@ dependencies = [ [[package]] name = "pallet-balances" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4321,7 +4321,7 @@ dependencies = [ [[package]] name = "pallet-collective" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4338,7 +4338,7 @@ dependencies = [ [[package]] name = "pallet-contracts" -version = "2.0.0" +version = "2.0.1" dependencies = [ "assert_matches", "bitflags", @@ -4366,7 +4366,7 @@ dependencies = [ [[package]] name = "pallet-contracts-primitives" -version = "2.0.0" +version = "2.0.1" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -4375,7 +4375,7 @@ dependencies = [ [[package]] name = "pallet-contracts-rpc" -version = "0.8.0" +version = "0.8.1" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4394,7 +4394,7 @@ dependencies = [ [[package]] name = "pallet-contracts-rpc-runtime-api" -version = "0.8.0" +version = "0.8.1" dependencies = [ "pallet-contracts-primitives", "parity-scale-codec", @@ -4405,7 +4405,7 @@ dependencies = [ [[package]] name = "pallet-democracy" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4425,7 +4425,7 @@ dependencies = [ [[package]] name = "pallet-elections" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support", "frame-system", @@ -4441,7 +4441,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4460,7 +4460,7 @@ dependencies = [ [[package]] name = "pallet-evm" -version = "2.0.0" +version = "2.0.1" dependencies = [ "evm", "frame-support", @@ -4498,7 +4498,7 @@ dependencies = [ [[package]] name = "pallet-example-offchain-worker" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support", "frame-system", @@ -4513,7 +4513,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support", "frame-system", @@ -4530,7 +4530,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" -version = "2.0.0" +version = "2.0.1" dependencies = [ "finality-grandpa", "frame-benchmarking", @@ -4559,7 +4559,7 @@ dependencies = [ [[package]] name = "pallet-identity" -version = "2.0.0" +version = "2.0.1" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4576,7 +4576,7 @@ dependencies = [ [[package]] name = "pallet-im-online" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4595,7 +4595,7 @@ dependencies = [ [[package]] name = "pallet-indices" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4612,7 +4612,7 @@ dependencies = [ [[package]] name = "pallet-membership" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support", "frame-system", @@ -4626,7 +4626,7 @@ dependencies = [ [[package]] name = "pallet-multisig" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4642,7 +4642,7 @@ dependencies = [ [[package]] name = "pallet-nicks" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support", "frame-system", @@ -4671,7 +4671,7 @@ dependencies = [ [[package]] name = "pallet-offences" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support", "frame-system", @@ -4687,7 +4687,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4712,7 +4712,7 @@ dependencies = [ [[package]] name = "pallet-proxy" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4729,7 +4729,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support", "frame-system", @@ -4743,7 +4743,7 @@ dependencies = [ [[package]] name = "pallet-recovery" -version = "2.0.0" +version = "2.0.1" dependencies = [ "enumflags2", "frame-support", @@ -4759,7 +4759,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4775,7 +4775,7 @@ dependencies = [ [[package]] name = "pallet-scored-pool" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support", "frame-system", @@ -4790,7 +4790,7 @@ dependencies = [ [[package]] name = "pallet-session" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support", "frame-system", @@ -4811,7 +4811,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4833,7 +4833,7 @@ dependencies = [ [[package]] name = "pallet-society" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support", "frame-system", @@ -4849,7 +4849,7 @@ dependencies = [ [[package]] name = "pallet-staking" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4900,7 +4900,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" -version = "2.0.0" +version = "2.0.1" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -4911,7 +4911,7 @@ dependencies = [ [[package]] name = "pallet-sudo" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support", "frame-system", @@ -4937,7 +4937,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4955,7 +4955,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support", "frame-system", @@ -4973,7 +4973,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" -version = "2.0.0" +version = "2.0.1" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4990,7 +4990,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support", "parity-scale-codec", @@ -5003,7 +5003,7 @@ dependencies = [ [[package]] name = "pallet-treasury" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5020,7 +5020,7 @@ dependencies = [ [[package]] name = "pallet-utility" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5036,7 +5036,7 @@ dependencies = [ [[package]] name = "pallet-vesting" -version = "2.0.0" +version = "2.0.1" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5547,9 +5547,9 @@ checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" [[package]] name = "proc-macro2" -version = "1.0.19" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" +checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" dependencies = [ "unicode-xid", ] @@ -6209,7 +6209,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" -version = "0.8.0" +version = "0.8.1" dependencies = [ "bytes 0.5.6", "derive_more", @@ -6240,7 +6240,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" -version = "0.8.0" +version = "0.8.1" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6266,7 +6266,7 @@ dependencies = [ [[package]] name = "sc-block-builder" -version = "0.8.0" +version = "0.8.1" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6284,7 +6284,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" -version = "2.0.0" +version = "2.0.1" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -6300,7 +6300,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" -version = "2.0.0" +version = "2.0.1" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6310,7 +6310,7 @@ dependencies = [ [[package]] name = "sc-cli" -version = "0.8.0" +version = "0.8.1" dependencies = [ "ansi_term 0.12.1", "atty", @@ -6361,7 +6361,7 @@ dependencies = [ [[package]] name = "sc-client-api" -version = "2.0.0" +version = "2.0.1" dependencies = [ "derive_more", "fnv", @@ -6399,7 +6399,7 @@ dependencies = [ [[package]] name = "sc-client-db" -version = "0.8.0" +version = "0.8.1" dependencies = [ "blake2-rfc", "hash-db", @@ -6433,7 +6433,7 @@ dependencies = [ [[package]] name = "sc-consensus" -version = "0.8.0" +version = "0.8.1" dependencies = [ "sc-client-api", "sp-blockchain", @@ -6443,7 +6443,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" -version = "0.8.0" +version = "0.8.1" dependencies = [ "derive_more", "futures 0.3.5", @@ -6481,7 +6481,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" -version = "0.8.0" +version = "0.8.1" dependencies = [ "derive_more", "fork-tree", @@ -6534,7 +6534,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" -version = "0.8.0" +version = "0.8.1" dependencies = [ "derive_more", "futures 0.3.5", @@ -6562,7 +6562,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" -version = "0.8.0" +version = "0.8.1" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6574,7 +6574,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" -version = "0.8.0" +version = "0.8.1" dependencies = [ "assert_matches", "derive_more", @@ -6609,7 +6609,7 @@ dependencies = [ [[package]] name = "sc-consensus-pow" -version = "0.8.0" +version = "0.8.1" dependencies = [ "derive_more", "futures 0.3.5", @@ -6632,7 +6632,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" -version = "0.8.0" +version = "0.8.1" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6655,7 +6655,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" -version = "0.8.0" +version = "0.8.1" dependencies = [ "log", "sc-client-api", @@ -6668,7 +6668,7 @@ dependencies = [ [[package]] name = "sc-executor" -version = "0.8.0" +version = "0.8.1" dependencies = [ "assert_matches", "derive_more", @@ -6679,6 +6679,7 @@ dependencies = [ "parity-scale-codec", "parity-wasm 0.41.0", "parking_lot 0.10.2", + "paste", "sc-executor-common", "sc-executor-wasmi", "sc-executor-wasmtime", @@ -6698,7 +6699,6 @@ dependencies = [ "sp-version", "sp-wasm-interface", "substrate-test-runtime", - "test-case", "tracing", "tracing-subscriber", "wasmi", @@ -6707,7 +6707,7 @@ dependencies = [ [[package]] name = "sc-executor-common" -version = "0.8.0" +version = "0.8.1" dependencies = [ "derive_more", "log", @@ -6723,7 +6723,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" -version = "0.8.0" +version = "0.8.1" dependencies = [ "log", "parity-scale-codec", @@ -6737,7 +6737,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" -version = "0.8.0" +version = "0.8.1" dependencies = [ "assert_matches", "log", @@ -6755,7 +6755,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" -version = "0.8.0" +version = "0.8.1" dependencies = [ "assert_matches", "derive_more", @@ -6800,7 +6800,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" -version = "0.8.0" +version = "0.8.1" dependencies = [ "derive_more", "finality-grandpa", @@ -6830,7 +6830,7 @@ dependencies = [ [[package]] name = "sc-informant" -version = "0.8.0" +version = "0.8.1" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -6847,7 +6847,7 @@ dependencies = [ [[package]] name = "sc-keystore" -version = "2.0.0" +version = "2.0.1" dependencies = [ "derive_more", "hex", @@ -6863,7 +6863,7 @@ dependencies = [ [[package]] name = "sc-light" -version = "2.0.0" +version = "2.0.1" dependencies = [ "hash-db", "lazy_static", @@ -6881,7 +6881,7 @@ dependencies = [ [[package]] name = "sc-network" -version = "0.8.0" +version = "0.8.1" dependencies = [ "assert_matches", "async-std", @@ -6942,7 +6942,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" -version = "0.8.0" +version = "0.8.1" dependencies = [ "async-std", "futures 0.3.5", @@ -6986,7 +6986,7 @@ dependencies = [ [[package]] name = "sc-offchain" -version = "2.0.0" +version = "2.0.1" dependencies = [ "bytes 0.5.6", "fnv", @@ -7019,7 +7019,7 @@ dependencies = [ [[package]] name = "sc-peerset" -version = "2.0.0" +version = "2.0.1" dependencies = [ "futures 0.3.5", "libp2p", @@ -7032,7 +7032,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" -version = "0.8.0" +version = "0.8.1" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7040,7 +7040,7 @@ dependencies = [ [[package]] name = "sc-rpc" -version = "2.0.0" +version = "2.0.1" dependencies = [ "assert_matches", "futures 0.1.29", @@ -7079,7 +7079,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" -version = "0.8.0" +version = "0.8.1" dependencies = [ "derive_more", "futures 0.3.5", @@ -7102,7 +7102,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" -version = "2.0.0" +version = "2.0.1" dependencies = [ "futures 0.1.29", "jsonrpc-core", @@ -7132,7 +7132,7 @@ dependencies = [ [[package]] name = "sc-service" -version = "0.8.0" +version = "0.8.1" dependencies = [ "async-std", "derive_more", @@ -7235,7 +7235,7 @@ dependencies = [ [[package]] name = "sc-state-db" -version = "0.8.0" +version = "0.8.1" dependencies = [ "log", "parity-scale-codec", @@ -7248,7 +7248,7 @@ dependencies = [ [[package]] name = "sc-telemetry" -version = "2.0.0" +version = "2.0.1" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -7268,7 +7268,7 @@ dependencies = [ [[package]] name = "sc-tracing" -version = "2.0.0" +version = "2.0.1" dependencies = [ "erased-serde", "log", @@ -7286,7 +7286,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" -version = "2.0.0" +version = "2.0.1" dependencies = [ "assert_matches", "criterion", @@ -7310,7 +7310,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" -version = "2.0.0" +version = "2.0.1" dependencies = [ "assert_matches", "derive_more", @@ -7756,7 +7756,7 @@ dependencies = [ [[package]] name = "sp-allocator" -version = "2.0.0" +version = "2.0.1" dependencies = [ "derive_more", "log", @@ -7767,7 +7767,7 @@ dependencies = [ [[package]] name = "sp-api" -version = "2.0.0" +version = "2.0.1" dependencies = [ "hash-db", "parity-scale-codec", @@ -7782,7 +7782,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" -version = "2.0.0" +version = "2.0.1" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -7793,7 +7793,7 @@ dependencies = [ [[package]] name = "sp-api-test" -version = "2.0.0" +version = "2.0.1" dependencies = [ "criterion", "parity-scale-codec", @@ -7812,7 +7812,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "2.0.0" +version = "2.0.1" dependencies = [ "parity-scale-codec", "serde", @@ -7834,7 +7834,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "2.0.0" +version = "2.0.1" dependencies = [ "criterion", "integer-sqrt", @@ -7861,7 +7861,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" -version = "2.0.0" +version = "2.0.1" dependencies = [ "parity-scale-codec", "sp-api", @@ -7872,7 +7872,7 @@ dependencies = [ [[package]] name = "sp-authorship" -version = "2.0.0" +version = "2.0.1" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7882,7 +7882,7 @@ dependencies = [ [[package]] name = "sp-block-builder" -version = "2.0.0" +version = "2.0.1" dependencies = [ "parity-scale-codec", "sp-api", @@ -7893,7 +7893,7 @@ dependencies = [ [[package]] name = "sp-blockchain" -version = "2.0.0" +version = "2.0.1" dependencies = [ "derive_more", "log", @@ -7909,7 +7909,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" -version = "2.0.0" +version = "2.0.1" dependencies = [ "serde", "serde_json", @@ -7917,7 +7917,7 @@ dependencies = [ [[package]] name = "sp-consensus" -version = "0.8.0" +version = "0.8.1" dependencies = [ "derive_more", "futures 0.3.5", @@ -7943,7 +7943,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" -version = "0.8.0" +version = "0.8.1" dependencies = [ "parity-scale-codec", "sp-api", @@ -7956,7 +7956,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" -version = "0.8.0" +version = "0.8.1" dependencies = [ "merlin", "parity-scale-codec", @@ -7974,7 +7974,7 @@ dependencies = [ [[package]] name = "sp-consensus-pow" -version = "0.8.0" +version = "0.8.1" dependencies = [ "parity-scale-codec", "sp-api", @@ -7985,7 +7985,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" -version = "0.8.0" +version = "0.8.1" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7993,7 +7993,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" -version = "0.8.0" +version = "0.8.1" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -8004,7 +8004,7 @@ dependencies = [ [[package]] name = "sp-core" -version = "2.0.0" +version = "2.0.1" dependencies = [ "base58", "blake2-rfc", @@ -8053,7 +8053,7 @@ dependencies = [ [[package]] name = "sp-database" -version = "2.0.0" +version = "2.0.1" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -8061,7 +8061,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "2.0.0" +version = "2.0.1" dependencies = [ "proc-macro2", "quote", @@ -8070,7 +8070,7 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.8.0" +version = "0.8.1" dependencies = [ "environmental", "parity-scale-codec", @@ -8080,7 +8080,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" -version = "2.0.0" +version = "2.0.1" dependencies = [ "finality-grandpa", "log", @@ -8095,7 +8095,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" -version = "2.0.0" +version = "2.0.1" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -8104,7 +8104,7 @@ dependencies = [ [[package]] name = "sp-inherents" -version = "2.0.0" +version = "2.0.1" dependencies = [ "derive_more", "parity-scale-codec", @@ -8115,7 +8115,7 @@ dependencies = [ [[package]] name = "sp-io" -version = "2.0.0" +version = "2.0.1" dependencies = [ "futures 0.3.5", "hash-db", @@ -8137,7 +8137,7 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "2.0.0" +version = "2.0.1" dependencies = [ "lazy_static", "sp-core", @@ -8147,7 +8147,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" -version = "2.0.0" +version = "2.0.1" dependencies = [ "parity-scale-codec", "rand 0.7.3", @@ -8161,7 +8161,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" -version = "2.0.0" +version = "2.0.1" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8183,7 +8183,7 @@ dependencies = [ [[package]] name = "sp-offchain" -version = "2.0.0" +version = "2.0.1" dependencies = [ "sp-api", "sp-core", @@ -8193,7 +8193,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "2.0.0" +version = "2.0.1" dependencies = [ "backtrace", "log", @@ -8201,7 +8201,7 @@ dependencies = [ [[package]] name = "sp-rpc" -version = "2.0.0" +version = "2.0.1" dependencies = [ "serde", "serde_json", @@ -8210,7 +8210,7 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "2.0.0" +version = "2.0.1" dependencies = [ "either", "hash256-std-hasher", @@ -8233,7 +8233,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "2.0.0" +version = "2.0.1" dependencies = [ "parity-scale-codec", "primitive-types", @@ -8254,7 +8254,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "2.0.0" +version = "2.0.1" dependencies = [ "Inflector", "proc-macro-crate", @@ -8303,7 +8303,7 @@ dependencies = [ [[package]] name = "sp-sandbox" -version = "0.8.0" +version = "0.8.1" dependencies = [ "assert_matches", "parity-scale-codec", @@ -8317,7 +8317,7 @@ dependencies = [ [[package]] name = "sp-serializer" -version = "2.0.0" +version = "2.0.1" dependencies = [ "serde", "serde_json", @@ -8325,7 +8325,7 @@ dependencies = [ [[package]] name = "sp-session" -version = "2.0.0" +version = "2.0.1" dependencies = [ "parity-scale-codec", "sp-api", @@ -8337,7 +8337,7 @@ dependencies = [ [[package]] name = "sp-staking" -version = "2.0.0" +version = "2.0.1" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -8346,7 +8346,7 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.8.0" +version = "0.8.1" dependencies = [ "hash-db", "hex-literal", @@ -8369,11 +8369,11 @@ dependencies = [ [[package]] name = "sp-std" -version = "2.0.0" +version = "2.0.1" [[package]] name = "sp-storage" -version = "2.0.0" +version = "2.0.1" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8397,7 +8397,7 @@ dependencies = [ [[package]] name = "sp-timestamp" -version = "2.0.0" +version = "2.0.1" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8410,7 +8410,7 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "2.0.0" +version = "2.0.1" dependencies = [ "log", "parity-scale-codec", @@ -8422,7 +8422,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" -version = "2.0.0" +version = "2.0.1" dependencies = [ "derive_more", "futures 0.3.5", @@ -8436,7 +8436,7 @@ dependencies = [ [[package]] name = "sp-trie" -version = "2.0.0" +version = "2.0.1" dependencies = [ "criterion", "hash-db", @@ -8454,7 +8454,7 @@ dependencies = [ [[package]] name = "sp-utils" -version = "2.0.0" +version = "2.0.1" dependencies = [ "futures 0.3.5", "futures-core", @@ -8465,7 +8465,7 @@ dependencies = [ [[package]] name = "sp-version" -version = "2.0.0" +version = "2.0.1" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8476,7 +8476,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "2.0.0" +version = "2.0.1" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8617,7 +8617,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" -version = "0.8.0" +version = "0.8.1" dependencies = [ "chrono", "console_error_panic_hook", @@ -8642,14 +8642,14 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" -version = "2.0.0" +version = "2.0.1" dependencies = [ "platforms", ] [[package]] name = "substrate-frame-cli" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-system", "sc-cli", @@ -8660,7 +8660,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-support" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-support", "frame-system", @@ -8676,7 +8676,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" -version = "2.0.0" +version = "2.0.1" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -8701,7 +8701,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" -version = "0.8.0" +version = "0.8.1" dependencies = [ "async-std", "derive_more", @@ -8714,7 +8714,7 @@ dependencies = [ [[package]] name = "substrate-test-client" -version = "2.0.0" +version = "2.0.1" dependencies = [ "futures 0.1.29", "futures 0.3.5", @@ -8818,7 +8818,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" -version = "2.0.0" +version = "2.0.1" dependencies = [ "futures 0.3.5", "sc-service", @@ -8829,7 +8829,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" -version = "0.8.0" +version = "0.8.1" dependencies = [ "proc-macro-crate", "quote", @@ -8847,7 +8847,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" -version = "2.0.0" +version = "2.0.1" dependencies = [ "ansi_term 0.12.1", "atty", @@ -8879,9 +8879,9 @@ checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1" [[package]] name = "syn" -version = "1.0.35" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb7f4c519df8c117855e19dd8cc851e89eb746fe7a73f0157e0d95fdec5369b0" +checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5" dependencies = [ "proc-macro2", "quote", @@ -8946,19 +8946,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "test-case" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a605baa797821796a751f4a959e1206079b24a4b7e1ed302b7d785d81a9276c9" -dependencies = [ - "lazy_static", - "proc-macro2", - "quote", - "syn", - "version_check", -] - [[package]] name = "textwrap" version = "0.11.0" @@ -9504,9 +9491,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "trybuild" -version = "1.0.35" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7d30fe369fd650072b352b1a9cb9587669de6b89be3b8225544012c1c45292d" +checksum = "17b06f8610494cbeb9a7665b398306f0109ab8708296d7f24b0bcd89178bb350" dependencies = [ "dissimilar", "glob", diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml index 47a26c92493d1..11c4a99e7c7ff 100644 --- a/bin/node/runtime/Cargo.toml +++ b/bin/node/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "node-runtime" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" build = "build.rs" diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs index 4d2f11d2f9206..e4e479a15a980 100644 --- a/bin/node/runtime/src/lib.rs +++ b/bin/node/runtime/src/lib.rs @@ -110,7 +110,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { // implementation changes and behavior does not, then leave spec_version as // is and increment impl_version. spec_version: 259, - impl_version: 0, + impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 1, }; diff --git a/client/api/Cargo.toml b/client/api/Cargo.toml index 1b8240a4b0026..ba68e9736bf2f 100644 --- a/client/api/Cargo.toml +++ b/client/api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-client-api" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml index d611554edc123..50e23ad8cebe7 100644 --- a/client/authority-discovery/Cargo.toml +++ b/client/authority-discovery/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-authority-discovery" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] edition = "2018" build = "build.rs" diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml index 1b1d8921bcfb3..3578e102303ca 100644 --- a/client/basic-authorship/Cargo.toml +++ b/client/basic-authorship/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-basic-authorship" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" diff --git a/client/block-builder/Cargo.toml b/client/block-builder/Cargo.toml index 0c3d289bbcbc1..c8d2fd82dee9b 100644 --- a/client/block-builder/Cargo.toml +++ b/client/block-builder/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-block-builder" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" diff --git a/client/chain-spec/Cargo.toml b/client/chain-spec/Cargo.toml index a73d809ba2523..21e2f47fceb64 100644 --- a/client/chain-spec/Cargo.toml +++ b/client/chain-spec/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-chain-spec" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" diff --git a/client/chain-spec/derive/Cargo.toml b/client/chain-spec/derive/Cargo.toml index 6826168a206a5..cfc3b35941be2 100644 --- a/client/chain-spec/derive/Cargo.toml +++ b/client/chain-spec/derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-chain-spec-derive" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml index dca91d18c3efc..8af52b5f5889a 100644 --- a/client/cli/Cargo.toml +++ b/client/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-cli" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] description = "Substrate CLI interface." edition = "2018" diff --git a/client/cli/src/commands/export_blocks_cmd.rs b/client/cli/src/commands/export_blocks_cmd.rs index e175d498941b8..497531ad393ba 100644 --- a/client/cli/src/commands/export_blocks_cmd.rs +++ b/client/cli/src/commands/export_blocks_cmd.rs @@ -85,7 +85,7 @@ impl ExportBlocksCmd { info!("DB path: {}", path.display()); } - let from = self.from.as_ref().and_then(|f| f.parse().ok()).unwrap_or(1); + let from = self.from.as_ref().and_then(|f| f.parse().ok()).unwrap_or(1u32); let to = self.to.as_ref().and_then(|t| t.parse().ok()); let binary = self.binary; diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml index bba3d3e1a3220..d4baefd0fe401 100644 --- a/client/consensus/aura/Cargo.toml +++ b/client/consensus/aura/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-consensus-aura" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] description = "Aura consensus algorithm for substrate" edition = "2018" diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml index 046ba8cac30c5..61fd2a459cf33 100644 --- a/client/consensus/babe/Cargo.toml +++ b/client/consensus/babe/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-consensus-babe" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] description = "BABE consensus algorithm for substrate" edition = "2018" diff --git a/client/consensus/babe/rpc/Cargo.toml b/client/consensus/babe/rpc/Cargo.toml index 9e2b64142330e..51b8ac4d7e708 100644 --- a/client/consensus/babe/rpc/Cargo.toml +++ b/client/consensus/babe/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-consensus-babe-rpc" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] description = "RPC extensions for the BABE consensus algorithm" edition = "2018" diff --git a/client/consensus/common/Cargo.toml b/client/consensus/common/Cargo.toml index 0a8a4c43d7117..6587553a73703 100644 --- a/client/consensus/common/Cargo.toml +++ b/client/consensus/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-consensus" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" diff --git a/client/consensus/epochs/Cargo.toml b/client/consensus/epochs/Cargo.toml index d50ec29ed9c6e..f683765f3ad03 100644 --- a/client/consensus/epochs/Cargo.toml +++ b/client/consensus/epochs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-consensus-epochs" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] description = "Generic epochs-based utilities for consensus" edition = "2018" diff --git a/client/consensus/manual-seal/Cargo.toml b/client/consensus/manual-seal/Cargo.toml index 0bb77d4f6cc44..d13ec08a654fc 100644 --- a/client/consensus/manual-seal/Cargo.toml +++ b/client/consensus/manual-seal/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-consensus-manual-seal" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] description = "Manual sealing engine for Substrate" edition = "2018" diff --git a/client/consensus/pow/Cargo.toml b/client/consensus/pow/Cargo.toml index fbb02ccc71121..e37ea9ad73306 100644 --- a/client/consensus/pow/Cargo.toml +++ b/client/consensus/pow/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-consensus-pow" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] description = "PoW consensus algorithm for substrate" edition = "2018" diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml index 3a636360e795d..d09fa8f02b565 100644 --- a/client/consensus/slots/Cargo.toml +++ b/client/consensus/slots/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-consensus-slots" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] description = "Generic slots-based utilities for consensus" edition = "2018" diff --git a/client/consensus/uncles/Cargo.toml b/client/consensus/uncles/Cargo.toml index bb23c829a6e09..0bdb25b1220ad 100644 --- a/client/consensus/uncles/Cargo.toml +++ b/client/consensus/uncles/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-consensus-uncles" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] description = "Generic uncle inclusion utilities for consensus" edition = "2018" diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml index 70a0b19532593..28cbe1df24dae 100644 --- a/client/db/Cargo.toml +++ b/client/db/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-client-db" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml index 3220ae7161b7a..6e9402fd4296c 100644 --- a/client/executor/Cargo.toml +++ b/client/executor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-executor" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" @@ -43,12 +43,12 @@ hex-literal = "0.3.1" sc-runtime-test = { version = "2.0.0", path = "runtime-test" } substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime" } sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine" } -test-case = "0.3.3" sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" } sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" } sc-tracing = { version = "2.0.0", path = "../tracing" } tracing = "0.1.19" tracing-subscriber = "0.2.10" +paste = "0.1.6" [features] default = [ "std" ] diff --git a/client/executor/common/Cargo.toml b/client/executor/common/Cargo.toml index 64ed23598f47c..61376366148e9 100644 --- a/client/executor/common/Cargo.toml +++ b/client/executor/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-executor-common" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" diff --git a/client/executor/src/integration_tests/mod.rs b/client/executor/src/integration_tests/mod.rs index 3ff676fdbe61f..13eaf81362c90 100644 --- a/client/executor/src/integration_tests/mod.rs +++ b/client/executor/src/integration_tests/mod.rs @@ -26,7 +26,6 @@ use sp_core::{ }; use sc_runtime_test::wasm_binary_unwrap; use sp_state_machine::TestExternalities as CoreTestExternalities; -use test_case::test_case; use sp_trie::{TrieConfiguration, trie_types::Layout}; use sp_wasm_interface::HostFunctions as _; use sp_runtime::traits::BlakeTwo256; @@ -37,6 +36,34 @@ use crate::WasmExecutionMethod; pub type TestExternalities = CoreTestExternalities; type HostFunctions = sp_io::SubstrateHostFunctions; +/// Simple macro that runs a given method as test with the available wasm execution methods. +#[macro_export] +macro_rules! test_wasm_execution { + ($method_name:ident) => { + paste::item! { + #[test] + fn [<$method_name _interpreted>]() { + $method_name(WasmExecutionMethod::Interpreted); + } + + #[test] + #[cfg(feature = "wasmtime")] + fn [<$method_name _compiled>]() { + $method_name(WasmExecutionMethod::Compiled); + } + } + }; + + (interpreted_only $method_name:ident) => { + paste::item! { + #[test] + fn [<$method_name _interpreted>]() { + $method_name(WasmExecutionMethod::Interpreted); + } + } + }; +} + fn call_in_wasm( function: &str, call_data: &[u8], @@ -59,8 +86,7 @@ fn call_in_wasm( ) } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(returning_should_work); fn returning_should_work(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let mut ext = ext.ext(); @@ -74,8 +100,7 @@ fn returning_should_work(wasm_method: WasmExecutionMethod) { assert_eq!(output, vec![0u8; 0]); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(call_not_existing_function); fn call_not_existing_function(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let mut ext = ext.ext(); @@ -102,8 +127,7 @@ fn call_not_existing_function(wasm_method: WasmExecutionMethod) { } } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(call_yet_another_not_existing_function); fn call_yet_another_not_existing_function(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let mut ext = ext.ext(); @@ -130,8 +154,7 @@ fn call_yet_another_not_existing_function(wasm_method: WasmExecutionMethod) { } } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(panicking_should_work); fn panicking_should_work(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let mut ext = ext.ext(); @@ -161,8 +184,7 @@ fn panicking_should_work(wasm_method: WasmExecutionMethod) { assert!(output.is_err()); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(storage_should_work); fn storage_should_work(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); @@ -191,8 +213,7 @@ fn storage_should_work(wasm_method: WasmExecutionMethod) { assert_eq!(ext, expected); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(clear_prefix_should_work); fn clear_prefix_should_work(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); { @@ -225,8 +246,7 @@ fn clear_prefix_should_work(wasm_method: WasmExecutionMethod) { assert_eq!(expected, ext); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(blake2_256_should_work); fn blake2_256_should_work(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let mut ext = ext.ext(); @@ -250,8 +270,7 @@ fn blake2_256_should_work(wasm_method: WasmExecutionMethod) { ); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(blake2_128_should_work); fn blake2_128_should_work(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let mut ext = ext.ext(); @@ -275,8 +294,7 @@ fn blake2_128_should_work(wasm_method: WasmExecutionMethod) { ); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(sha2_256_should_work); fn sha2_256_should_work(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let mut ext = ext.ext(); @@ -306,8 +324,7 @@ fn sha2_256_should_work(wasm_method: WasmExecutionMethod) { ); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(twox_256_should_work); fn twox_256_should_work(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let mut ext = ext.ext(); @@ -335,8 +352,7 @@ fn twox_256_should_work(wasm_method: WasmExecutionMethod) { ); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(twox_128_should_work); fn twox_128_should_work(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let mut ext = ext.ext(); @@ -360,8 +376,7 @@ fn twox_128_should_work(wasm_method: WasmExecutionMethod) { ); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(ed25519_verify_should_work); fn ed25519_verify_should_work(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let mut ext = ext.ext(); @@ -397,8 +412,7 @@ fn ed25519_verify_should_work(wasm_method: WasmExecutionMethod) { ); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(sr25519_verify_should_work); fn sr25519_verify_should_work(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let mut ext = ext.ext(); @@ -434,8 +448,7 @@ fn sr25519_verify_should_work(wasm_method: WasmExecutionMethod) { ); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(ordered_trie_root_should_work); fn ordered_trie_root_should_work(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let trie_input = vec![b"zero".to_vec(), b"one".to_vec(), b"two".to_vec()]; @@ -450,8 +463,7 @@ fn ordered_trie_root_should_work(wasm_method: WasmExecutionMethod) { ); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(offchain_index); fn offchain_index(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let (offchain, _state) = testing::TestOffchainExt::new(); @@ -472,8 +484,7 @@ fn offchain_index(wasm_method: WasmExecutionMethod) { ); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(offchain_local_storage_should_work); fn offchain_local_storage_should_work(wasm_method: WasmExecutionMethod) { use sp_core::offchain::OffchainStorage; @@ -492,8 +503,7 @@ fn offchain_local_storage_should_work(wasm_method: WasmExecutionMethod) { assert_eq!(state.read().persistent_storage.get(b"", b"test"), Some(vec![])); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(offchain_http_should_work); fn offchain_http_should_work(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let (offchain, state) = testing::TestOffchainExt::new(); @@ -521,9 +531,7 @@ fn offchain_http_should_work(wasm_method: WasmExecutionMethod) { ); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] -#[should_panic(expected = "Allocator ran out of space")] +test_wasm_execution!(should_trap_when_heap_exhausted); fn should_trap_when_heap_exhausted(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); @@ -533,18 +541,20 @@ fn should_trap_when_heap_exhausted(wasm_method: WasmExecutionMethod) { HostFunctions::host_functions(), 8, ); - executor.call_in_wasm( + + let err = executor.call_in_wasm( &wasm_binary_unwrap()[..], None, "test_exhaust_heap", &[0], &mut ext.ext(), sp_core::traits::MissingHostFunctions::Allow, - ).unwrap(); + ).unwrap_err(); + + assert!(err.contains("Allocator ran out of space")); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(returns_mutable_static); fn returns_mutable_static(wasm_method: WasmExecutionMethod) { let runtime = crate::wasm_runtime::create_wasm_runtime_with_code( wasm_method, @@ -569,8 +579,7 @@ fn returns_mutable_static(wasm_method: WasmExecutionMethod) { // returned to its initial value and thus the stack space is going to be leaked. // // See https://github.com/paritytech/substrate/issues/2967 for details -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(restoration_of_globals); fn restoration_of_globals(wasm_method: WasmExecutionMethod) { // Allocate 32 pages (of 65536 bytes) which gives the runtime 2048KB of heap to operate on // (plus some additional space unused from the initial pages requested by the wasm runtime @@ -598,7 +607,7 @@ fn restoration_of_globals(wasm_method: WasmExecutionMethod) { assert!(res.is_ok()); } -#[test_case(WasmExecutionMethod::Interpreted)] +test_wasm_execution!(interpreted_only heap_is_reset_between_calls); fn heap_is_reset_between_calls(wasm_method: WasmExecutionMethod) { let runtime = crate::wasm_runtime::create_wasm_runtime_with_code( wasm_method, @@ -622,8 +631,7 @@ fn heap_is_reset_between_calls(wasm_method: WasmExecutionMethod) { instance.call("check_and_set_in_heap", ¶ms).unwrap(); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(parallel_execution); fn parallel_execution(wasm_method: WasmExecutionMethod) { let executor = std::sync::Arc::new(crate::WasmExecutor::new( wasm_method, @@ -658,7 +666,7 @@ fn parallel_execution(wasm_method: WasmExecutionMethod) { } } -#[test_case(WasmExecutionMethod::Interpreted)] +test_wasm_execution!(wasm_tracing_should_work); fn wasm_tracing_should_work(wasm_method: WasmExecutionMethod) { use std::sync::{Arc, Mutex}; diff --git a/client/executor/src/integration_tests/sandbox.rs b/client/executor/src/integration_tests/sandbox.rs index 447e395c2fb08..0ddaec30fb1d1 100644 --- a/client/executor/src/integration_tests/sandbox.rs +++ b/client/executor/src/integration_tests/sandbox.rs @@ -18,12 +18,11 @@ use super::{TestExternalities, call_in_wasm}; use crate::WasmExecutionMethod; +use crate::test_wasm_execution; use codec::Encode; -use test_case::test_case; -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(sandbox_should_work); fn sandbox_should_work(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let mut ext = ext.ext(); @@ -60,8 +59,7 @@ fn sandbox_should_work(wasm_method: WasmExecutionMethod) { ); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(sandbox_trap); fn sandbox_trap(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let mut ext = ext.ext(); @@ -87,8 +85,7 @@ fn sandbox_trap(wasm_method: WasmExecutionMethod) { ); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(start_called); fn start_called(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let mut ext = ext.ext(); @@ -131,8 +128,7 @@ fn start_called(wasm_method: WasmExecutionMethod) { ); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(invoke_args); fn invoke_args(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let mut ext = ext.ext(); @@ -171,8 +167,7 @@ fn invoke_args(wasm_method: WasmExecutionMethod) { ); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(return_val); fn return_val(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let mut ext = ext.ext(); @@ -199,8 +194,7 @@ fn return_val(wasm_method: WasmExecutionMethod) { ); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(unlinkable_module); fn unlinkable_module(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let mut ext = ext.ext(); @@ -225,8 +219,7 @@ fn unlinkable_module(wasm_method: WasmExecutionMethod) { ); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(corrupted_module); fn corrupted_module(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let mut ext = ext.ext(); @@ -245,8 +238,7 @@ fn corrupted_module(wasm_method: WasmExecutionMethod) { ); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(start_fn_ok); fn start_fn_ok(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let mut ext = ext.ext(); @@ -274,8 +266,7 @@ fn start_fn_ok(wasm_method: WasmExecutionMethod) { ); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(start_fn_traps); fn start_fn_traps(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let mut ext = ext.ext(); @@ -304,8 +295,7 @@ fn start_fn_traps(wasm_method: WasmExecutionMethod) { ); } -#[test_case(WasmExecutionMethod::Interpreted)] -#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] +test_wasm_execution!(get_global_val_works); fn get_global_val_works(wasm_method: WasmExecutionMethod) { let mut ext = TestExternalities::default(); let mut ext = ext.ext(); diff --git a/client/executor/wasmi/Cargo.toml b/client/executor/wasmi/Cargo.toml index bf174bca2d466..da576b1bbae41 100644 --- a/client/executor/wasmi/Cargo.toml +++ b/client/executor/wasmi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-executor-wasmi" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" diff --git a/client/executor/wasmtime/Cargo.toml b/client/executor/wasmtime/Cargo.toml index 7a8aa1ff458f3..461bc570fe096 100644 --- a/client/executor/wasmtime/Cargo.toml +++ b/client/executor/wasmtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-executor-wasmtime" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml index fcefa2a04162e..8d7e261c5e29a 100644 --- a/client/finality-grandpa/Cargo.toml +++ b/client/finality-grandpa/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-finality-grandpa" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" diff --git a/client/finality-grandpa/rpc/Cargo.toml b/client/finality-grandpa/rpc/Cargo.toml index c0c2ea8b27d88..f49bf55f4ecdb 100644 --- a/client/finality-grandpa/rpc/Cargo.toml +++ b/client/finality-grandpa/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-finality-grandpa-rpc" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] description = "RPC extensions for the GRANDPA finality gadget" repository = "https://github.com/paritytech/substrate/" diff --git a/client/finality-grandpa/src/voting_rule.rs b/client/finality-grandpa/src/voting_rule.rs index 60493867ce1f4..700b0aeb551cd 100644 --- a/client/finality-grandpa/src/voting_rule.rs +++ b/client/finality-grandpa/src/voting_rule.rs @@ -241,7 +241,7 @@ impl Default for VotingRulesBuilder where { fn default() -> Self { VotingRulesBuilder::new() - .add(BeforeBestBlockBy(2.into())) + .add(BeforeBestBlockBy(2u32.into())) .add(ThreeQuartersOfTheUnfinalizedChain) } } diff --git a/client/informant/Cargo.toml b/client/informant/Cargo.toml index 871cc3ef426ec..78b2ec75ca2ef 100644 --- a/client/informant/Cargo.toml +++ b/client/informant/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-informant" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] description = "Substrate informant." edition = "2018" diff --git a/client/informant/src/display.rs b/client/informant/src/display.rs index ce7fb4fc4b12b..8bc3a4548c4a0 100644 --- a/client/informant/src/display.rs +++ b/client/informant/src/display.rs @@ -168,7 +168,7 @@ fn speed( } else { // If the number of blocks can't be converted to a regular integer, then we need a more // algebraic approach and we stay within the realm of integers. - let one_thousand = NumberFor::::from(1_000); + let one_thousand = NumberFor::::from(1_000u32); let elapsed = NumberFor::::from( >::try_from(elapsed_ms).unwrap_or(u32::max_value()) ); diff --git a/client/keystore/Cargo.toml b/client/keystore/Cargo.toml index e649fac7c78b1..29e4b46290ae9 100644 --- a/client/keystore/Cargo.toml +++ b/client/keystore/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-keystore" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" diff --git a/client/light/Cargo.toml b/client/light/Cargo.toml index d9fecb7aa8fa2..2918d34e0d93a 100644 --- a/client/light/Cargo.toml +++ b/client/light/Cargo.toml @@ -1,7 +1,7 @@ [package] description = "components for a light client" name = "sc-light" -version = "2.0.0" +version = "2.0.1" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" authors = ["Parity Technologies "] edition = "2018" diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml index 53610650c00eb..4a5838894a5b2 100644 --- a/client/network-gossip/Cargo.toml +++ b/client/network-gossip/Cargo.toml @@ -1,7 +1,7 @@ [package] description = "Gossiping for the Substrate network protocol" name = "sc-network-gossip" -version = "0.8.0" +version = "0.8.1" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" authors = ["Parity Technologies "] edition = "2018" diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml index 76d8f0a23eda2..eb7780a658d75 100644 --- a/client/network/Cargo.toml +++ b/client/network/Cargo.toml @@ -1,7 +1,7 @@ [package] description = "Substrate network protocol" name = "sc-network" -version = "0.8.0" +version = "0.8.1" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" authors = ["Parity Technologies "] edition = "2018" diff --git a/client/network/src/light_client_handler.rs b/client/network/src/light_client_handler.rs index c1ff14fc82a22..d1c407c99695b 100644 --- a/client/network/src/light_client_handler.rs +++ b/client/network/src/light_client_handler.rs @@ -1429,7 +1429,7 @@ mod tests { _: ChangesProof ) -> Result, u32)>, ClientError> { match self.ok { - true => Ok(vec![(100.into(), 2)]), + true => Ok(vec![(100u32.into(), 2)]), false => Err(ClientError::Backend("Test error".into())), } } diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml index 5686d33da9b23..69b53fb2fb82c 100644 --- a/client/offchain/Cargo.toml +++ b/client/offchain/Cargo.toml @@ -1,7 +1,7 @@ [package] description = "Substrate offchain workers" name = "sc-offchain" -version = "2.0.0" +version = "2.0.1" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" authors = ["Parity Technologies "] edition = "2018" diff --git a/client/offchain/src/api/timestamp.rs b/client/offchain/src/api/timestamp.rs index 222d3273cb355..0c91a5cc9553d 100644 --- a/client/offchain/src/api/timestamp.rs +++ b/client/offchain/src/api/timestamp.rs @@ -50,7 +50,7 @@ pub fn timestamp_from_now(timestamp: Timestamp) -> Duration { /// If `None`, returns a never-ending `Future`. pub fn deadline_to_future( deadline: Option, -) -> futures::future::MaybeDone { +) -> futures::future::MaybeDone> { use futures::future::{self, Either}; future::maybe_done(match deadline.map(timestamp_from_now) { diff --git a/client/peerset/Cargo.toml b/client/peerset/Cargo.toml index 40062db8f9b91..721591068ff2e 100644 --- a/client/peerset/Cargo.toml +++ b/client/peerset/Cargo.toml @@ -3,7 +3,7 @@ description = "Connectivity manager based on reputation" homepage = "http://parity.io" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" name = "sc-peerset" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" repository = "https://github.com/paritytech/substrate/" diff --git a/client/proposer-metrics/Cargo.toml b/client/proposer-metrics/Cargo.toml index 085f50f5be551..29a5701bc9e4d 100644 --- a/client/proposer-metrics/Cargo.toml +++ b/client/proposer-metrics/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-proposer-metrics" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" diff --git a/client/rpc-api/Cargo.toml b/client/rpc-api/Cargo.toml index 55eb51d261cdb..ed8ee1caf3b3d 100644 --- a/client/rpc-api/Cargo.toml +++ b/client/rpc-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-rpc-api" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" diff --git a/client/rpc-servers/Cargo.toml b/client/rpc-servers/Cargo.toml index 4fdf0298a530b..f5331cbce09b0 100644 --- a/client/rpc-servers/Cargo.toml +++ b/client/rpc-servers/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-rpc-server" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml index 12020bd32605e..cdb1e5ecab7cc 100644 --- a/client/rpc/Cargo.toml +++ b/client/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-rpc" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml index f57a145422c8c..a360ebc8f8c0a 100644 --- a/client/service/Cargo.toml +++ b/client/service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-service" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" diff --git a/client/service/src/chain_ops/export_blocks.rs b/client/service/src/chain_ops/export_blocks.rs index 2f32cbf7fbdb7..3d2dbcbb9d00f 100644 --- a/client/service/src/chain_ops/export_blocks.rs +++ b/client/service/src/chain_ops/export_blocks.rs @@ -87,7 +87,7 @@ where // Reached end of the chain. None => return Poll::Ready(Ok(())), } - if (block % 10000.into()).is_zero() { + if (block % 10000u32.into()).is_zero() { info!("#{}", block); } if block == last { diff --git a/client/service/src/chain_ops/import_blocks.rs b/client/service/src/chain_ops/import_blocks.rs index 46ad0d0501d93..74a33c6557c9a 100644 --- a/client/service/src/chain_ops/import_blocks.rs +++ b/client/service/src/chain_ops/import_blocks.rs @@ -200,7 +200,7 @@ impl Speedometer { /// Creates a fresh Speedometer. fn new() -> Self { Self { - best_number: NumberFor::::from(0), + best_number: NumberFor::::from(0u32), last_number: None, last_update: Instant::now(), } @@ -232,7 +232,7 @@ impl Speedometer { } else { // If the number of blocks can't be converted to a regular integer, then we need a more // algebraic approach and we stay within the realm of integers. - let one_thousand = NumberFor::::from(1_000); + let one_thousand = NumberFor::::from(1_000u32); let elapsed = NumberFor::::from( >::try_from(elapsed_ms).unwrap_or(u32::max_value()) ); diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs index fd76084988dbc..93a6a9320922b 100644 --- a/client/service/src/client/client.rs +++ b/client/service/src/client/client.rs @@ -38,7 +38,7 @@ use sp_runtime::{ generic::{BlockId, SignedBlock, DigestItem}, traits::{ Block as BlockT, Header as HeaderT, Zero, NumberFor, - HashFor, SaturatedConversion, One, DigestFor, + HashFor, SaturatedConversion, One, DigestFor, UniqueSaturatedInto, }, }; use sp_state_machine::{ @@ -1139,7 +1139,7 @@ impl Client where let mut ancestor = load_header(ancestor_hash)?; let mut uncles = Vec::new(); - for _generation in 0..max_generation.saturated_into() { + for _generation in 0u32..UniqueSaturatedInto::::unique_saturated_into(max_generation) { let children = self.backend.blockchain().children(ancestor_hash)?; uncles.extend(children.into_iter().filter(|h| h != ¤t_hash)); current_hash = ancestor_hash; diff --git a/client/service/src/metrics.rs b/client/service/src/metrics.rs index 0af393b53f517..d3ad780b5be62 100644 --- a/client/service/src/metrics.rs +++ b/client/service/src/metrics.rs @@ -316,9 +316,9 @@ impl MetricsService { ); if let Some(metrics) = self.metrics.as_ref() { - let best_seen_block = net_status + let best_seen_block: Option = net_status .best_seen_block - .map(|num: NumberFor| num.unique_saturated_into() as u64); + .map(|num: NumberFor| UniqueSaturatedInto::::unique_saturated_into(num)); if let Some(best_seen_block) = best_seen_block { metrics.block_height.with_label_values(&["sync_target"]).set(best_seen_block); diff --git a/client/state-db/Cargo.toml b/client/state-db/Cargo.toml index 4d3e736d9539e..8c87a4790976f 100644 --- a/client/state-db/Cargo.toml +++ b/client/state-db/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-state-db" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml index be7c88f68ae79..b0d21b40ff898 100644 --- a/client/telemetry/Cargo.toml +++ b/client/telemetry/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-telemetry" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] description = "Telemetry utils" edition = "2018" diff --git a/client/tracing/Cargo.toml b/client/tracing/Cargo.toml index 37b8cb4792824..48f2a9aac472a 100644 --- a/client/tracing/Cargo.toml +++ b/client/tracing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-tracing" -version = "2.0.0" +version = "2.0.1" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" authors = ["Parity Technologies "] edition = "2018" diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml index 5db37f5368387..28dad85f6d58a 100644 --- a/client/transaction-pool/Cargo.toml +++ b/client/transaction-pool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-transaction-pool" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml index c5850e765fcfa..b0f67bdda7e6e 100644 --- a/client/transaction-pool/graph/Cargo.toml +++ b/client/transaction-pool/graph/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc-transaction-graph" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" diff --git a/client/transaction-pool/src/lib.rs b/client/transaction-pool/src/lib.rs index 0b6a1e935b9d0..e03c01bd1d816 100644 --- a/client/transaction-pool/src/lib.rs +++ b/client/transaction-pool/src/lib.rs @@ -569,7 +569,7 @@ impl MaintainedTransactionPool for BasicPool let next_action = self.revalidation_strategy.lock().next( block_number, Some(std::time::Duration::from_secs(60)), - Some(20.into()), + Some(20u32.into()), ); let revalidation_strategy = self.revalidation_strategy.clone(); let revalidation_queue = self.revalidation_queue.clone(); diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 1582eee5d9265..1dbe447d62679 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -6,6 +6,18 @@ The format is based on [Keep a Changelog]. ## Unreleased +## 2.0.0-> 2.0.1 + +Patch release with backports to fix broken nightly builds. +Namely contains backports of + +* [#7381: Make Substrate compile with latest nightly](https://github.com/paritytech/substrate/pull/7381) +* [#7238: Fix compilation with environmental on latest nightly](https://github.com/paritytech/substrate/pull/7238) +* [#7395: Make benchmarks compile with latest nightly](https://github.com/paritytech/substrate/pull/7395) +* [#7838: Fix incorrect use of syn::exports](https://github.com/paritytech/substrate/pull/7838) (partially) +* [#7854: Update to futures 0.3.9](https://github.com/paritytech/substrate/pull/7854) + + ## 2.0.0-rc6 -> 2.0.0 – two dot 😮 Runtime diff --git a/frame/assets/Cargo.toml b/frame/assets/Cargo.toml index d1742e567cfac..4d34467778f2f 100644 --- a/frame/assets/Cargo.toml +++ b/frame/assets/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-assets" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/atomic-swap/Cargo.toml b/frame/atomic-swap/Cargo.toml index a65632289426b..4486057be9560 100644 --- a/frame/atomic-swap/Cargo.toml +++ b/frame/atomic-swap/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-atomic-swap" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/aura/Cargo.toml b/frame/aura/Cargo.toml index 27a579e0f9f8b..88132cfffe4a8 100644 --- a/frame/aura/Cargo.toml +++ b/frame/aura/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-aura" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/aura/src/lib.rs b/frame/aura/src/lib.rs index ca3d1f15f421b..e4b339442de34 100644 --- a/frame/aura/src/lib.rs +++ b/frame/aura/src/lib.rs @@ -74,7 +74,7 @@ pub trait Trait: pallet_timestamp::Trait { decl_storage! { trait Store for Module as Aura { /// The last timestamp. - LastTimestamp get(fn last) build(|_| 0.into()): T::Moment; + LastTimestamp get(fn last) build(|_| 0u32.into()): T::Moment; /// The current authorities pub Authorities get(fn authorities): Vec; @@ -196,7 +196,7 @@ impl Module { pub fn slot_duration() -> T::Moment { // we double the minimum block-period so each author can always propose within // the majority of its slot. - ::MinimumPeriod::get().saturating_mul(2.into()) + ::MinimumPeriod::get().saturating_mul(2u32.into()) } fn on_timestamp_set(now: T::Moment, slot_duration: T::Moment) { diff --git a/frame/authority-discovery/Cargo.toml b/frame/authority-discovery/Cargo.toml index 0e1db74632786..e77261e5b29c1 100644 --- a/frame/authority-discovery/Cargo.toml +++ b/frame/authority-discovery/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-authority-discovery" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/authorship/Cargo.toml b/frame/authorship/Cargo.toml index e8b6444583821..c9727010b3ea5 100644 --- a/frame/authorship/Cargo.toml +++ b/frame/authorship/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-authorship" -version = "2.0.0" +version = "2.0.1" description = "Block and Uncle Author tracking for the FRAME" authors = ["Parity Technologies "] edition = "2018" diff --git a/frame/babe/Cargo.toml b/frame/babe/Cargo.toml index a210a2a8ef06a..e1b4590d5bf72 100644 --- a/frame/babe/Cargo.toml +++ b/frame/babe/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-babe" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs index 3f13fe7e03002..51fc77b0e8d25 100644 --- a/frame/babe/src/lib.rs +++ b/frame/babe/src/lib.rs @@ -371,7 +371,7 @@ impl Module { pub fn slot_duration() -> T::Moment { // we double the minimum block-period so each author can always propose within // the majority of their slot. - ::MinimumPeriod::get().saturating_mul(2.into()) + ::MinimumPeriod::get().saturating_mul(2u32.into()) } /// Determine whether an epoch change should take place at this block. diff --git a/frame/balances/Cargo.toml b/frame/balances/Cargo.toml index 21c8abbc24a6c..004e631d48719 100644 --- a/frame/balances/Cargo.toml +++ b/frame/balances/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-balances" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/balances/src/benchmarking.rs b/frame/balances/src/benchmarking.rs index 21f43c7c63640..078d74006ba2f 100644 --- a/frame/balances/src/benchmarking.rs +++ b/frame/balances/src/benchmarking.rs @@ -49,7 +49,7 @@ benchmarks! { // Transfer `e - 1` existential deposits + 1 unit, which guarantees to create one account, and reap this user. let recipient: T::AccountId = account("recipient", 0, SEED); let recipient_lookup: ::Source = T::Lookup::unlookup(recipient.clone()); - let transfer_amount = existential_deposit.saturating_mul((ED_MULTIPLIER - 1).into()) + 1.into(); + let transfer_amount = existential_deposit.saturating_mul((ED_MULTIPLIER - 1).into()) + 1u32.into(); }: transfer(RawOrigin::Signed(caller.clone()), recipient_lookup, transfer_amount) verify { assert_eq!(Balances::::free_balance(&caller), Zero::zero()); @@ -138,7 +138,7 @@ benchmarks! { // Transfer `e - 1` existential deposits + 1 unit, which guarantees to create one account, and reap this user. let recipient: T::AccountId = account("recipient", 0, SEED); let recipient_lookup: ::Source = T::Lookup::unlookup(recipient.clone()); - let transfer_amount = existential_deposit.saturating_mul((ED_MULTIPLIER - 1).into()) + 1.into(); + let transfer_amount = existential_deposit.saturating_mul((ED_MULTIPLIER - 1).into()) + 1u32.into(); }: force_transfer(RawOrigin::Root, source_lookup, recipient_lookup, transfer_amount) verify { assert_eq!(Balances::::free_balance(&source), Zero::zero()); diff --git a/frame/benchmarking/Cargo.toml b/frame/benchmarking/Cargo.toml index 924ffc8627abc..87e16c5d772a4 100644 --- a/frame/benchmarking/Cargo.toml +++ b/frame/benchmarking/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "frame-benchmarking" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs index b189cdb6e705e..284b0545d03a5 100644 --- a/frame/benchmarking/src/lib.rs +++ b/frame/benchmarking/src/lib.rs @@ -820,7 +820,7 @@ macro_rules! impl_benchmark { // Set the block number to at least 1 so events are deposited. if $crate::Zero::is_zero(&frame_system::Module::::block_number()) { - frame_system::Module::::set_block_number(1.into()); + frame_system::Module::::set_block_number(1u32.into()); } // Commit the externalities to the database, flushing the DB cache. @@ -966,7 +966,7 @@ macro_rules! impl_benchmark_test { // Set the block number to at least 1 so events are deposited. if $crate::Zero::is_zero(&frame_system::Module::::block_number()) { - frame_system::Module::::set_block_number(1.into()); + frame_system::Module::::set_block_number(1u32.into()); } // Run execution + verification diff --git a/frame/collective/Cargo.toml b/frame/collective/Cargo.toml index fd302fb836579..f25490b2df83a 100644 --- a/frame/collective/Cargo.toml +++ b/frame/collective/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-collective" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml index d18fed1bc8a3e..fe378bc008cd9 100644 --- a/frame/contracts/Cargo.toml +++ b/frame/contracts/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-contracts" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/contracts/common/Cargo.toml b/frame/contracts/common/Cargo.toml index 753ef9c08122f..b08f0a75ea7cf 100644 --- a/frame/contracts/common/Cargo.toml +++ b/frame/contracts/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-contracts-primitives" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/contracts/rpc/Cargo.toml b/frame/contracts/rpc/Cargo.toml index 587abcbcddaec..792da9d9870b1 100644 --- a/frame/contracts/rpc/Cargo.toml +++ b/frame/contracts/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-contracts-rpc" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/contracts/rpc/runtime-api/Cargo.toml b/frame/contracts/rpc/runtime-api/Cargo.toml index 04becf2b45f49..6687deeab3b35 100644 --- a/frame/contracts/rpc/runtime-api/Cargo.toml +++ b/frame/contracts/rpc/runtime-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-contracts-rpc-runtime-api" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/contracts/src/benchmarking.rs b/frame/contracts/src/benchmarking.rs index 1a04db4defdb6..ecb2fda135909 100644 --- a/frame/contracts/src/benchmarking.rs +++ b/frame/contracts/src/benchmarking.rs @@ -42,7 +42,7 @@ fn compile_module(code: &[u8]) -> (Vec, ::Outp } fn funding() -> BalanceOf { - T::Currency::minimum_balance() * 10_000.into() + T::Currency::minimum_balance() * 10_000u32.into() } fn create_funded_user(string: &'static str, n: u32) -> T::AccountId { @@ -160,7 +160,7 @@ benchmarks! { call { let data = vec![0u8; 128]; let endowment = Config::::subsistence_threshold_uncached(); - let value = T::Currency::minimum_balance() * 100.into(); + let value = T::Currency::minimum_balance() * 100u32.into(); let caller = create_funded_user::("caller", 0); let (binary, hash) = load_module!("dummy"); let addr = T::DetermineContractAddress::contract_address_for(&hash, &[], &caller); @@ -195,7 +195,7 @@ benchmarks! { // the reward for removing them. claim_surcharge { let endowment = Config::::subsistence_threshold_uncached(); - let value = T::Currency::minimum_balance() * 100.into(); + let value = T::Currency::minimum_balance() * 100u32.into(); let caller = create_funded_user::("caller", 0); let (binary, hash) = load_module!("dummy"); let addr = T::DetermineContractAddress::contract_address_for(&hash, &[], &caller); @@ -213,7 +213,7 @@ benchmarks! { ContractInfoOf::::get(addr.clone()).unwrap().get_alive().unwrap(); // generate some rent - advance_block::(::SignedClaimHandicap::get() + 1.into()); + advance_block::(::SignedClaimHandicap::get() + 1u32.into()); }: _(RawOrigin::Signed(caller.clone()), addr.clone(), None) verify { diff --git a/frame/democracy/Cargo.toml b/frame/democracy/Cargo.toml index 44639a2275644..8f331385fe4b9 100644 --- a/frame/democracy/Cargo.toml +++ b/frame/democracy/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-democracy" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/democracy/src/benchmarking.rs b/frame/democracy/src/benchmarking.rs index 1fa0988fbbd4d..93e0e1df7c438 100644 --- a/frame/democracy/src/benchmarking.rs +++ b/frame/democracy/src/benchmarking.rs @@ -70,12 +70,12 @@ fn add_referendum(n: u32) -> Result { T::LaunchPeriod::get(), proposal_hash, vote_threshold, - 0.into(), + 0u32.into(), ); let referendum_index: ReferendumIndex = ReferendumCount::get() - 1; T::Scheduler::schedule_named( (DEMOCRACY_ID, referendum_index).encode(), - DispatchTime::At(1.into()), + DispatchTime::At(1u32.into()), None, 63, system::RawOrigin::Root.into(), @@ -132,7 +132,7 @@ benchmarks! { let r in 1 .. MAX_REFERENDUMS; let caller = funded_account::("caller", 0); - let account_vote = account_vote::(100.into()); + let account_vote = account_vote::(100u32.into()); // We need to create existing direct votes for i in 0 .. r { @@ -160,7 +160,7 @@ benchmarks! { let r in 1 .. MAX_REFERENDUMS; let caller = funded_account::("caller", 0); - let account_vote = account_vote::(100.into()); + let account_vote = account_vote::(100u32.into()); // We need to create existing direct votes for i in 0 ..=r { @@ -175,7 +175,7 @@ benchmarks! { // Change vote from aye to nay let nay = Vote { aye: false, conviction: Conviction::Locked1x }; - let new_vote = AccountVote::Standard { vote: nay, balance: 1000.into() }; + let new_vote = AccountVote::Standard { vote: nay, balance: 1000u32.into() }; let referendum_index = Democracy::::referendum_count() - 1; // This tests when a user changes a vote @@ -192,7 +192,7 @@ benchmarks! { ReferendumInfo::Ongoing(r) => r.tally, _ => return Err("referendum not ongoing"), }; - assert_eq!(tally.nays, 1000.into(), "changed vote was not recorded"); + assert_eq!(tally.nays, 1000u32.into(), "changed vote was not recorded"); } emergency_cancel { @@ -253,7 +253,7 @@ benchmarks! { // NOTE: Instant origin may invoke a little bit more logic, but may not always succeed. let origin_fast_track = T::FastTrackOrigin::successful_origin(); let voting_period = T::FastTrackVotingPeriod::get(); - let delay = 0; + let delay = 0u32; let call = Call::::fast_track(proposal_hash, voting_period.into(), delay.into()); }: { call.dispatch_bypass_filter(origin_fast_track)? } @@ -382,7 +382,7 @@ benchmarks! { for (key, mut info) in ReferendumInfoOf::::iter() { if let ReferendumInfo::Ongoing(ref mut status) = info { - status.end += 100.into(); + status.end += 100u32.into(); } ReferendumInfoOf::::insert(key, info); } @@ -390,7 +390,7 @@ benchmarks! { assert_eq!(Democracy::::referendum_count(), r, "referenda not created"); assert_eq!(Democracy::::lowest_unbaked(), 0, "invalid referenda init"); - }: { Democracy::::on_initialize(0.into()) } + }: { Democracy::::on_initialize(0u32.into()) } verify { // All should be on going for i in 0 .. r { @@ -406,8 +406,8 @@ benchmarks! { delegate { let r in 1 .. MAX_REFERENDUMS; - let initial_balance: BalanceOf = 100.into(); - let delegated_balance: BalanceOf = 1000.into(); + let initial_balance: BalanceOf = 100u32.into(); + let delegated_balance: BalanceOf = 1000u32.into(); let caller = funded_account::("caller", 0); // Caller will initially delegate to `old_delegate` @@ -455,8 +455,8 @@ benchmarks! { undelegate { let r in 1 .. MAX_REFERENDUMS; - let initial_balance: BalanceOf = 100.into(); - let delegated_balance: BalanceOf = 1000.into(); + let initial_balance: BalanceOf = 100u32.into(); + let delegated_balance: BalanceOf = 1000u32.into(); let caller = funded_account::("caller", 0); // Caller will delegate @@ -567,7 +567,7 @@ benchmarks! { let locker = funded_account::("locker", 0); // Populate votes so things are locked - let base_balance: BalanceOf = 100.into(); + let base_balance: BalanceOf = 100u32.into(); let small_vote = account_vote::(base_balance); // Vote and immediately unvote for i in 0 .. r { @@ -590,7 +590,7 @@ benchmarks! { let locker = funded_account::("locker", 0); // Populate votes so things are locked - let base_balance: BalanceOf = 100.into(); + let base_balance: BalanceOf = 100u32.into(); let small_vote = account_vote::(base_balance); for i in 0 .. r { let ref_idx = add_referendum::(i)?; @@ -598,7 +598,7 @@ benchmarks! { } // Create a big vote so lock increases - let big_vote = account_vote::(base_balance * 10.into()); + let big_vote = account_vote::(base_balance * 10u32.into()); let referendum_index = add_referendum::(r)?; Democracy::::vote(RawOrigin::Signed(locker.clone()).into(), referendum_index, big_vote)?; @@ -609,7 +609,7 @@ benchmarks! { assert_eq!(votes.len(), (r + 1) as usize, "Votes were not recorded."); let voting = VotingOf::::get(&locker); - assert_eq!(voting.locked_balance(), base_balance * 10.into()); + assert_eq!(voting.locked_balance(), base_balance * 10u32.into()); Democracy::::remove_vote(RawOrigin::Signed(locker.clone()).into(), referendum_index)?; @@ -631,7 +631,7 @@ benchmarks! { let r in 1 .. MAX_REFERENDUMS; let caller = funded_account::("caller", 0); - let account_vote = account_vote::(100.into()); + let account_vote = account_vote::(100u32.into()); for i in 0 .. r { let ref_idx = add_referendum::(i)?; @@ -660,7 +660,7 @@ benchmarks! { let r in 1 .. MAX_REFERENDUMS; let caller = funded_account::("caller", r); - let account_vote = account_vote::(100.into()); + let account_vote = account_vote::(100u32.into()); for i in 0 .. r { let ref_idx = add_referendum::(i)?; diff --git a/frame/elections-phragmen/Cargo.toml b/frame/elections-phragmen/Cargo.toml index 8d59cde19255a..8b09e77422531 100644 --- a/frame/elections-phragmen/Cargo.toml +++ b/frame/elections-phragmen/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-elections-phragmen" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/elections/Cargo.toml b/frame/elections/Cargo.toml index f0281a3033dd2..08fc8267ed68a 100644 --- a/frame/elections/Cargo.toml +++ b/frame/elections/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-elections" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/evm/Cargo.toml b/frame/evm/Cargo.toml index a228dfb566be2..21fc9310a8e68 100644 --- a/frame/evm/Cargo.toml +++ b/frame/evm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-evm" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/example-offchain-worker/Cargo.toml b/frame/example-offchain-worker/Cargo.toml index 8478ddec29053..b445cd8461721 100644 --- a/frame/example-offchain-worker/Cargo.toml +++ b/frame/example-offchain-worker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-example-offchain-worker" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Unlicense" diff --git a/frame/example-offchain-worker/src/lib.rs b/frame/example-offchain-worker/src/lib.rs index 8e02a09484ef5..5fd5eff19bd73 100644 --- a/frame/example-offchain-worker/src/lib.rs +++ b/frame/example-offchain-worker/src/lib.rs @@ -269,7 +269,7 @@ decl_module! { // to the storage and other included pallets. // // We can easily import `frame_system` and retrieve a block hash of the parent block. - let parent_hash = >::block_hash(block_number - 1.into()); + let parent_hash = >::block_hash(block_number - 1u32.into()); debug::debug!("Current block: {:?} (parent hash: {:?})", block_number, parent_hash); // It's a good practice to keep `fn offchain_worker()` function minimal, and move most @@ -364,10 +364,10 @@ impl Module { // transactions in a row. If a strict order is desired, it's better to use // the storage entry for that. (for instance store both block number and a flag // indicating the type of next transaction to send). - let transaction_type = block_number % 3.into(); + let transaction_type = block_number % 3u32.into(); if transaction_type == Zero::zero() { TransactionType::Signed } - else if transaction_type == T::BlockNumber::from(1) { TransactionType::UnsignedForAny } - else if transaction_type == T::BlockNumber::from(2) { TransactionType::UnsignedForAll } + else if transaction_type == T::BlockNumber::from(1u32) { TransactionType::UnsignedForAny } + else if transaction_type == T::BlockNumber::from(2u32) { TransactionType::UnsignedForAll } else { TransactionType::Raw } }, // We are in the grace period, we should not send a transaction this time. diff --git a/frame/executive/Cargo.toml b/frame/executive/Cargo.toml index 3bd8da04e6cf1..7cd1601189707 100644 --- a/frame/executive/Cargo.toml +++ b/frame/executive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "frame-executive" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs index 7a5f39ccd8f48..1e3fc68cf6871 100644 --- a/frame/executive/src/lib.rs +++ b/frame/executive/src/lib.rs @@ -468,7 +468,7 @@ where >::offchain_worker( // to maintain backward compatibility we call module offchain workers // with parent block number. - header.number().saturating_sub(1.into()) + header.number().saturating_sub(1u32.into()) ) } } diff --git a/frame/finality-tracker/Cargo.toml b/frame/finality-tracker/Cargo.toml index b8597acc3bc07..b0666430f5023 100644 --- a/frame/finality-tracker/Cargo.toml +++ b/frame/finality-tracker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-finality-tracker" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/grandpa/Cargo.toml b/frame/grandpa/Cargo.toml index 6147458b0dbd7..f1f1941eb34b1 100644 --- a/frame/grandpa/Cargo.toml +++ b/frame/grandpa/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-grandpa" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/grandpa/src/benchmarking.rs b/frame/grandpa/src/benchmarking.rs index 048f99fff7a9b..bac2c24584464 100644 --- a/frame/grandpa/src/benchmarking.rs +++ b/frame/grandpa/src/benchmarking.rs @@ -65,8 +65,8 @@ benchmarks! { } note_stalled { - let delay = 1000.into(); - let best_finalized_block_number = 1.into(); + let delay = 1000u32.into(); + let best_finalized_block_number = 1u32.into(); }: _(RawOrigin::Root, delay, best_finalized_block_number) verify { diff --git a/frame/grandpa/src/lib.rs b/frame/grandpa/src/lib.rs index 9a592ab9266f1..5b2bd50bb6a20 100644 --- a/frame/grandpa/src/lib.rs +++ b/frame/grandpa/src/lib.rs @@ -447,7 +447,7 @@ impl Module { // only allow the next forced change when twice the window has passed since // this one. - >::put(scheduled_at + in_blocks * 2.into()); + >::put(scheduled_at + in_blocks * 2u32.into()); } >::put(StoredPendingChange { diff --git a/frame/identity/Cargo.toml b/frame/identity/Cargo.toml index 08777c44ad2b1..b39ce1c944e4d 100644 --- a/frame/identity/Cargo.toml +++ b/frame/identity/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-identity" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/identity/src/benchmarking.rs b/frame/identity/src/benchmarking.rs index d39df27017b71..d7876514452e2 100644 --- a/frame/identity/src/benchmarking.rs +++ b/frame/identity/src/benchmarking.rs @@ -43,7 +43,7 @@ fn add_registrars(r: u32) -> Result<(), &'static str> { let registrar: T::AccountId = account("registrar", i, SEED); let _ = T::Currency::make_free_balance_be(®istrar, BalanceOf::::max_value()); Identity::::add_registrar(RawOrigin::Root.into(), registrar.clone())?; - Identity::::set_fee(RawOrigin::Signed(registrar.clone()).into(), i.into(), 10.into())?; + Identity::::set_fee(RawOrigin::Signed(registrar.clone()).into(), i.into(), 10u32.into())?; let fields = IdentityFields( IdentityField::Display | IdentityField::Legal | IdentityField::Web | IdentityField::Riot | IdentityField::Email | IdentityField::PgpFingerprint | IdentityField::Image | IdentityField::Twitter @@ -152,7 +152,7 @@ benchmarks! { // User requests judgement from all the registrars, and they approve for i in 0..r { - Identity::::request_judgement(caller_origin.clone(), i, 10.into())?; + Identity::::request_judgement(caller_origin.clone(), i, 10u32.into())?; Identity::::provide_judgement( RawOrigin::Signed(account("registrar", i, SEED)).into(), i, @@ -210,7 +210,7 @@ benchmarks! { // User requests judgement from all the registrars, and they approve for i in 0..r { - Identity::::request_judgement(caller_origin.clone(), i, 10.into())?; + Identity::::request_judgement(caller_origin.clone(), i, 10u32.into())?; Identity::::provide_judgement( RawOrigin::Signed(account("registrar", i, SEED)).into(), i, @@ -230,7 +230,7 @@ benchmarks! { let r in ...; let x in ...; - }: _(RawOrigin::Signed(caller.clone()), r - 1, 10.into()) + }: _(RawOrigin::Signed(caller.clone()), r - 1, 10u32.into()) verify { assert_last_event::(Event::::JudgementRequested(caller, r-1).into()); } @@ -243,7 +243,7 @@ benchmarks! { let r in ...; let x in ...; - Identity::::request_judgement(caller_origin, r - 1, 10.into())?; + Identity::::request_judgement(caller_origin, r - 1, 10u32.into())?; }: _(RawOrigin::Signed(caller.clone()), r - 1) verify { assert_last_event::(Event::::JudgementUnrequested(caller, r-1).into()); @@ -256,11 +256,11 @@ benchmarks! { Identity::::add_registrar(RawOrigin::Root.into(), caller.clone())?; let registrars = Registrars::::get(); - ensure!(registrars[r as usize].as_ref().unwrap().fee == 0.into(), "Fee already set."); - }: _(RawOrigin::Signed(caller), r, 100.into()) + ensure!(registrars[r as usize].as_ref().unwrap().fee == 0u32.into(), "Fee already set."); + }: _(RawOrigin::Signed(caller), r, 100u32.into()) verify { let registrars = Registrars::::get(); - ensure!(registrars[r as usize].as_ref().unwrap().fee == 100.into(), "Fee not changed."); + ensure!(registrars[r as usize].as_ref().unwrap().fee == 100u32.into(), "Fee not changed."); } set_account_id { @@ -315,7 +315,7 @@ benchmarks! { }; Identity::::add_registrar(RawOrigin::Root.into(), caller.clone())?; - Identity::::request_judgement(user_origin.clone(), r, 10.into())?; + Identity::::request_judgement(user_origin.clone(), r, 10u32.into())?; }: _(RawOrigin::Signed(caller), r, user_lookup, Judgement::Reasonable) verify { assert_last_event::(Event::::JudgementGiven(user, r).into()) @@ -338,7 +338,7 @@ benchmarks! { // User requests judgement from all the registrars, and they approve for i in 0..r { - Identity::::request_judgement(target_origin.clone(), i, 10.into())?; + Identity::::request_judgement(target_origin.clone(), i, 10u32.into())?; Identity::::provide_judgement( RawOrigin::Signed(account("registrar", i, SEED)).into(), i, diff --git a/frame/im-online/Cargo.toml b/frame/im-online/Cargo.toml index ef22d67688732..69cf402a12f3f 100644 --- a/frame/im-online/Cargo.toml +++ b/frame/im-online/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-im-online" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs index ef9c6b9182af6..716a2cbcb786c 100644 --- a/frame/im-online/src/lib.rs +++ b/frame/im-online/src/lib.rs @@ -594,7 +594,7 @@ impl Module { // clear the lock in case we have failed to send transaction. if res.is_err() { - new_status.sent_at = 0.into(); + new_status.sent_at = 0u32.into(); storage.set(&new_status); } @@ -635,7 +635,7 @@ impl pallet_session::OneSessionHandler for Module { // Since we consider producing blocks as being online, // the heartbeat is deferred a bit to prevent spamming. let block_number = >::block_number(); - let half_session = T::SessionDuration::get() / 2.into(); + let half_session = T::SessionDuration::get() / 2u32.into(); >::put(block_number + half_session); // Remember who the authorities are for the new session. @@ -723,7 +723,7 @@ impl frame_support::unsigned::ValidateUnsigned for Module { .priority(T::UnsignedPriority::get()) .and_provides((current_session, authority_id)) .longevity(TryInto::::try_into( - T::SessionDuration::get() / 2.into() + T::SessionDuration::get() / 2u32.into() ).unwrap_or(64_u64)) .propagate(true) .build() diff --git a/frame/indices/Cargo.toml b/frame/indices/Cargo.toml index aea8dbf1a866e..42af6aa49859a 100644 --- a/frame/indices/Cargo.toml +++ b/frame/indices/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-indices" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/membership/Cargo.toml b/frame/membership/Cargo.toml index 1cac5d38c5f18..251f987ded998 100644 --- a/frame/membership/Cargo.toml +++ b/frame/membership/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-membership" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/metadata/Cargo.toml b/frame/metadata/Cargo.toml index 2934b15562c43..f0db94541357a 100644 --- a/frame/metadata/Cargo.toml +++ b/frame/metadata/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "frame-metadata" -version = "12.0.0" +version = "12.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/multisig/Cargo.toml b/frame/multisig/Cargo.toml index 2be66ebb722c1..78e71080c3390 100644 --- a/frame/multisig/Cargo.toml +++ b/frame/multisig/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-multisig" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/nicks/Cargo.toml b/frame/nicks/Cargo.toml index 8f348d665b7e3..c23fa9badada0 100644 --- a/frame/nicks/Cargo.toml +++ b/frame/nicks/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-nicks" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/offences/Cargo.toml b/frame/offences/Cargo.toml index c5c8881007c22..fbc8567534c67 100644 --- a/frame/offences/Cargo.toml +++ b/frame/offences/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-offences" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/offences/benchmarking/Cargo.toml b/frame/offences/benchmarking/Cargo.toml index 7a95cebc4fb21..d2e020ef681ec 100644 --- a/frame/offences/benchmarking/Cargo.toml +++ b/frame/offences/benchmarking/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-offences-benchmarking" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs index e35050992368a..47055eab73d4a 100644 --- a/frame/offences/benchmarking/src/lib.rs +++ b/frame/offences/benchmarking/src/lib.rs @@ -87,7 +87,7 @@ struct Offender { } fn bond_amount() -> BalanceOf { - T::Currency::minimum_balance().saturating_mul(10_000.into()) + T::Currency::minimum_balance().saturating_mul(10_000u32.into()) } fn create_offender(n: u32, nominators: u32) -> Result, &'static str> { @@ -97,7 +97,7 @@ fn create_offender(n: u32, nominators: u32) -> Result, &'s let reward_destination = RewardDestination::Staked; let raw_amount = bond_amount::(); // add twice as much balance to prevent the account from being killed. - let free_amount = raw_amount.saturating_mul(2.into()); + let free_amount = raw_amount.saturating_mul(2u32.into()); T::Currency::make_free_balance_be(&stash, free_amount); let amount: BalanceOf = raw_amount.into(); Staking::::bond( @@ -243,7 +243,8 @@ benchmarks! { verify { // make sure the report was not deferred assert!(Offences::::deferred_offences().is_empty()); - let slash_amount = slash_fraction * bond_amount::().unique_saturated_into() as u32; + let bond_amount: u32 = UniqueSaturatedInto::::unique_saturated_into(bond_amount::()); + let slash_amount = slash_fraction * bond_amount; let reward_amount = slash_amount * (1 + n) / 2; let mut slash_events = raw_offenders.into_iter() .flat_map(|offender| { @@ -379,7 +380,7 @@ benchmarks! { Offences::::set_deferred_offences(deferred_offences); assert!(!Offences::::deferred_offences().is_empty()); }: { - Offences::::on_initialize(0.into()); + Offences::::on_initialize(0u32.into()); } verify { // make sure that all deferred offences were reported with Ok status. diff --git a/frame/proxy/Cargo.toml b/frame/proxy/Cargo.toml index 1c32edf162c69..219e72502e0e4 100644 --- a/frame/proxy/Cargo.toml +++ b/frame/proxy/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-proxy" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/randomness-collective-flip/Cargo.toml b/frame/randomness-collective-flip/Cargo.toml index d35f6960af5d9..bca617e6f484b 100644 --- a/frame/randomness-collective-flip/Cargo.toml +++ b/frame/randomness-collective-flip/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-randomness-collective-flip" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/randomness-collective-flip/src/lib.rs b/frame/randomness-collective-flip/src/lib.rs index 6b1b9f4f37448..c1747669dab07 100644 --- a/frame/randomness-collective-flip/src/lib.rs +++ b/frame/randomness-collective-flip/src/lib.rs @@ -69,7 +69,7 @@ const RANDOM_MATERIAL_LEN: u32 = 81; fn block_number_to_index(block_number: T::BlockNumber) -> usize { // on_initialize is called on the first block after genesis - let index = (block_number - 1.into()) % RANDOM_MATERIAL_LEN.into(); + let index = (block_number - 1u32.into()) % RANDOM_MATERIAL_LEN.into(); index.try_into().ok().expect("Something % 81 is always smaller than usize; qed") } diff --git a/frame/recovery/Cargo.toml b/frame/recovery/Cargo.toml index 0ba2f5437c614..dd4a783af42f9 100644 --- a/frame/recovery/Cargo.toml +++ b/frame/recovery/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-recovery" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/scheduler/Cargo.toml b/frame/scheduler/Cargo.toml index 613762bb689e9..5178e0c86069c 100644 --- a/frame/scheduler/Cargo.toml +++ b/frame/scheduler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-scheduler" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Unlicense" diff --git a/frame/scored-pool/Cargo.toml b/frame/scored-pool/Cargo.toml index b36bade8e925a..45eb5ee7b278e 100644 --- a/frame/scored-pool/Cargo.toml +++ b/frame/scored-pool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-scored-pool" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/session/Cargo.toml b/frame/session/Cargo.toml index ea3a3d3cdf7fa..ebc7fc0c554c9 100644 --- a/frame/session/Cargo.toml +++ b/frame/session/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-session" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/session/benchmarking/Cargo.toml b/frame/session/benchmarking/Cargo.toml index dea05934cd872..7b025e52a7d18 100644 --- a/frame/session/benchmarking/Cargo.toml +++ b/frame/session/benchmarking/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-session-benchmarking" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/society/Cargo.toml b/frame/society/Cargo.toml index 2f3f3adabc2c2..b380620226bf8 100644 --- a/frame/society/Cargo.toml +++ b/frame/society/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-society" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml index 88b8c1270a4e1..ab5534300542c 100644 --- a/frame/staking/Cargo.toml +++ b/frame/staking/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-staking" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/staking/reward-curve/Cargo.toml b/frame/staking/reward-curve/Cargo.toml index 19f7e51b8f6ce..2eaa9acdf9a96 100644 --- a/frame/staking/reward-curve/Cargo.toml +++ b/frame/staking/reward-curve/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-staking-reward-curve" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs index afda58db4672f..8783945213851 100644 --- a/frame/staking/src/benchmarking.rs +++ b/frame/staking/src/benchmarking.rs @@ -103,7 +103,7 @@ pub fn create_validator_with_nominators( ErasRewardPoints::::insert(current_era, reward); // Create reward pool - let total_payout = T::Currency::minimum_balance() * 1000.into(); + let total_payout = T::Currency::minimum_balance() * 1000u32.into(); >::insert(current_era, total_payout); Ok(v_stash) @@ -119,7 +119,7 @@ benchmarks! { let controller = create_funded_user::("controller", USER_SEED, 100); let controller_lookup: ::Source = T::Lookup::unlookup(controller.clone()); let reward_destination = RewardDestination::Staked; - let amount = T::Currency::minimum_balance() * 10.into(); + let amount = T::Currency::minimum_balance() * 10u32.into(); do_whitelist!(stash); }: _(RawOrigin::Signed(stash.clone()), controller_lookup, amount, reward_destination) verify { @@ -129,7 +129,7 @@ benchmarks! { bond_extra { let (stash, controller) = create_stash_controller::(USER_SEED, 100, Default::default())?; - let max_additional = T::Currency::minimum_balance() * 10.into(); + let max_additional = T::Currency::minimum_balance() * 10u32.into(); let ledger = Ledger::::get(&controller).ok_or("ledger not created before")?; let original_bonded: BalanceOf = ledger.active; do_whitelist!(stash); @@ -142,7 +142,7 @@ benchmarks! { unbond { let (_, controller) = create_stash_controller::(USER_SEED, 100, Default::default())?; - let amount = T::Currency::minimum_balance() * 10.into(); + let amount = T::Currency::minimum_balance() * 10u32.into(); let ledger = Ledger::::get(&controller).ok_or("ledger not created before")?; let original_bonded: BalanceOf = ledger.active; do_whitelist!(controller); @@ -159,7 +159,7 @@ benchmarks! { let s in 0 .. MAX_SPANS; let (stash, controller) = create_stash_controller::(0, 100, Default::default())?; add_slashing_spans::(&stash, s); - let amount = T::Currency::minimum_balance() * 5.into(); // Half of total + let amount = T::Currency::minimum_balance() * 5u32.into(); // Half of total Staking::::unbond(RawOrigin::Signed(controller.clone()).into(), amount)?; CurrentEra::put(EraIndex::max_value()); let ledger = Ledger::::get(&controller).ok_or("ledger not created before")?; @@ -178,7 +178,7 @@ benchmarks! { let s in 0 .. MAX_SPANS; let (stash, controller) = create_stash_controller::(0, 100, Default::default())?; add_slashing_spans::(&stash, s); - let amount = T::Currency::minimum_balance() * 10.into(); + let amount = T::Currency::minimum_balance() * 10u32.into(); Staking::::unbond(RawOrigin::Signed(controller.clone()).into(), amount)?; CurrentEra::put(EraIndex::max_value()); let ledger = Ledger::::get(&controller).ok_or("ledger not created before")?; @@ -342,7 +342,7 @@ benchmarks! { let (_, controller) = create_stash_controller::(USER_SEED, 100, Default::default())?; let mut staking_ledger = Ledger::::get(controller.clone()).unwrap(); let unlock_chunk = UnlockChunk::> { - value: 1.into(), + value: 1u32.into(), era: EraIndex::zero(), }; for _ in 0 .. l { @@ -380,7 +380,7 @@ benchmarks! { let s in 1 .. MAX_SPANS; let (stash, controller) = create_stash_controller::(0, 100, Default::default())?; add_slashing_spans::(&stash, s); - T::Currency::make_free_balance_be(&stash, 0.into()); + T::Currency::make_free_balance_be(&stash, 0u32.into()); do_whitelist!(controller); }: _(RawOrigin::Signed(controller), stash.clone(), s) verify { @@ -427,7 +427,7 @@ benchmarks! { ErasRewardPoints::::insert(current_era, reward); // Create reward pool - let total_payout = T::Currency::minimum_balance() * 1000.into(); + let total_payout = T::Currency::minimum_balance() * 1000u32.into(); >::insert(current_era, total_payout); let caller: T::AccountId = whitelisted_caller(); @@ -443,14 +443,14 @@ benchmarks! { let (stash, controller) = create_stash_controller::(0, 100, Default::default())?; let mut staking_ledger = Ledger::::get(controller.clone()).unwrap(); let unlock_chunk = UnlockChunk::> { - value: 1.into(), + value: 1u32.into(), era: EraIndex::zero(), }; for _ in 0 .. l { staking_ledger.unlocking.push(unlock_chunk.clone()) } Ledger::::insert(controller, staking_ledger); - let slash_amount = T::Currency::minimum_balance() * 10.into(); + let slash_amount = T::Currency::minimum_balance() * 10u32.into(); let balance_before = T::Currency::free_balance(&stash); }: { crate::slashing::do_slash::( diff --git a/frame/sudo/Cargo.toml b/frame/sudo/Cargo.toml index 4713baea518f9..5ed084c1fbd3d 100644 --- a/frame/sudo/Cargo.toml +++ b/frame/sudo/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-sudo" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml index d082b718262b8..76185cf15824f 100644 --- a/frame/support/Cargo.toml +++ b/frame/support/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "frame-support" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" @@ -24,7 +24,7 @@ sp-tracing = { version = "2.0.0", default-features = false, path = "../../primit sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" } sp-arithmetic = { version = "2.0.0", default-features = false, path = "../../primitives/arithmetic" } sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" } -frame-support-procedural = { version = "2.0.0", path = "./procedural" } +frame-support-procedural = { version = "2.0.1", path = "./procedural" } paste = "0.1.6" once_cell = { version = "1", default-features = false, optional = true } sp-state-machine = { version = "0.8.0", optional = true, path = "../../primitives/state-machine" } diff --git a/frame/support/procedural/Cargo.toml b/frame/support/procedural/Cargo.toml index 24d166b75c396..c7d8ae8ea8118 100644 --- a/frame/support/procedural/Cargo.toml +++ b/frame/support/procedural/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "frame-support-procedural" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" @@ -18,4 +18,4 @@ proc-macro = true frame-support-procedural-tools = { version = "2.0.0", path = "./tools" } proc-macro2 = "1.0.6" quote = "1.0.3" -syn = { version = "1.0.7", features = ["full"] } +syn = { version = "1.0.58", features = ["full"] } diff --git a/frame/support/procedural/src/storage/parse.rs b/frame/support/procedural/src/storage/parse.rs index 504af6d0ffcad..d5c84a3539995 100644 --- a/frame/support/procedural/src/storage/parse.rs +++ b/frame/support/procedural/src/storage/parse.rs @@ -47,7 +47,7 @@ mod keyword { pub struct Opt

{ pub inner: Option

, } -impl syn::export::ToTokens for Opt

{ +impl quote::ToTokens for Opt

{ fn to_tokens(&self, tokens: &mut proc_macro2::TokenStream) { if let Some(ref p) = self.inner { p.to_tokens(tokens); diff --git a/frame/support/procedural/tools/Cargo.toml b/frame/support/procedural/tools/Cargo.toml index 2cff2473b85d4..e1a98e3bc40db 100644 --- a/frame/support/procedural/tools/Cargo.toml +++ b/frame/support/procedural/tools/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "frame-support-procedural-tools" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/support/procedural/tools/derive/Cargo.toml b/frame/support/procedural/tools/derive/Cargo.toml index b616dd790d61e..7fdb446344223 100644 --- a/frame/support/procedural/tools/derive/Cargo.toml +++ b/frame/support/procedural/tools/derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "frame-support-procedural-tools-derive" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/support/test/Cargo.toml b/frame/support/test/Cargo.toml index ee8ace5c983c5..7c4f89e179f27 100644 --- a/frame/support/test/Cargo.toml +++ b/frame/support/test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "frame-support-test" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" @@ -21,7 +21,7 @@ sp-inherents = { version = "2.0.0", default-features = false, path = "../../../p sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" } sp-core = { version = "2.0.0", default-features = false, path = "../../../primitives/core" } sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" } -trybuild = "1.0.33" +trybuild = "1.0.38" pretty_assertions = "0.6.1" rustversion = "1.0.0" frame-metadata = { version = "12.0.0", default-features = false, path = "../../metadata" } diff --git a/frame/system/Cargo.toml b/frame/system/Cargo.toml index cebf761a907c7..79e7a4713ed04 100644 --- a/frame/system/Cargo.toml +++ b/frame/system/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "frame-system" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" @@ -20,7 +20,7 @@ sp-std = { version = "2.0.0", default-features = false, path = "../../primitives sp-io = { version = "2.0.0", path = "../../primitives/io", default-features = false } sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" } sp-version = { version = "2.0.0", default-features = false, path = "../../primitives/version" } -frame-support = { version = "2.0.0", default-features = false, path = "../support" } +frame-support = { version = "2.0.1", default-features = false, path = "../support" } impl-trait-for-tuples = "0.1.3" [dev-dependencies] diff --git a/frame/system/benchmarking/Cargo.toml b/frame/system/benchmarking/Cargo.toml index 26b9bd9230e00..39f33b033bb52 100644 --- a/frame/system/benchmarking/Cargo.toml +++ b/frame/system/benchmarking/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "frame-system-benchmarking" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/system/benchmarking/src/lib.rs b/frame/system/benchmarking/src/lib.rs index 653d9536f1797..41253b0e407f2 100644 --- a/frame/system/benchmarking/src/lib.rs +++ b/frame/system/benchmarking/src/lib.rs @@ -139,17 +139,17 @@ benchmarks! { suicide { let caller: T::AccountId = whitelisted_caller(); let account_info = AccountInfo:: { - nonce: 1337.into(), + nonce: 1337u32.into(), refcount: 0, data: T::AccountData::default() }; frame_system::Account::::insert(&caller, account_info); let new_account_info = System::::account(caller.clone()); - assert_eq!(new_account_info.nonce, 1337.into()); + assert_eq!(new_account_info.nonce, 1337u32.into()); }: _(RawOrigin::Signed(caller.clone())) verify { let account_info = System::::account(&caller); - assert_eq!(account_info.nonce, 0.into()); + assert_eq!(account_info.nonce, 0u32.into()); } } diff --git a/frame/system/rpc/runtime-api/Cargo.toml b/frame/system/rpc/runtime-api/Cargo.toml index d00094364e3e8..9df5fbec11d01 100644 --- a/frame/system/rpc/runtime-api/Cargo.toml +++ b/frame/system/rpc/runtime-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "frame-system-rpc-runtime-api" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/system/src/offchain.rs b/frame/system/src/offchain.rs index 6e6284b57fdc3..ba5cfb8536f24 100644 --- a/frame/system/src/offchain.rs +++ b/frame/system/src/offchain.rs @@ -183,7 +183,7 @@ impl, X> Signer .enumerate() .map(|(index, key)| { let generic_public = C::GenericPublic::from(key); - let public = generic_public.into(); + let public: T::Public = generic_public.into(); let account_id = public.clone().into_account(); Account::new(index, account_id, public) }) diff --git a/frame/timestamp/Cargo.toml b/frame/timestamp/Cargo.toml index 5a99c5d02c5af..68a3d63dcd4d8 100644 --- a/frame/timestamp/Cargo.toml +++ b/frame/timestamp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-timestamp" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs index 959382c07b610..9750f72e89b91 100644 --- a/frame/timestamp/src/lib.rs +++ b/frame/timestamp/src/lib.rs @@ -200,7 +200,7 @@ decl_module! { decl_storage! { trait Store for Module as Timestamp { /// Current time for the current block. - pub Now get(fn now) build(|_| 0.into()): T::Moment; + pub Now get(fn now) build(|_| 0u32.into()): T::Moment; /// Did the timestamp get updated in this block? DidUpdate: bool; diff --git a/frame/transaction-payment/Cargo.toml b/frame/transaction-payment/Cargo.toml index 1fa4521900421..57e33ae3eb649 100644 --- a/frame/transaction-payment/Cargo.toml +++ b/frame/transaction-payment/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-transaction-payment" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/transaction-payment/rpc/Cargo.toml b/frame/transaction-payment/rpc/Cargo.toml index 26f073e60237f..670ed95d69537 100644 --- a/frame/transaction-payment/rpc/Cargo.toml +++ b/frame/transaction-payment/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-transaction-payment-rpc" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/transaction-payment/rpc/runtime-api/Cargo.toml b/frame/transaction-payment/rpc/runtime-api/Cargo.toml index 881c4330eb9a4..9d48839934070 100644 --- a/frame/transaction-payment/rpc/runtime-api/Cargo.toml +++ b/frame/transaction-payment/rpc/runtime-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-transaction-payment-rpc-runtime-api" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/treasury/Cargo.toml b/frame/treasury/Cargo.toml index fd2d103e9f335..3b4e0a22d6b5f 100644 --- a/frame/treasury/Cargo.toml +++ b/frame/treasury/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-treasury" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/treasury/src/benchmarking.rs b/frame/treasury/src/benchmarking.rs index 5224c1446f452..fa3e7a22ea3d8 100644 --- a/frame/treasury/src/benchmarking.rs +++ b/frame/treasury/src/benchmarking.rs @@ -36,7 +36,7 @@ fn setup_proposal, I: Instance>(u: u32) -> ( ::Source, ) { let caller = account("caller", u, SEED); - let value: BalanceOf = T::ProposalBondMinimum::get().saturating_mul(100.into()); + let value: BalanceOf = T::ProposalBondMinimum::get().saturating_mul(100u32.into()); let _ = T::Currency::make_free_balance_be(&caller, value); let beneficiary = account("beneficiary", u, SEED); let beneficiary_lookup = T::Lookup::unlookup(beneficiary); @@ -71,7 +71,7 @@ fn setup_tip, I: Instance>(r: u32, t: u32) -> let caller = account("member", t - 1, SEED); let reason = vec![0; r as usize]; let beneficiary = account("beneficiary", t, SEED); - let value = T::Currency::minimum_balance().saturating_mul(100.into()); + let value = T::Currency::minimum_balance().saturating_mul(100u32.into()); Ok((caller, reason, beneficiary, value)) } @@ -130,12 +130,12 @@ fn setup_bounty, I: Instance>(u: u32, d: u32) -> ( Vec, ) { let caller = account("caller", u, SEED); - let value: BalanceOf = T::Currency::minimum_balance().saturating_mul(100.into()); - let fee = T::Currency::minimum_balance().saturating_mul(2.into()); + let value: BalanceOf = T::Currency::minimum_balance().saturating_mul(100u32.into()); + let fee = T::Currency::minimum_balance().saturating_mul(2u32.into()); let deposit = T::BountyDepositBase::get() + T::DataDepositPerByte::get() * MAX_BYTES.into(); let _ = T::Currency::make_free_balance_be(&caller, deposit); let curator = account("curator", u, SEED); - let _ = T::Currency::make_free_balance_be(&curator, fee / 2.into()); + let _ = T::Currency::make_free_balance_be(&curator, fee / 2u32.into()); let reason = vec![0; d as usize]; (caller, curator, fee, value, reason) } @@ -157,7 +157,7 @@ fn create_bounty, I: Instance>() -> Result<( fn setup_pod_account, I: Instance>() { let pot_account = Treasury::::account_id(); - let value = T::Currency::minimum_balance().saturating_mul(1_000_000_000.into()); + let value = T::Currency::minimum_balance().saturating_mul(1_000_000_000u32.into()); let _ = T::Currency::make_free_balance_be(&pot_account, value); } @@ -230,7 +230,7 @@ benchmarks_instance! { tip { let t in 1 .. MAX_TIPPERS; let (member, reason, beneficiary, value) = setup_tip::(0, t)?; - let value = T::Currency::minimum_balance().saturating_mul(100.into()); + let value = T::Currency::minimum_balance().saturating_mul(100u32.into()); Treasury::::tip_new( RawOrigin::Signed(member).into(), reason.clone(), @@ -255,7 +255,7 @@ benchmarks_instance! { // Set up a new tip proposal let (member, reason, beneficiary, value) = setup_tip::(0, t)?; - let value = T::Currency::minimum_balance().saturating_mul(100.into()); + let value = T::Currency::minimum_balance().saturating_mul(100u32.into()); Treasury::::tip_new( RawOrigin::Signed(member).into(), reason.clone(), @@ -303,7 +303,7 @@ benchmarks_instance! { let (curator_lookup, bounty_id) = create_bounty::()?; Treasury::::on_initialize(T::BlockNumber::zero()); let bounty_id = BountyCount::::get() - 1; - frame_system::Module::::set_block_number(T::BountyUpdatePeriod::get() + 1.into()); + frame_system::Module::::set_block_number(T::BountyUpdatePeriod::get() + 1u32.into()); let caller = whitelisted_caller(); }: _(RawOrigin::Signed(caller), bounty_id) diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs index 4d76f2f532151..d81da40015fe5 100644 --- a/frame/treasury/src/lib.rs +++ b/frame/treasury/src/lib.rs @@ -1406,7 +1406,12 @@ impl, I: Instance> Module { BountyCount::::put(index + 1); let bounty = Bounty { - proposer, value, fee: 0.into(), curator_deposit: 0.into(), bond, status: BountyStatus::Proposed, + proposer, + value, + fee: 0u32.into(), + curator_deposit: 0u32.into(), + bond, + status: BountyStatus::Proposed, }; Bounties::::insert(index, &bounty); diff --git a/frame/utility/Cargo.toml b/frame/utility/Cargo.toml index 098730aa30083..a8ab438fc06c6 100644 --- a/frame/utility/Cargo.toml +++ b/frame/utility/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-utility" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/vesting/Cargo.toml b/frame/vesting/Cargo.toml index bea64c2b4f94d..eda21dc8bbc78 100644 --- a/frame/vesting/Cargo.toml +++ b/frame/vesting/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-vesting" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/frame/vesting/src/benchmarking.rs b/frame/vesting/src/benchmarking.rs index 7c5478472f8ab..69dc7abaa7038 100644 --- a/frame/vesting/src/benchmarking.rs +++ b/frame/vesting/src/benchmarking.rs @@ -34,18 +34,18 @@ type BalanceOf = <::Currency as Currency<(who: &T::AccountId, n: u8) { for id in 0..n { let lock_id = [id; 8]; - let locked = 100; + let locked = 100u32; let reasons = WithdrawReason::Transfer | WithdrawReason::Reserve; T::Currency::set_lock(lock_id, who, locked.into(), reasons); } } fn add_vesting_schedule(who: &T::AccountId) -> Result<(), &'static str> { - let locked = 100; - let per_block = 10; - let starting_block = 1; + let locked = 100u32; + let per_block = 10u32; + let starting_block = 1u32; - System::::set_block_number(0.into()); + System::::set_block_number(0u32.into()); // Add schedule to avoid `NotVesting` error. Vesting::::add_vesting_schedule( @@ -71,7 +71,7 @@ benchmarks! { System::::set_block_number(T::BlockNumber::zero()); assert_eq!( Vesting::::vesting_balance(&caller), - Some(100.into()), + Some(100u32.into()), "Vesting schedule not added", ); }: vest(RawOrigin::Signed(caller.clone())) @@ -79,7 +79,7 @@ benchmarks! { // Nothing happened since everything is still vested. assert_eq!( Vesting::::vesting_balance(&caller), - Some(100.into()), + Some(100u32.into()), "Vesting schedule was removed", ); } @@ -92,7 +92,7 @@ benchmarks! { add_locks::(&caller, l as u8); add_vesting_schedule::(&caller)?; // At block 20, everything is unvested. - System::::set_block_number(20.into()); + System::::set_block_number(20u32.into()); assert_eq!( Vesting::::vesting_balance(&caller), Some(BalanceOf::::zero()), @@ -120,7 +120,7 @@ benchmarks! { System::::set_block_number(T::BlockNumber::zero()); assert_eq!( Vesting::::vesting_balance(&other), - Some(100.into()), + Some(100u32.into()), "Vesting schedule not added", ); @@ -130,7 +130,7 @@ benchmarks! { // Nothing happened since everything is still vested. assert_eq!( Vesting::::vesting_balance(&other), - Some(100.into()), + Some(100u32.into()), "Vesting schedule was removed", ); } @@ -144,7 +144,7 @@ benchmarks! { add_locks::(&other, l as u8); add_vesting_schedule::(&other)?; // At block 20, everything is unvested. - System::::set_block_number(20.into()); + System::::set_block_number(20u32.into()); assert_eq!( Vesting::::vesting_balance(&other), Some(BalanceOf::::zero()), @@ -176,8 +176,8 @@ benchmarks! { let vesting_schedule = VestingInfo { locked: transfer_amount, - per_block: 10.into(), - starting_block: 1.into(), + per_block: 10u32.into(), + starting_block: 1u32.into(), }; }: _(RawOrigin::Signed(caller), target_lookup, vesting_schedule) verify { @@ -208,8 +208,8 @@ benchmarks! { let vesting_schedule = VestingInfo { locked: transfer_amount, - per_block: 10.into(), - starting_block: 1.into(), + per_block: 10u32.into(), + starting_block: 1u32.into(), }; }: _(RawOrigin::Root, source_lookup, target_lookup, vesting_schedule) verify { diff --git a/primitives/allocator/Cargo.toml b/primitives/allocator/Cargo.toml index 93991a4aeb2ab..688baa7497390 100644 --- a/primitives/allocator/Cargo.toml +++ b/primitives/allocator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-allocator" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/api/Cargo.toml b/primitives/api/Cargo.toml index a3c480e92135f..301719747a142 100644 --- a/primitives/api/Cargo.toml +++ b/primitives/api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-api" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/api/proc-macro/Cargo.toml b/primitives/api/proc-macro/Cargo.toml index 9b1661cf5ef60..1c67a3f38954b 100644 --- a/primitives/api/proc-macro/Cargo.toml +++ b/primitives/api/proc-macro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-api-proc-macro" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/api/test/Cargo.toml b/primitives/api/test/Cargo.toml index 867cdd6e57e48..f91e7208335d0 100644 --- a/primitives/api/test/Cargo.toml +++ b/primitives/api/test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-api-test" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" @@ -21,7 +21,7 @@ sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common sc-block-builder = { version = "0.8.0", path = "../../../client/block-builder" } codec = { package = "parity-scale-codec", version = "1.3.1" } sp-state-machine = { version = "0.8.0", path = "../../../primitives/state-machine" } -trybuild = "1.0.17" +trybuild = "1.0.38" rustversion = "1.0.0" [dev-dependencies] diff --git a/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr b/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr index 851d2b8a4b652..fcda69533e3ad 100644 --- a/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr +++ b/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr @@ -23,8 +23,8 @@ error[E0053]: method `Api_test_runtime_api_impl` has an incompatible type for tr 17 | sp_api::impl_runtime_apis! { | ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found struct `std::string::String` | - = note: expected fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::BlockId<__SR_API_BLOCK__>, sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ExecutionContext, std::option::Option, std::vec::Vec<_>) -> std::result::Result<_, _>` - found fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::BlockId<__SR_API_BLOCK__>, sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ExecutionContext, std::option::Option, std::vec::Vec<_>) -> std::result::Result<_, _>` + = note: expected fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option, Vec<_>) -> std::result::Result<_, _>` + found fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option, Vec<_>) -> std::result::Result<_, _>` = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) error[E0308]: mismatched types diff --git a/primitives/api/test/tests/ui/mock_only_one_error_type.stderr b/primitives/api/test/tests/ui/mock_only_one_error_type.stderr index 65d05e83a7f69..bb8442e0334cd 100644 --- a/primitives/api/test/tests/ui/mock_only_one_error_type.stderr +++ b/primitives/api/test/tests/ui/mock_only_one_error_type.stderr @@ -4,7 +4,7 @@ error: Error type can not change between runtime apis 23 | type Error = u64; | ^^^^ -error[E0277]: the trait bound `u32: std::convert::From` is not satisfied +error[E0277]: the trait bound `u32: From` is not satisfied --> $DIR/mock_only_one_error_type.rs:15:1 | 15 | / sp_api::mock_impl_runtime_apis! { @@ -14,17 +14,17 @@ error[E0277]: the trait bound `u32: std::convert::From` is ... | 26 | | } 27 | | } - | |_^ the trait `std::convert::From` is not implemented for `u32` - | - ::: $WORKSPACE/primitives/api/src/lib.rs:350:35 + | |_^ the trait `From` is not implemented for `u32` | -350 | type Error: std::fmt::Debug + From; - | ------------ required by this bound in `sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ApiErrorExt` + ::: $WORKSPACE/primitives/api/src/lib.rs + | + | type Error: std::fmt::Debug + From; + | ------------ required by this bound in `ApiErrorExt` | = help: the following implementations were found: - > - > - > - > + > + > + > + > and 18 others = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/primitives/api/test/tests/ui/mock_only_self_reference.stderr b/primitives/api/test/tests/ui/mock_only_self_reference.stderr index ed5b64144a6f6..73cf936103798 100644 --- a/primitives/api/test/tests/ui/mock_only_self_reference.stderr +++ b/primitives/api/test/tests/ui/mock_only_self_reference.stderr @@ -24,8 +24,8 @@ error[E0053]: method `Api_test_runtime_api_impl` has an incompatible type for tr 12 | sp_api::mock_impl_runtime_apis! { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found `()` | - = note: expected fn pointer `fn(&MockApi, &sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::BlockId, substrate_test_runtime_client::substrate_test_runtime::Extrinsic>>, sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ExecutionContext, std::option::Option, std::vec::Vec<_>) -> std::result::Result<_, _>` - found fn pointer `fn(&MockApi, &sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::BlockId, substrate_test_runtime_client::substrate_test_runtime::Extrinsic>>, sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ExecutionContext, std::option::Option<()>, std::vec::Vec<_>) -> std::result::Result<_, _>` + = note: expected fn pointer `fn(&MockApi, &BlockId, Extrinsic>>, ExecutionContext, Option, Vec<_>) -> std::result::Result<_, _>` + found fn pointer `fn(&MockApi, &BlockId, Extrinsic>>, ExecutionContext, Option<()>, Vec<_>) -> std::result::Result<_, _>` = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) error[E0053]: method `Api_test2_runtime_api_impl` has an incompatible type for trait @@ -42,6 +42,6 @@ error[E0053]: method `Api_test2_runtime_api_impl` has an incompatible type for t 12 | sp_api::mock_impl_runtime_apis! { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found `()` | - = note: expected fn pointer `fn(&MockApi, &sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::BlockId, substrate_test_runtime_client::substrate_test_runtime::Extrinsic>>, sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ExecutionContext, std::option::Option, std::vec::Vec<_>) -> std::result::Result<_, _>` - found fn pointer `fn(&MockApi, &sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::BlockId, substrate_test_runtime_client::substrate_test_runtime::Extrinsic>>, sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ExecutionContext, std::option::Option<()>, std::vec::Vec<_>) -> std::result::Result<_, _>` + = note: expected fn pointer `fn(&MockApi, &BlockId, Extrinsic>>, ExecutionContext, Option, Vec<_>) -> std::result::Result<_, _>` + found fn pointer `fn(&MockApi, &BlockId, Extrinsic>>, ExecutionContext, Option<()>, Vec<_>) -> std::result::Result<_, _>` = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr b/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr index c3e4850036090..71f12b415a2b5 100644 --- a/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr +++ b/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr @@ -23,8 +23,8 @@ error[E0053]: method `Api_test_runtime_api_impl` has an incompatible type for tr 17 | sp_api::impl_runtime_apis! { | ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found `&u64` | - = note: expected fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::BlockId<__SR_API_BLOCK__>, sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ExecutionContext, std::option::Option, std::vec::Vec<_>) -> std::result::Result<_, _>` - found fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::BlockId<__SR_API_BLOCK__>, sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ExecutionContext, std::option::Option<&u64>, std::vec::Vec<_>) -> std::result::Result<_, _>` + = note: expected fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option, Vec<_>) -> std::result::Result<_, _>` + found fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<&u64>, Vec<_>) -> std::result::Result<_, _>` = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) error[E0308]: mismatched types diff --git a/primitives/application-crypto/Cargo.toml b/primitives/application-crypto/Cargo.toml index 2ab6823759572..61067eb51cc69 100644 --- a/primitives/application-crypto/Cargo.toml +++ b/primitives/application-crypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-application-crypto" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" description = "Provides facilities for generating application specific crypto wrapper types." diff --git a/primitives/arithmetic/Cargo.toml b/primitives/arithmetic/Cargo.toml index b8e482491a7d4..8afed59c948c3 100644 --- a/primitives/arithmetic/Cargo.toml +++ b/primitives/arithmetic/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-arithmetic" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/arithmetic/src/fixed_point.rs b/primitives/arithmetic/src/fixed_point.rs index 59c237efb6260..ba1484898c110 100644 --- a/primitives/arithmetic/src/fixed_point.rs +++ b/primitives/arithmetic/src/fixed_point.rs @@ -536,10 +536,10 @@ macro_rules! implement_fixed { } } - impl From

for $name { + impl From

for $name where P::Inner: FixedPointOperand { fn from(p: P) -> Self { - let accuracy = P::ACCURACY.saturated_into(); - let value = p.deconstruct().saturated_into(); + let accuracy = P::ACCURACY; + let value = p.deconstruct(); $name::saturating_from_rational(value, accuracy) } } diff --git a/primitives/authority-discovery/Cargo.toml b/primitives/authority-discovery/Cargo.toml index ae373f1866ff6..b47d489deebd0 100644 --- a/primitives/authority-discovery/Cargo.toml +++ b/primitives/authority-discovery/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-authority-discovery" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] description = "Authority discovery primitives" edition = "2018" diff --git a/primitives/authorship/Cargo.toml b/primitives/authorship/Cargo.toml index b6f463029077f..b97a9d4f4554b 100644 --- a/primitives/authorship/Cargo.toml +++ b/primitives/authorship/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-authorship" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] description = "Authorship primitives" edition = "2018" diff --git a/primitives/block-builder/Cargo.toml b/primitives/block-builder/Cargo.toml index 767307c2a842a..019fa45184257 100644 --- a/primitives/block-builder/Cargo.toml +++ b/primitives/block-builder/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-block-builder" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/blockchain/Cargo.toml b/primitives/blockchain/Cargo.toml index 79c0b56616fac..3cfcee9afb8c9 100644 --- a/primitives/blockchain/Cargo.toml +++ b/primitives/blockchain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-blockchain" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/chain-spec/Cargo.toml b/primitives/chain-spec/Cargo.toml index a94bd8ad0139e..52747dca94c91 100644 --- a/primitives/chain-spec/Cargo.toml +++ b/primitives/chain-spec/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-chain-spec" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/consensus/aura/Cargo.toml b/primitives/consensus/aura/Cargo.toml index 7ef5f67350baa..89f83ddcb6a6c 100644 --- a/primitives/consensus/aura/Cargo.toml +++ b/primitives/consensus/aura/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-consensus-aura" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] description = "Primitives for Aura consensus" edition = "2018" diff --git a/primitives/consensus/babe/Cargo.toml b/primitives/consensus/babe/Cargo.toml index 662f2ded506a5..646e7e89a79af 100644 --- a/primitives/consensus/babe/Cargo.toml +++ b/primitives/consensus/babe/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-consensus-babe" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] description = "Primitives for BABE consensus" edition = "2018" diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml index a6f8c01928d96..7df251c3c3cdb 100644 --- a/primitives/consensus/common/Cargo.toml +++ b/primitives/consensus/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-consensus" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/consensus/pow/Cargo.toml b/primitives/consensus/pow/Cargo.toml index cbcea886a7095..3c8ce89a800ab 100644 --- a/primitives/consensus/pow/Cargo.toml +++ b/primitives/consensus/pow/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-consensus-pow" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] description = "Primitives for Aura consensus" edition = "2018" diff --git a/primitives/consensus/slots/Cargo.toml b/primitives/consensus/slots/Cargo.toml index e605d585b7229..60e8020aa7e1f 100644 --- a/primitives/consensus/slots/Cargo.toml +++ b/primitives/consensus/slots/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-consensus-slots" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] description = "Primitives for slots-based consensus" edition = "2018" diff --git a/primitives/consensus/vrf/Cargo.toml b/primitives/consensus/vrf/Cargo.toml index d0b7d2e2f7aa8..58daab488c39b 100644 --- a/primitives/consensus/vrf/Cargo.toml +++ b/primitives/consensus/vrf/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-consensus-vrf" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] description = "Primitives for VRF based consensus" edition = "2018" diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml index a58bb66362808..59a41a0a03046 100644 --- a/primitives/core/Cargo.toml +++ b/primitives/core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-core" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/database/Cargo.toml b/primitives/database/Cargo.toml index cc3fe7cd1b474..30822cd1abefe 100644 --- a/primitives/database/Cargo.toml +++ b/primitives/database/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-database" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/debug-derive/Cargo.toml b/primitives/debug-derive/Cargo.toml index 10164553f857c..5a2c3c1db7035 100644 --- a/primitives/debug-derive/Cargo.toml +++ b/primitives/debug-derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-debug-derive" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/externalities/Cargo.toml b/primitives/externalities/Cargo.toml index f7211779634d9..ca03fe3b735d6 100644 --- a/primitives/externalities/Cargo.toml +++ b/primitives/externalities/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-externalities" -version = "0.8.0" +version = "0.8.1" license = "Apache-2.0" authors = ["Parity Technologies "] edition = "2018" @@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] sp-storage = { version = "2.0.0", path = "../storage", default-features = false } sp-std = { version = "2.0.0", path = "../std", default-features = false } -environmental = { version = "1.1.1", default-features = false } +environmental = { version = "1.1.2", default-features = false } codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false } [features] @@ -24,6 +24,6 @@ default = ["std"] std = [ "codec/std", "environmental/std", - "sp-std/std", - "sp-storage/std", + "sp-std/std", + "sp-storage/std", ] diff --git a/primitives/finality-grandpa/Cargo.toml b/primitives/finality-grandpa/Cargo.toml index 53548d378c4c8..4d0a8167d8f48 100644 --- a/primitives/finality-grandpa/Cargo.toml +++ b/primitives/finality-grandpa/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-finality-grandpa" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/finality-tracker/Cargo.toml b/primitives/finality-tracker/Cargo.toml index 756b6d91e296e..3eafef7c7111d 100644 --- a/primitives/finality-tracker/Cargo.toml +++ b/primitives/finality-tracker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-finality-tracker" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/inherents/Cargo.toml b/primitives/inherents/Cargo.toml index 10c66b73aec1a..b0465842f32a0 100644 --- a/primitives/inherents/Cargo.toml +++ b/primitives/inherents/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-inherents" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/io/Cargo.toml b/primitives/io/Cargo.toml index 70a78f99d5dae..98d63688addbd 100644 --- a/primitives/io/Cargo.toml +++ b/primitives/io/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-io" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/keyring/Cargo.toml b/primitives/keyring/Cargo.toml index be4db5834458e..e3e927f70bb82 100644 --- a/primitives/keyring/Cargo.toml +++ b/primitives/keyring/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-keyring" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/npos-elections/Cargo.toml b/primitives/npos-elections/Cargo.toml index 4a66743028d19..6994b50f5234e 100644 --- a/primitives/npos-elections/Cargo.toml +++ b/primitives/npos-elections/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-npos-elections" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/npos-elections/compact/Cargo.toml b/primitives/npos-elections/compact/Cargo.toml index 1873f8fa16057..26d5ca1744f89 100644 --- a/primitives/npos-elections/compact/Cargo.toml +++ b/primitives/npos-elections/compact/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-npos-elections-compact" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/npos-elections/src/mock.rs b/primitives/npos-elections/src/mock.rs index 9b25f6f5f2e37..0151f5ca83a47 100644 --- a/primitives/npos-elections/src/mock.rs +++ b/primitives/npos-elections/src/mock.rs @@ -313,8 +313,8 @@ pub(crate) fn create_stake_of(stakes: &[(AccountId, VoteWeight)]) pub fn check_assignments_sum(assignments: Vec>) { for Assignment { distribution, .. } in assignments { let mut sum: u128 = Zero::zero(); - distribution.iter().for_each(|(_, p)| sum += p.deconstruct().saturated_into()); - assert_eq_error_rate!(sum, T::ACCURACY.saturated_into(), 1); + distribution.iter().for_each(|(_, p)| sum += p.deconstruct().saturated_into::()); + assert_eq_error_rate!(sum, T::ACCURACY.saturated_into::(), 1); } } diff --git a/primitives/offchain/Cargo.toml b/primitives/offchain/Cargo.toml index 02041d5c678ef..6678ac32ea67b 100644 --- a/primitives/offchain/Cargo.toml +++ b/primitives/offchain/Cargo.toml @@ -1,7 +1,7 @@ [package] description = "Substrate offchain workers primitives" name = "sp-offchain" -version = "2.0.0" +version = "2.0.1" license = "Apache-2.0" authors = ["Parity Technologies "] edition = "2018" diff --git a/primitives/panic-handler/Cargo.toml b/primitives/panic-handler/Cargo.toml index acf454b960a7c..f594ba7e5f7b6 100644 --- a/primitives/panic-handler/Cargo.toml +++ b/primitives/panic-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-panic-handler" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/rpc/Cargo.toml b/primitives/rpc/Cargo.toml index 0c9fe8ebd6667..3644894362781 100644 --- a/primitives/rpc/Cargo.toml +++ b/primitives/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-rpc" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/runtime-interface/Cargo.toml b/primitives/runtime-interface/Cargo.toml index bc36098f05a54..74871a3ce6c1f 100644 --- a/primitives/runtime-interface/Cargo.toml +++ b/primitives/runtime-interface/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-runtime-interface" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" @@ -30,7 +30,7 @@ sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine" sp-core = { version = "2.0.0", path = "../core" } sp-io = { version = "2.0.0", path = "../io" } rustversion = "1.0.0" -trybuild = "1.0.23" +trybuild = "1.0.38" [features] default = [ "std" ] diff --git a/primitives/runtime-interface/proc-macro/Cargo.toml b/primitives/runtime-interface/proc-macro/Cargo.toml index 8358d2170575f..2011bdfd62e22 100644 --- a/primitives/runtime-interface/proc-macro/Cargo.toml +++ b/primitives/runtime-interface/proc-macro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-runtime-interface-proc-macro" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml index 6579a17c77fec..494de46665b5e 100644 --- a/primitives/runtime/Cargo.toml +++ b/primitives/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-runtime" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/sandbox/Cargo.toml b/primitives/sandbox/Cargo.toml index 70ae56fb48108..4a4dd2f28a41f 100755 --- a/primitives/sandbox/Cargo.toml +++ b/primitives/sandbox/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-sandbox" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/serializer/Cargo.toml b/primitives/serializer/Cargo.toml index 5a4514db86da9..670d8736400bf 100644 --- a/primitives/serializer/Cargo.toml +++ b/primitives/serializer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-serializer" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/session/Cargo.toml b/primitives/session/Cargo.toml index 4fccce6283142..024a9fad6e70a 100644 --- a/primitives/session/Cargo.toml +++ b/primitives/session/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-session" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/staking/Cargo.toml b/primitives/staking/Cargo.toml index 315d5acc49dae..2fe36db3871b1 100644 --- a/primitives/staking/Cargo.toml +++ b/primitives/staking/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-staking" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/state-machine/Cargo.toml b/primitives/state-machine/Cargo.toml index 8940488319931..7f032f139fb7c 100644 --- a/primitives/state-machine/Cargo.toml +++ b/primitives/state-machine/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-state-machine" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] description = "Substrate State Machine" edition = "2018" diff --git a/primitives/std/Cargo.toml b/primitives/std/Cargo.toml index 5b988cabc150a..91edfc9732639 100644 --- a/primitives/std/Cargo.toml +++ b/primitives/std/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-std" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/storage/Cargo.toml b/primitives/storage/Cargo.toml index 4f14ba38f2147..bc593bca0a4e1 100644 --- a/primitives/storage/Cargo.toml +++ b/primitives/storage/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-storage" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" description = "Storage related primitives" diff --git a/primitives/timestamp/Cargo.toml b/primitives/timestamp/Cargo.toml index 79dae29102220..88406750b79a9 100644 --- a/primitives/timestamp/Cargo.toml +++ b/primitives/timestamp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-timestamp" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/tracing/Cargo.toml b/primitives/tracing/Cargo.toml index a1d89af58c019..f210eca78e5b5 100644 --- a/primitives/tracing/Cargo.toml +++ b/primitives/tracing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-tracing" -version = "2.0.0" +version = "2.0.1" license = "Apache-2.0" authors = ["Parity Technologies "] edition = "2018" diff --git a/primitives/transaction-pool/Cargo.toml b/primitives/transaction-pool/Cargo.toml index 57ba3a28ac3c1..bed2aa1ab7797 100644 --- a/primitives/transaction-pool/Cargo.toml +++ b/primitives/transaction-pool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-transaction-pool" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/trie/Cargo.toml b/primitives/trie/Cargo.toml index 7b7629bbf9bb2..bf552c30fe982 100644 --- a/primitives/trie/Cargo.toml +++ b/primitives/trie/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-trie" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] description = "Patricia trie stuff using a parity-scale-codec node format" repository = "https://github.com/paritytech/substrate/" diff --git a/primitives/utils/Cargo.toml b/primitives/utils/Cargo.toml index 80329d2e59ea9..9be3e9a12692c 100644 --- a/primitives/utils/Cargo.toml +++ b/primitives/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-utils" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/version/Cargo.toml b/primitives/version/Cargo.toml index e9475846246ee..5b369c4244554 100644 --- a/primitives/version/Cargo.toml +++ b/primitives/version/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-version" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/primitives/wasm-interface/Cargo.toml b/primitives/wasm-interface/Cargo.toml index a85b6cd1d118a..c106aae7f3c05 100644 --- a/primitives/wasm-interface/Cargo.toml +++ b/primitives/wasm-interface/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sp-wasm-interface" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml index ddadc2cb7177d..1b15c34401feb 100644 --- a/test-utils/Cargo.toml +++ b/test-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "substrate-test-utils" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" @@ -18,4 +18,4 @@ tokio = { version = "0.2.13", features = ["macros"] } [dev-dependencies] sc-service = { version = "0.8.0", path = "../client/service" } -trybuild = { version = "1.0", features = ["diff"] } +trybuild = { version = "1.0.38", features = [ "diff" ] } diff --git a/test-utils/client/Cargo.toml b/test-utils/client/Cargo.toml index 91602b0b27c49..fdedfc3e97fc3 100644 --- a/test-utils/client/Cargo.toml +++ b/test-utils/client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "substrate-test-client" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/test-utils/client/src/client_ext.rs b/test-utils/client/src/client_ext.rs index a74bd3258ef0f..43e89c8f10bc1 100644 --- a/test-utils/client/src/client_ext.rs +++ b/test-utils/client/src/client_ext.rs @@ -79,7 +79,7 @@ impl ClientExt for Client } fn genesis_hash(&self) -> ::Hash { - self.block_hash(0.into()).unwrap().unwrap() + self.block_hash(0u32.into()).unwrap().unwrap() } } diff --git a/test-utils/derive/Cargo.toml b/test-utils/derive/Cargo.toml index 263bfd3537340..8a1dce4987dc4 100644 --- a/test-utils/derive/Cargo.toml +++ b/test-utils/derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "substrate-test-utils-derive" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/utils/browser/Cargo.toml b/utils/browser/Cargo.toml index 06e626ef65ffa..8ac2976403994 100644 --- a/utils/browser/Cargo.toml +++ b/utils/browser/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "substrate-browser-utils" -version = "0.8.0" +version = "0.8.1" authors = ["Parity Technologies "] description = "Utilities for creating a browser light-client." edition = "2018" diff --git a/utils/build-script-utils/Cargo.toml b/utils/build-script-utils/Cargo.toml index 30c8a4c52b657..f82ee7487d9fa 100644 --- a/utils/build-script-utils/Cargo.toml +++ b/utils/build-script-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "substrate-build-script-utils" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/utils/fork-tree/Cargo.toml b/utils/fork-tree/Cargo.toml index 23662722a1f6c..6e9318e1ca0f3 100644 --- a/utils/fork-tree/Cargo.toml +++ b/utils/fork-tree/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fork-tree" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/utils/frame/benchmarking-cli/Cargo.toml b/utils/frame/benchmarking-cli/Cargo.toml index ebaab2b1c58b5..f84e86395e6c3 100644 --- a/utils/frame/benchmarking-cli/Cargo.toml +++ b/utils/frame/benchmarking-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "frame-benchmarking-cli" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/utils/frame/frame-utilities-cli/Cargo.toml b/utils/frame/frame-utilities-cli/Cargo.toml index 0e39f35512541..4f0030b021820 100644 --- a/utils/frame/frame-utilities-cli/Cargo.toml +++ b/utils/frame/frame-utilities-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "substrate-frame-cli" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/utils/frame/rpc/support/Cargo.toml b/utils/frame/rpc/support/Cargo.toml index 2541ed0cf655f..175141e10a1ff 100644 --- a/utils/frame/rpc/support/Cargo.toml +++ b/utils/frame/rpc/support/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "substrate-frame-rpc-support" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies ", "Andrew Dirksen "] edition = "2018" license = "Apache-2.0" diff --git a/utils/frame/rpc/system/Cargo.toml b/utils/frame/rpc/system/Cargo.toml index 515ff93251522..8650302d4cb95 100644 --- a/utils/frame/rpc/system/Cargo.toml +++ b/utils/frame/rpc/system/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "substrate-frame-rpc-system" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] edition = "2018" license = "Apache-2.0" diff --git a/utils/prometheus/Cargo.toml b/utils/prometheus/Cargo.toml index 8fdbbc6124f58..d7ff885bdb3b5 100644 --- a/utils/prometheus/Cargo.toml +++ b/utils/prometheus/Cargo.toml @@ -1,7 +1,7 @@ [package] description = "Endpoint to expose Prometheus metrics" name = "substrate-prometheus-endpoint" -version = "0.8.0" +version = "0.8.1" license = "Apache-2.0" authors = ["Parity Technologies "] edition = "2018" diff --git a/utils/wasm-builder/Cargo.toml b/utils/wasm-builder/Cargo.toml index de0f11e84670d..e9dd1a97b89e4 100644 --- a/utils/wasm-builder/Cargo.toml +++ b/utils/wasm-builder/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "substrate-wasm-builder" -version = "2.0.0" +version = "2.0.1" authors = ["Parity Technologies "] description = "Utility for building WASM binaries" edition = "2018"