From 46bc9af1b3d01b9cdf289572f0f3d88c78e1a066 Mon Sep 17 00:00:00 2001 From: Qinxuan Chen Date: Mon, 21 Mar 2022 16:37:59 +0800 Subject: [PATCH] pallet-whitelist: add sp-api/std to std feature to fix compile error (#11077) Signed-off-by: koushiro --- substrate/frame/whitelist/Cargo.toml | 11 ++++++----- substrate/frame/whitelist/src/benchmarking.rs | 7 ++++--- substrate/frame/whitelist/src/lib.rs | 17 +++++++---------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/substrate/frame/whitelist/Cargo.toml b/substrate/frame/whitelist/Cargo.toml index 6bc43ff961..5f414e5d32 100644 --- a/substrate/frame/whitelist/Cargo.toml +++ b/substrate/frame/whitelist/Cargo.toml @@ -17,25 +17,26 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.0", default-features = false, features = ["derive"] } sp-api = { version = "4.0.0-dev", default-features = false, path = "../../primitives/api" } sp-std = { version = "4.0.0", default-features = false, path = "../../primitives/std" } -sp-io = { version = "6.0.0", default-features = false, path = "../../primitives/io" } sp-runtime = { version = "6.0.0", default-features = false, path = "../../primitives/runtime" } + frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" } frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" } frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true } [dev-dependencies] sp-core = { version = "6.0.0", path = "../../primitives/core" } -pallet-preimage = { version = "4.0.0-dev", path = "../preimage/" } -pallet-balances = { version = "4.0.0-dev", path = "../balances/" } +sp-io = { version = "6.0.0", path = "../../primitives/io" } +pallet-balances = { version = "4.0.0-dev", path = "../balances" } +pallet-preimage = { version = "4.0.0-dev", path = "../preimage" } [features] default = ["std"] std = [ "codec/std", "scale-info/std", - "sp-std/std", - "sp-io/std", + "sp-api/std", "sp-runtime/std", + "sp-std/std", "frame-support/std", "frame-system/std", ] diff --git a/substrate/frame/whitelist/src/benchmarking.rs b/substrate/frame/whitelist/src/benchmarking.rs index c51ea0a0a3..50809ddef7 100644 --- a/substrate/frame/whitelist/src/benchmarking.rs +++ b/substrate/frame/whitelist/src/benchmarking.rs @@ -20,10 +20,11 @@ #![cfg(feature = "runtime-benchmarks")] use super::*; -use core::convert::TryInto; use frame_benchmarking::benchmarks; -use frame_support::{ensure, traits::PreimageRecipient}; -use sp_runtime::traits::Hash; +use frame_support::{ + ensure, + traits::{EnsureOrigin, Get, PreimageRecipient}, +}; #[cfg(test)] use crate::Pallet as Whitelist; diff --git a/substrate/frame/whitelist/src/lib.rs b/substrate/frame/whitelist/src/lib.rs index 9f20386da8..c2de16964a 100644 --- a/substrate/frame/whitelist/src/lib.rs +++ b/substrate/frame/whitelist/src/lib.rs @@ -39,21 +39,15 @@ mod mock; mod tests; pub mod weights; -use sp_runtime::traits::Dispatchable; -use sp_std::prelude::*; - use codec::{Decode, DecodeLimit, Encode, FullCodec, MaxEncodedLen}; use frame_support::{ ensure, traits::{PreimageProvider, PreimageRecipient}, - weights::{GetDispatchInfo, PostDispatchInfo}, + weights::{GetDispatchInfo, PostDispatchInfo, Weight}, }; use scale_info::TypeInfo; -use sp_api::HashT; -use weights::WeightInfo; - -use frame_support::pallet_prelude::*; -use frame_system::pallet_prelude::*; +use sp_runtime::traits::{Dispatchable, Hash}; +use sp_std::prelude::*; pub use pallet::*; @@ -66,6 +60,9 @@ pub struct Preimage { #[frame_support::pallet] pub mod pallet { use super::*; + use crate::weights::WeightInfo; + use frame_support::pallet_prelude::*; + use frame_system::pallet_prelude::*; #[pallet::config] pub trait Config: frame_system::Config { @@ -92,7 +89,7 @@ pub mod pallet { type PreimageProvider: PreimageProvider + PreimageRecipient; /// The weight information for this pallet. - type WeightInfo: weights::WeightInfo; + type WeightInfo: WeightInfo; } #[pallet::pallet]