From 615381b75d16f34dfd0ff50f31eece59d39dc7ab Mon Sep 17 00:00:00 2001 From: bgallois <benjamin@gallois.cc> Date: Fri, 10 May 2024 20:05:47 +0200 Subject: [PATCH] fix clippy --- Cargo.lock | 445 +----------------------- Cargo.toml | 2 +- client/distance/src/lib.rs | 2 - node/src/command.rs | 4 +- pallets/authority-members/src/tests.rs | 1 - pallets/identity/src/tests.rs | 2 +- pallets/identity/src/types.rs | 4 +- pallets/oneshot-account/src/mock.rs | 1 - pallets/smith-members/src/types.rs | 9 +- pallets/universal-dividend/src/types.rs | 3 +- primitives/distance/src/lib.rs | 3 +- runtime/g1/src/lib.rs | 4 +- runtime/g1/src/parameters.rs | 3 +- runtime/gdev/src/lib.rs | 4 +- runtime/gdev/src/parameters.rs | 2 - runtime/gdev/tests/integration_tests.rs | 2 +- runtime/gtest/src/lib.rs | 4 +- runtime/gtest/src/parameters.rs | 2 - 18 files changed, 20 insertions(+), 477 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 60a9fce2f..5f32b8668 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1102,12 +1102,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" -[[package]] -name = "bytecount" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" - [[package]] name = "bytemuck" version = "1.15.0" @@ -1733,15 +1727,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-deque" version = "0.8.5" @@ -1834,76 +1819,6 @@ dependencies = [ "cipher 0.4.4", ] -[[package]] -name = "ctrlc" -version = "3.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" -dependencies = [ - "nix 0.28.0", - "windows-sys 0.52.0", -] - -[[package]] -name = "cucumber" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5063d8cf24f4998ad01cac265da468a15ca682a8f4f826d50e661964e8d9b8" -dependencies = [ - "anyhow", - "async-trait", - "clap", - "console", - "cucumber-codegen", - "cucumber-expressions", - "derive_more", - "drain_filter_polyfill", - "either", - "futures 0.3.30", - "gherkin", - "globwalk", - "humantime", - "inventory", - "itertools 0.12.1", - "lazy-regex", - "linked-hash-map", - "once_cell", - "pin-project", - "regex", - "sealed", - "smart-default", -] - -[[package]] -name = "cucumber-codegen" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01091e28d1f566c8b31b67948399d2efd6c0a8f6228a9785519ed7b73f7f0aef" -dependencies = [ - "cucumber-expressions", - "inflections", - "itertools 0.12.1", - "proc-macro2", - "quote", - "regex", - "syn 2.0.61", - "synthez", -] - -[[package]] -name = "cucumber-expressions" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d794fed319eea24246fb5f57632f7ae38d61195817b7eb659455aa5bdd7c1810" -dependencies = [ - "derive_more", - "either", - "nom", - "nom_locate", - "regex", - "regex-syntax 0.7.5", -] - [[package]] name = "curve25519-dalek" version = "3.2.0" @@ -2360,12 +2275,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" -[[package]] -name = "drain_filter_polyfill" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "669a445ee724c5c69b1b06fe0b63e70a1c84bc9bb7d9696cd4f4e3ec45050408" - [[package]] name = "dtoa" version = "1.0.9" @@ -2462,30 +2371,6 @@ dependencies = [ "substrate-frame-rpc-system", ] -[[package]] -name = "duniter-end2end-tests" -version = "1.0.0" -dependencies = [ - "anyhow", - "clap", - "ctrlc", - "cucumber", - "distance-oracle", - "env_logger 0.11.3", - "hex", - "notify", - "notify-debouncer-mini", - "parity-scale-codec", - "portpicker", - "serde_json", - "sp-core 28.0.0 (git+https://github.com/duniter/duniter-polkadot-sdk?branch=duniter-substrate-v1.11.0)", - "sp-core-hashing 15.0.0 (git+https://github.com/duniter/duniter-polkadot-sdk?branch=duniter-substrate-v1.11.0)", - "sp-keyring", - "sp-runtime 31.0.1 (git+https://github.com/duniter/duniter-polkadot-sdk?branch=duniter-substrate-v1.11.0)", - "subxt", - "tokio", -] - [[package]] name = "duniter-live-tests" version = "1.0.0" @@ -2679,15 +2564,6 @@ dependencies = [ "syn 2.0.61", ] -[[package]] -name = "env_filter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" -dependencies = [ - "log", -] - [[package]] name = "env_logger" version = "0.10.2" @@ -2701,16 +2577,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "env_logger" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" -dependencies = [ - "env_filter", - "log", -] - [[package]] name = "environmental" version = "1.1.4" @@ -2878,7 +2744,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866" dependencies = [ - "env_logger 0.10.2", + "env_logger", "log", ] @@ -3266,15 +3132,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - [[package]] name = "funty" version = "2.0.0" @@ -3642,23 +3499,6 @@ dependencies = [ "polyval", ] -[[package]] -name = "gherkin" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20b79820c0df536d1f3a089a2fa958f61cb96ce9e0f3f8f507f5a31179567755" -dependencies = [ - "heck 0.4.1", - "peg", - "quote", - "serde", - "serde_json", - "syn 2.0.61", - "textwrap", - "thiserror", - "typed-builder", -] - [[package]] name = "gimli" version = "0.27.3" @@ -4413,32 +4253,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" -[[package]] -name = "inflections" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a" - -[[package]] -name = "inotify" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" -dependencies = [ - "bitflags 1.3.2", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - [[package]] name = "inout" version = "0.1.3" @@ -4466,12 +4280,6 @@ dependencies = [ "num-traits 0.2.19", ] -[[package]] -name = "inventory" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767" - [[package]] name = "io-lifetimes" version = "1.0.11" @@ -4771,26 +4579,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c33070833c9ee02266356de0c43f723152bd38bd96ddf52c82b3af10c9138b28" -[[package]] -name = "kqueue" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" -dependencies = [ - "kqueue-sys", - "libc", -] - -[[package]] -name = "kqueue-sys" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" -dependencies = [ - "bitflags 1.3.2", - "libc", -] - [[package]] name = "kvdb" version = "0.13.0" @@ -4810,29 +4598,6 @@ dependencies = [ "parking_lot 0.12.2", ] -[[package]] -name = "lazy-regex" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d12be4595afdf58bd19e4a9f4e24187da2a66700786ff660a418e9059937a4c" -dependencies = [ - "lazy-regex-proc_macros", - "once_cell", - "regex", -] - -[[package]] -name = "lazy-regex-proc_macros" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bcd58e6c97a7fcbaffcdc95728b393b8d98933bfadad49ed4097845b57ef0b" -dependencies = [ - "proc-macro2", - "quote", - "regex", - "syn 2.0.61", -] - [[package]] name = "lazy_static" version = "1.4.0" @@ -5683,7 +5448,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.48.0", ] @@ -5963,18 +5727,6 @@ dependencies = [ "libc", ] -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.5.0", - "cfg-if", - "cfg_aliases", - "libc", -] - [[package]] name = "no-std-compat" version = "0.4.1" @@ -6018,17 +5770,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "nom_locate" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e3c83c053b0713da60c5b8de47fe8e494fe3ece5267b2f23090a07a053ba8f3" -dependencies = [ - "bytecount", - "memchr", - "nom", -] - [[package]] name = "nonzero_ext" version = "0.3.0" @@ -6041,35 +5782,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" -[[package]] -name = "notify" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" -dependencies = [ - "bitflags 2.5.0", - "crossbeam-channel", - "filetime", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "log", - "mio", - "walkdir", - "windows-sys 0.48.0", -] - -[[package]] -name = "notify-debouncer-mini" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d40b221972a1fc5ef4d858a2f671fb34c75983eb385463dff3780eeff6a9d43" -dependencies = [ - "log", - "notify", -] - [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -7089,33 +6801,6 @@ dependencies = [ "password-hash", ] -[[package]] -name = "peg" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f76678828272f177ac33b7e2ac2e3e73cc6c1cd1e3e387928aa69562fa51367" -dependencies = [ - "peg-macros", - "peg-runtime", -] - -[[package]] -name = "peg-macros" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "636d60acf97633e48d266d7415a9355d4389cea327a193f87df395d88cd2b14d" -dependencies = [ - "peg-runtime", - "proc-macro2", - "quote", -] - -[[package]] -name = "peg-runtime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9555b1514d2d99d78150d3c799d4c357a3e2c2a8062cd108e93a06d9057629c5" - [[package]] name = "pem" version = "1.1.1" @@ -7394,15 +7079,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" -[[package]] -name = "portpicker" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9" -dependencies = [ - "rand 0.8.5", -] - [[package]] name = "powerfmt" version = "0.2.0" @@ -8040,12 +7716,6 @@ version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - [[package]] name = "regex-syntax" version = "0.8.3" @@ -8180,7 +7850,7 @@ dependencies = [ "log", "netlink-packet-route", "netlink-proto", - "nix 0.24.3", + "nix", "thiserror", "tokio", ] @@ -9759,18 +9429,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "sealed" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4a8caec23b7800fb97971a1c6ae365b6239aaeddfb934d6265f8505e795699d" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 2.0.61", -] - [[package]] name = "sec1" version = "0.7.3" @@ -10128,23 +9786,6 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -[[package]] -name = "smart-default" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.61", -] - -[[package]] -name = "smawk" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" - [[package]] name = "smol" version = "2.0.0" @@ -10633,14 +10274,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "sp-core-hashing" -version = "15.0.0" -source = "git+https://github.com/duniter/duniter-polkadot-sdk?branch=duniter-substrate-v1.11.0#030a7b8fd5ef03e4da466e65ce8fe92e3cff90e4" -dependencies = [ - "sp-crypto-hashing 0.1.0", -] - [[package]] name = "sp-core-hashing" version = "15.0.0" @@ -11808,7 +11441,7 @@ dependencies = [ "serde", "serde_json", "sp-core 28.0.0 (git+https://github.com/duniter/duniter-polkadot-sdk?branch=duniter-substrate-v1.9.0)", - "sp-core-hashing 15.0.0 (git+https://github.com/duniter/duniter-polkadot-sdk?branch=duniter-substrate-v1.9.0)", + "sp-core-hashing", "sp-runtime 31.0.1 (git+https://github.com/duniter/duniter-polkadot-sdk?branch=duniter-substrate-v1.9.0)", "subxt-lightclient", "subxt-macro", @@ -11877,7 +11510,7 @@ dependencies = [ "frame-metadata 16.0.0", "parity-scale-codec", "scale-info", - "sp-core-hashing 15.0.0 (git+https://github.com/duniter/duniter-polkadot-sdk?branch=duniter-substrate-v1.9.0)", + "sp-core-hashing", "thiserror", ] @@ -11921,39 +11554,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "synthez" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3d2c2202510a1e186e63e596d9318c91a8cbe85cd1a56a7be0c333e5f59ec8d" -dependencies = [ - "syn 2.0.61", - "synthez-codegen", - "synthez-core", -] - -[[package]] -name = "synthez-codegen" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f724aa6d44b7162f3158a57bccd871a77b39a4aef737e01bcdff41f4772c7746" -dependencies = [ - "syn 2.0.61", - "synthez-core", -] - -[[package]] -name = "synthez-core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78bfa6ec52465e2425fd43ce5bbbe0f0b623964f7c63feb6b10980e816c654ea" -dependencies = [ - "proc-macro2", - "quote", - "sealed", - "syn 2.0.61", -] - [[package]] name = "system-configuration" version = "0.5.1" @@ -12040,17 +11640,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" -[[package]] -name = "textwrap" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" -dependencies = [ - "smawk", - "unicode-linebreak", - "unicode-width", -] - [[package]] name = "thiserror" version = "1.0.60" @@ -12629,26 +12218,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "typed-builder" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe83c85a85875e8c4cb9ce4a890f05b23d38cd0d47647db7895d3d2a79566d2" -dependencies = [ - "typed-builder-macro", -] - -[[package]] -name = "typed-builder-macro" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29a3151c41d0b13e3d011f98adc24434560ef06673a155a6c7f66b9879eecce2" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.61", -] - [[package]] name = "typenum" version = "1.17.0" @@ -12735,12 +12304,6 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "unicode-linebreak" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" - [[package]] name = "unicode-normalization" version = "0.1.22" diff --git a/Cargo.toml b/Cargo.toml index d18e45f3b..97c3d4807 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ resolver = "2" members = [ 'client/distance', 'distance-oracle', - 'end2end-tests', + #'end2end-tests', 'live-tests', 'node', 'pallets/authority-members', diff --git a/client/distance/src/lib.rs b/client/distance/src/lib.rs index a872d6fce..bad7cad51 100644 --- a/client/distance/src/lib.rs +++ b/client/distance/src/lib.rs @@ -14,10 +14,8 @@ // You should have received a copy of the GNU Affero General Public License // along with Substrate-Libre-Currency. If not, see <https://www.gnu.org/licenses/>. -use codec::{Decode, Encode}; use frame_support::pallet_prelude::*; use sc_client_api::{ProvideUncles, StorageKey, StorageProvider}; -use scale_info::TypeInfo; use sp_runtime::{generic::BlockId, traits::Block as BlockT, AccountId32}; use std::path::PathBuf; diff --git a/node/src/command.rs b/node/src/command.rs index 1e802f8f4..3303d99b0 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -329,12 +329,12 @@ pub fn run() -> sc_cli::Result<()> { BenchmarkCmd::Pallet(cmd) => { if cfg!(feature = "runtime-benchmarks") { runner.sync_run(|config| { - cmd.run::<sp_runtime::traits::HashingFor< + cmd.run_with_spec::<sp_runtime::traits::HashingFor< service::runtime_executor::runtime::Block, >, ExtendedHostFunctions< sp_io::SubstrateHostFunctions, <Executor as NativeExecutionDispatch>::ExtendHostFunctions, - >>(config) + >>(Some(config.chain_spec)) }) } else { Err("Benchmarking wasn't enabled when building the node. \ diff --git a/pallets/authority-members/src/tests.rs b/pallets/authority-members/src/tests.rs index ab1218ccd..12e1d13dd 100644 --- a/pallets/authority-members/src/tests.rs +++ b/pallets/authority-members/src/tests.rs @@ -16,7 +16,6 @@ use super::*; use crate::mock::*; -use crate::MemberData; use frame_support::{assert_err, assert_noop, assert_ok}; use frame_system::RawOrigin; use sp_runtime::testing::UintAuthorityId; diff --git a/pallets/identity/src/tests.rs b/pallets/identity/src/tests.rs index 7d8c3abc6..63ae3b5c6 100644 --- a/pallets/identity/src/tests.rs +++ b/pallets/identity/src/tests.rs @@ -21,7 +21,7 @@ use frame_support::dispatch::DispatchResultWithPostInfo; use frame_support::{assert_noop, assert_ok}; use sp_core::sr25519::Pair as KeyPair; use sp_core::Pair; -use sp_runtime::{traits::IdentifyAccount, MultiSignature, MultiSigner}; +use sp_runtime::{MultiSignature, MultiSigner}; type IdtyVal = IdtyValue<u64, AccountId, ()>; diff --git a/pallets/identity/src/types.rs b/pallets/identity/src/types.rs index e3c8b35db..868d8f0a7 100644 --- a/pallets/identity/src/types.rs +++ b/pallets/identity/src/types.rs @@ -17,11 +17,9 @@ //! Various basic types for use in the identity pallet. use codec::{Decode, Encode}; -use core::primitive::str; use frame_support::pallet_prelude::*; use scale_info::TypeInfo; use serde::{Deserialize, Serialize}; -use sp_std::vec::Vec; /// internal events related to identity pub enum IdtyEvent<T: crate::Config> { @@ -80,7 +78,7 @@ pub enum RemovalReason { Deserialize, TypeInfo, )] -pub struct IdtyName(pub Vec<u8>); +pub struct IdtyName(pub sp_std::vec::Vec<u8>); impl From<&str> for IdtyName { fn from(s: &str) -> Self { diff --git a/pallets/oneshot-account/src/mock.rs b/pallets/oneshot-account/src/mock.rs index cddd7e006..a1899df7e 100644 --- a/pallets/oneshot-account/src/mock.rs +++ b/pallets/oneshot-account/src/mock.rs @@ -23,7 +23,6 @@ use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup}, BuildStorage, }; -use sp_std::convert::{TryFrom, TryInto}; type Balance = u64; type Block = frame_system::mocking::MockBlock<Test>; diff --git a/pallets/smith-members/src/types.rs b/pallets/smith-members/src/types.rs index fcccd3468..d19aabf34 100644 --- a/pallets/smith-members/src/types.rs +++ b/pallets/smith-members/src/types.rs @@ -21,7 +21,6 @@ use codec::{Decode, Encode}; use frame_support::pallet_prelude::*; use scale_info::TypeInfo; use sp_staking::SessionIndex; -use sp_std::vec::Vec; /// certification metadata attached to an identity #[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)] @@ -31,9 +30,9 @@ pub struct SmithMeta<IdtyIndex> { /// the session at which the smith will expire (for lack of validation activity) pub expires_on: Option<SessionIndex>, /// the certifications issued to other smiths - pub issued_certs: Vec<IdtyIndex>, + pub issued_certs: sp_std::vec::Vec<IdtyIndex>, /// the certifications received from other smiths - pub received_certs: Vec<IdtyIndex>, + pub received_certs: sp_std::vec::Vec<IdtyIndex>, } /// By default, a smith has the least possible privileges @@ -42,8 +41,8 @@ impl<IdtyIndex> Default for SmithMeta<IdtyIndex> { Self { status: SmithStatus::Excluded, expires_on: None, - issued_certs: Vec::<IdtyIndex>::new(), - received_certs: Vec::<IdtyIndex>::new(), + issued_certs: sp_std::vec::Vec::<IdtyIndex>::new(), + received_certs: sp_std::vec::Vec::<IdtyIndex>::new(), } } } diff --git a/pallets/universal-dividend/src/types.rs b/pallets/universal-dividend/src/types.rs index da94dd22d..b7bc2bed9 100644 --- a/pallets/universal-dividend/src/types.rs +++ b/pallets/universal-dividend/src/types.rs @@ -17,7 +17,6 @@ use codec::{Decode, Encode, Error, Input, MaxEncodedLen, Output}; use core::num::NonZeroU16; use sp_runtime::RuntimeDebug; -use sp_std::vec::Vec; pub type UdIndex = u16; @@ -53,7 +52,7 @@ impl Encode for FirstEligibleUd { self.as_u16().encode_to(dest) } - fn encode(&self) -> Vec<u8> { + fn encode(&self) -> sp_std::vec::Vec<u8> { self.as_u16().encode() } diff --git a/primitives/distance/src/lib.rs b/primitives/distance/src/lib.rs index 5b574aa16..1d4690942 100644 --- a/primitives/distance/src/lib.rs +++ b/primitives/distance/src/lib.rs @@ -24,7 +24,6 @@ use frame_support::pallet_prelude::RuntimeDebug; use scale_info::TypeInfo; use sp_inherents::{InherentData, InherentIdentifier, IsFatalError}; use sp_runtime::Perbill; -use sp_std::vec::Vec; #[cfg(feature = "std")] use std::marker::PhantomData; @@ -32,7 +31,7 @@ pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"distanc0"; #[derive(Clone, Decode, Encode, PartialEq, RuntimeDebug, TypeInfo)] pub struct ComputationResult { - pub distances: Vec<Perbill>, + pub distances: sp_std::vec::Vec<Perbill>, } #[derive(Encode, sp_runtime::RuntimeDebug)] diff --git a/runtime/g1/src/lib.rs b/runtime/g1/src/lib.rs index 3ce455b52..26f8d22fd 100644 --- a/runtime/g1/src/lib.rs +++ b/runtime/g1/src/lib.rs @@ -72,9 +72,7 @@ pub use frame_support::{ construct_runtime, parameter_types, traits::{EqualPrivilegeOnly, KeyOwnerProofSystem, Randomness}, weights::{ - constants::{ - BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND, - }, + constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight}, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, }, StorageValue, diff --git a/runtime/g1/src/parameters.rs b/runtime/g1/src/parameters.rs index e19e471fe..966982a79 100644 --- a/runtime/g1/src/parameters.rs +++ b/runtime/g1/src/parameters.rs @@ -16,10 +16,9 @@ use crate::*; use common_runtime::constants::*; -use common_runtime::{Balance, BlockNumber, Moment}; +use common_runtime::Moment; use frame_support::parameter_types; use frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND; -use sp_arithmetic::Perbill; use sp_runtime::transaction_validity::TransactionPriority; parameter_types! { diff --git a/runtime/gdev/src/lib.rs b/runtime/gdev/src/lib.rs index e77cd6809..436f8a315 100644 --- a/runtime/gdev/src/lib.rs +++ b/runtime/gdev/src/lib.rs @@ -72,9 +72,7 @@ pub use frame_support::{ construct_runtime, parameter_types, traits::{EqualPrivilegeOnly, KeyOwnerProofSystem, Randomness}, weights::{ - constants::{ - BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND, - }, + constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight}, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, }, StorageValue, diff --git a/runtime/gdev/src/parameters.rs b/runtime/gdev/src/parameters.rs index 881e2550a..b78a2de4c 100644 --- a/runtime/gdev/src/parameters.rs +++ b/runtime/gdev/src/parameters.rs @@ -16,11 +16,9 @@ use crate::*; use common_runtime::constants::*; -use common_runtime::{Balance, BlockNumber}; use frame_support::parameter_types; use frame_support::traits::EitherOfDiverse; use frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND; -use sp_arithmetic::Perbill; use sp_runtime::transaction_validity::TransactionPriority; parameter_types! { diff --git a/runtime/gdev/tests/integration_tests.rs b/runtime/gdev/tests/integration_tests.rs index 5b8a8184e..0b52fc7a6 100644 --- a/runtime/gdev/tests/integration_tests.rs +++ b/runtime/gdev/tests/integration_tests.rs @@ -1319,7 +1319,7 @@ fn test_link_account() { Identity::link_account( frame_system::RawOrigin::Signed(alice.clone()).into(), ferdie.clone(), - signature.clone().into() + signature.into() ), pallet_identity::Error::<gdev_runtime::Runtime>::AccountNotExist ); diff --git a/runtime/gtest/src/lib.rs b/runtime/gtest/src/lib.rs index 88e2ebb48..1c7018c55 100644 --- a/runtime/gtest/src/lib.rs +++ b/runtime/gtest/src/lib.rs @@ -71,9 +71,7 @@ pub use frame_support::{ construct_runtime, parameter_types, traits::{EqualPrivilegeOnly, KeyOwnerProofSystem, Randomness}, weights::{ - constants::{ - BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND, - }, + constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight}, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, }, StorageValue, diff --git a/runtime/gtest/src/parameters.rs b/runtime/gtest/src/parameters.rs index 688d3a446..c183502c8 100644 --- a/runtime/gtest/src/parameters.rs +++ b/runtime/gtest/src/parameters.rs @@ -16,10 +16,8 @@ use crate::*; use common_runtime::constants::*; -use common_runtime::{Balance, BlockNumber}; use frame_support::parameter_types; use frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND; -use sp_arithmetic::Perbill; use sp_runtime::transaction_validity::TransactionPriority; parameter_types! { -- GitLab