Change decl_storage! to import the storage traits automatically (#3674)

* decl_storage imports needed traits

* bump impl_version

* Update srml/system/src/lib.rs

Co-Authored-By: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update srml/system/src/lib.rs

Co-Authored-By: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

substrate/node/runtime/src/lib.rs

@@ -85,7 +85,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	// implementation changes and behavior does not, then leave spec_version as
 	// is and increment impl_version.
 	spec_version: 162,
-	impl_version: 162,
+	impl_version: 163,
 	apis: RUNTIME_API_VERSIONS,
 };
 

substrate/srml/assets/src/lib.rs

@@ -130,7 +130,7 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use support::{StorageValue, StorageMap, Parameter, decl_module, decl_event, decl_storage, ensure};
+use support::{Parameter, decl_module, decl_event, decl_storage, ensure};
 use sr_primitives::traits::{Member, SimpleArithmetic, Zero, StaticLookup};
 use system::ensure_signed;
 use sr_primitives::traits::One;

substrate/srml/aura/src/lib.rs

@@ -50,7 +50,7 @@ pub use timestamp;
 use rstd::{result, prelude::*};
 use codec::{Encode, Decode};
 use support::{
-	decl_storage, decl_module, Parameter, storage::StorageValue, traits::{Get, FindAuthor},
+	decl_storage, decl_module, Parameter, traits::{Get, FindAuthor},
 	ConsensusEngineId,
 };
 use sr_primitives::{

substrate/srml/authority-discovery/src/lib.rs

@@ -30,7 +30,7 @@
 
 use app_crypto::RuntimeAppPublic;
 use rstd::prelude::*;
-use support::{decl_module, decl_storage, StorageValue};
+use support::{decl_module, decl_storage};
 
 pub trait Trait: system::Trait + session::Trait + im_online::Trait {}
 

substrate/srml/authorship/src/lib.rs

@@ -22,7 +22,7 @@
 
 use rstd::{result, prelude::*};
 use rstd::collections::btree_set::BTreeSet;
-use support::{decl_module, decl_storage, StorageValue};
+use support::{decl_module, decl_storage};
 use support::traits::{FindAuthor, VerifySeal, Get};
 use support::dispatch::Result as DispatchResult;
 use codec::{Encode, Decode};

substrate/srml/babe/src/lib.rs

@@ -23,7 +23,7 @@
 pub use timestamp;
 
 use rstd::{result, prelude::*};
-use support::{decl_storage, decl_module, StorageValue, StorageMap, traits::FindAuthor, traits::Get};
+use support::{decl_storage, decl_module, traits::FindAuthor, traits::Get};
 use timestamp::OnTimestampSet;
 use sr_primitives::{generic::DigestItem, ConsensusEngineId, Perbill};
 use sr_primitives::traits::{IsMember, SaturatedConversion, Saturating, RandomnessBeacon};

substrate/srml/balances/src/lib.rs

@@ -162,7 +162,7 @@ use rstd::prelude::*;
 use rstd::{cmp, result, mem};
 use codec::{Codec, Encode, Decode};
 use support::{
-	StorageValue, StorageMap, Parameter, decl_event, decl_storage, decl_module,
+	StorageValue, Parameter, decl_event, decl_storage, decl_module,
 	traits::{
 		UpdateBalanceOutcome, Currency, OnFreeBalanceZero, OnUnbalanced,
 		WithdrawReason, WithdrawReasons, LockIdentifier, LockableCurrency, ExistenceRequirement,

substrate/srml/collective/src/lib.rs

@@ -29,7 +29,7 @@ use sr_primitives::traits::{Hash, EnsureOrigin};
 use sr_primitives::weights::SimpleDispatchInfo;
 use support::{
 	dispatch::{Dispatchable, Parameter}, codec::{Encode, Decode},
-	traits::{ChangeMembers, InitializeMembers}, StorageValue, StorageMap, decl_module, decl_event,
+	traits::{ChangeMembers, InitializeMembers}, decl_module, decl_event,
 	decl_storage, ensure,
 };
 use system::{self, ensure_signed, ensure_root};

substrate/srml/contracts/src/lib.rs

@@ -121,7 +121,7 @@ use sr_primitives::{
 };
 use support::dispatch::{Result, Dispatchable};
 use support::{
-	Parameter, StorageMap, StorageValue, decl_module, decl_event, decl_storage, storage::child,
+	Parameter, decl_module, decl_event, decl_storage, storage::child,
 	parameter_types,
 };
 use support::{traits::{OnFreeBalanceZero, OnUnbalanced, Currency, Get}, IsSubType};

substrate/srml/democracy/src/lib.rs

@@ -26,7 +26,7 @@ use sr_primitives::{
 };
 use codec::{Encode, Decode, Input, Output, Error};
 use support::{
-	decl_module, decl_storage, decl_event, ensure, StorageValue, StorageMap, StorageLinkedMap,
+	decl_module, decl_storage, decl_event, ensure,
 	Parameter,
 	traits::{
 		Currency, ReservableCurrency, LockableCurrency, WithdrawReason, LockIdentifier, Get,

substrate/srml/elections-phragmen/src/lib.rs

@@ -79,7 +79,6 @@
 use sr_primitives::{print, traits::{Zero, StaticLookup, Bounded, Convert}};
 use sr_primitives::weights::SimpleDispatchInfo;
 use srml_support::{
-	StorageValue, StorageMap, StorageLinkedMap,
 	decl_storage, decl_event, ensure, decl_module, dispatch,
 	traits::{
 		Currency, Get, LockableCurrency, LockIdentifier, ReservableCurrency, WithdrawReasons,

substrate/srml/elections/src/lib.rs

@@ -28,7 +28,6 @@ use sr_primitives::{
 	print, traits::{Zero, One, StaticLookup, Bounded, Saturating}, weights::SimpleDispatchInfo,
 };
 use support::{
-	StorageValue, StorageMap,
 	dispatch::Result, decl_storage, decl_event, ensure, decl_module,
 	traits::{
 		Currency, ExistenceRequirement, Get, LockableCurrency, LockIdentifier,

substrate/srml/example/src/lib.rs

@@ -254,7 +254,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use rstd::marker::PhantomData;
-use support::{StorageValue, dispatch::Result, decl_module, decl_storage, decl_event};
+use support::{dispatch::Result, decl_module, decl_storage, decl_event};
 use system::{ensure_signed, ensure_root};
 use codec::{Encode, Decode};
 use sr_primitives::{

substrate/srml/finality-tracker/src/lib.rs

@@ -22,7 +22,6 @@ use inherents::{
 	RuntimeString, InherentIdentifier, ProvideInherent,
 	InherentData, MakeFatalError,
 };
-use support::StorageValue;
 use sr_primitives::traits::{One, Zero, SaturatedConversion};
 use rstd::{prelude::*, result, cmp, vec};
 use codec::Decode;

substrate/srml/grandpa/src/lib.rs

@@ -34,7 +34,6 @@ use rstd::prelude::*;
 use codec::{self as codec, Encode, Decode, Error};
 use support::{
 	decl_event, decl_storage, decl_module, dispatch::Result,
-	storage::StorageValue, storage::StorageMap,
 };
 use sr_primitives::{
 	generic::{DigestItem, OpaqueDigestItemId}, traits::Zero,

substrate/srml/im-online/src/lib.rs

@@ -86,8 +86,7 @@ use sr_staking_primitives::{
 	offence::{ReportOffence, Offence, Kind},
 };
 use support::{
-	decl_module, decl_event, decl_storage, print, ensure,
-	Parameter, StorageValue, StorageDoubleMap,
+	decl_module, decl_event, decl_storage, print, ensure, Parameter
 };
 use system::ensure_none;
 use system::offchain::SubmitUnsignedTransaction;

substrate/srml/indices/src/lib.rs

@@ -21,7 +21,7 @@
 
 use rstd::{prelude::*, marker::PhantomData, convert::TryInto};
 use codec::{Encode, Codec};
-use support::{StorageValue, StorageMap, Parameter, decl_module, decl_event, decl_storage};
+use support::{Parameter, decl_module, decl_event, decl_storage};
 use sr_primitives::traits::{One, SimpleArithmetic, StaticLookup, Member, LookupError};
 use system::{IsDeadAccount, OnNewAccount};
 

substrate/srml/membership/src/lib.rs

@@ -24,7 +24,7 @@
 
 use rstd::prelude::*;
 use support::{
-	StorageValue, decl_module, decl_storage, decl_event, traits::{ChangeMembers, InitializeMembers},
+	decl_module, decl_storage, decl_event, traits::{ChangeMembers, InitializeMembers},
 };
 use system::ensure_root;
 use sr_primitives::{traits::EnsureOrigin, weights::SimpleDispatchInfo};

substrate/srml/offences/src/lib.rs

@@ -29,7 +29,7 @@ use rstd::{
 	collections::btree_set::BTreeSet,
 };
 use support::{
-	StorageMap, StorageDoubleMap, decl_module, decl_event, decl_storage, Parameter,
+	decl_module, decl_event, decl_storage, Parameter,
 };
 use sr_primitives::{
 	Perbill,

substrate/srml/session/src/historical.rs

@@ -29,9 +29,7 @@ use rstd::prelude::*;
 use codec::{Encode, Decode};
 use sr_primitives::KeyTypeId;
 use sr_primitives::traits::{Convert, OpaqueKeys, Hash as HashT};
-use support::{
-	StorageValue, StorageMap, decl_module, decl_storage,
-};
+use support::{decl_module, decl_storage};
 use support::{Parameter, print};
 use substrate_trie::{MemoryDB, Trie, TrieMut, Recorder, EMPTY_PREFIX};
 use substrate_trie::trie_types::{TrieDBMut, TrieDB};

substrate/srml/session/src/lib.rs

@@ -126,7 +126,7 @@ use sr_primitives::weights::SimpleDispatchInfo;
 use sr_primitives::traits::{Convert, Zero, Member, OpaqueKeys};
 use sr_staking_primitives::SessionIndex;
 use support::{
-	dispatch::Result, ConsensusEngineId, StorageValue, StorageDoubleMap, decl_module, decl_event,
+	dispatch::Result, ConsensusEngineId, decl_module, decl_event,
 	decl_storage,
 };
 use support::{ensure, traits::{OnFreeBalanceZero, Get, FindAuthor}, Parameter};

substrate/srml/staking/src/lib.rs

@@ -254,8 +254,8 @@ pub mod inflation;
 use rstd::{prelude::*, result};
 use codec::{HasCompact, Encode, Decode};
 use support::{
-	StorageValue, StorageMap, StorageLinkedMap, decl_module, decl_event,
-	decl_storage, ensure, traits::{
+	decl_module, decl_event, decl_storage, ensure,
+	traits::{
 		Currency, OnFreeBalanceZero, OnDilution, LockIdentifier, LockableCurrency,
 		WithdrawReasons, OnUnbalanced, Imbalance, Get, Time
 	}

substrate/srml/support/procedural/src/storage/transformation.rs

@@ -155,6 +155,13 @@ pub fn decl_storage_impl(input: TokenStream) -> TokenStream {
 	} = instance_opts;
 
 	let expanded = quote! {
+		use #scrate::{
+			StorageValue as _,
+			StorageMap as _,
+			StorageLinkedMap as _,
+			StorageDoubleMap as _
+		};
+
 		#scrate_decl
 		#decl_storage_items
 		#visibility trait #storetype {

substrate/srml/support/test/tests/final_keys.rs

@@ -16,7 +16,6 @@
 
 use runtime_io::with_externalities;
 use primitives::Blake2Hasher;
-use support::{StorageValue, StorageMap, StorageLinkedMap, StorageDoubleMap};
 use support::storage::unhashed;
 use codec::{Encode, Decode};
 

substrate/srml/system/src/lib.rs

@@ -111,8 +111,8 @@ use sr_primitives::{
 
 use primitives::storage::well_known_keys;
 use support::{
-	storage, decl_module, decl_event, decl_storage, StorageDoubleMap, StorageValue, StorageMap,
-	Parameter, traits::{Contains, Get}, decl_error,
+	decl_module, decl_event, decl_storage, decl_error, storage, Parameter,
+	traits::{Contains, Get},
 };
 use safe_mix::TripletMix;
 use codec::{Encode, Decode};

substrate/srml/timestamp/src/lib.rs

@@ -96,7 +96,7 @@ use codec::Encode;
 use codec::Decode;
 #[cfg(feature = "std")]
 use inherents::ProvideInherentData;
-use support::{StorageValue, Parameter, decl_storage, decl_module};
+use support::{Parameter, decl_storage, decl_module};
 use support::traits::{Time, Get};
 use sr_primitives::traits::{
 	SimpleArithmetic, Zero, SaturatedConversion, Scale

substrate/srml/treasury/src/lib.rs

@@ -70,7 +70,7 @@
 #[cfg(feature = "std")]
 use serde::{Serialize, Deserialize};
 use rstd::prelude::*;
-use support::{StorageValue, StorageMap, decl_module, decl_storage, decl_event, ensure, print};
+use support::{decl_module, decl_storage, decl_event, ensure, print};
 use support::traits::{
 	Currency, ExistenceRequirement, Get, Imbalance, OnDilution, OnUnbalanced,
 	ReservableCurrency, WithdrawReason