Require MaxEncodedLen per default (paritytech#10662)

* Remove generate_storage_info Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Add without_storage_info where needed Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Update doc tests Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Add more without_storage_info Signed-off-by: Oliver Tale-Yazdi <[email protected]> * fix TryBuild Signed-off-by: Oliver Tale-Yazdi <[email protected]> * fix TryBuild tests Signed-off-by: Oliver Tale-Yazdi <[email protected]>
Wizdave97 · Jan 20, 2022 · f318350 · f318350
1 parent 823c253
commit f318350
Show file tree

Hide file tree

Showing 64 changed files with 127 additions and 109 deletions.
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
@@ -172,7 +172,6 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
-	#[pallet::generate_storage_info]
 	pub struct Pallet<T, I = ()>(_);
 
 	#[pallet::config]

diff --git a/frame/atomic-swap/src/lib.rs b/frame/atomic-swap/src/lib.rs
@@ -182,6 +182,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(PhantomData<T>);
 
 	#[pallet::storage]

diff --git a/frame/aura/src/lib.rs b/frame/aura/src/lib.rs
@@ -81,7 +81,6 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
-	#[pallet::generate_storage_info]
 	pub struct Pallet<T>(sp_std::marker::PhantomData<T>);
 
 	#[pallet::hooks]

diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs
@@ -39,7 +39,6 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
-	#[pallet::generate_storage_info]
 	pub struct Pallet<T>(_);
 
 	#[pallet::config]

diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
@@ -156,6 +156,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]

diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
@@ -115,7 +115,6 @@ pub mod pallet {
 	/// The BABE Pallet
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
-	#[pallet::generate_storage_info]
 	pub struct Pallet<T>(_);
 
 	#[pallet::config]

diff --git a/frame/bags-list/src/lib.rs b/frame/bags-list/src/lib.rs
@@ -92,7 +92,6 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(crate) trait Store)]
-	#[pallet::generate_storage_info]
 	pub struct Pallet<T>(_);
 
 	#[pallet::config]

diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
@@ -242,7 +242,6 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
-	#[pallet::generate_storage_info]
 	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
 
 	#[pallet::call]

diff --git a/frame/beefy-mmr/src/lib.rs b/frame/beefy-mmr/src/lib.rs
@@ -119,6 +119,7 @@ pub mod pallet {
 	/// BEEFY-MMR pallet.
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(_);
 
 	/// The module's configuration trait.

diff --git a/frame/beefy/src/lib.rs b/frame/beefy/src/lib.rs
@@ -51,6 +51,7 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(PhantomData<T>);
 
 	#[pallet::hooks]

diff --git a/frame/bounties/src/lib.rs b/frame/bounties/src/lib.rs
@@ -180,6 +180,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(_);
 
 	#[pallet::config]

diff --git a/frame/child-bounties/src/lib.rs b/frame/child-bounties/src/lib.rs
@@ -130,7 +130,6 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
-	#[pallet::generate_storage_info]
 	pub struct Pallet<T>(_);
 
 	#[pallet::config]

diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
@@ -172,6 +172,7 @@ pub mod pallet {
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
 	#[pallet::storage_version(STORAGE_VERSION)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
 
 	#[pallet::config]

diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
@@ -303,6 +303,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::storage_version(STORAGE_VERSION)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(PhantomData<T>);
 
 	#[pallet::hooks]

diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
@@ -246,6 +246,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(_);
 
 	#[pallet::config]

diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
@@ -1205,6 +1205,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(PhantomData<T>);
 }
 

diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
@@ -250,6 +250,7 @@ pub mod pallet {
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
 	#[pallet::storage_version(STORAGE_VERSION)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(PhantomData<T>);
 
 	#[pallet::hooks]

diff --git a/frame/examples/offchain-worker/src/lib.rs b/frame/examples/offchain-worker/src/lib.rs
@@ -158,6 +158,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]

diff --git a/frame/examples/parallel/src/lib.rs b/frame/examples/parallel/src/lib.rs
@@ -48,6 +48,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(_);
 
 	/// A public part of the pallet.

diff --git a/frame/gilt/src/lib.rs b/frame/gilt/src/lib.rs
@@ -178,6 +178,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(_);
 
 	/// A single bid on a gilt, an item of a *queue* in `Queues`.

diff --git a/frame/grandpa/src/lib.rs b/frame/grandpa/src/lib.rs
@@ -83,7 +83,6 @@ pub mod pallet {
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
 	#[pallet::storage_version(STORAGE_VERSION)]
-	#[pallet::generate_storage_info]
 	pub struct Pallet<T>(_);
 
 	#[pallet::config]

diff --git a/frame/identity/src/lib.rs b/frame/identity/src/lib.rs
@@ -152,7 +152,6 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
-	#[pallet::generate_storage_info]
 	pub struct Pallet<T>(_);
 
 	/// Information that is pertinent to identify the entity behind an account.

diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
@@ -315,7 +315,6 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
-	#[pallet::generate_storage_info]
 	pub struct Pallet<T>(_);
 
 	#[pallet::config]

diff --git a/frame/indices/src/lib.rs b/frame/indices/src/lib.rs
@@ -74,6 +74,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(PhantomData<T>);
 
 	#[pallet::call]

diff --git a/frame/lottery/src/lib.rs b/frame/lottery/src/lib.rs
@@ -124,7 +124,6 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
-	#[pallet::generate_storage_info]
 	pub struct Pallet<T>(_);
 
 	/// The pallet's config trait.

diff --git a/frame/membership/src/lib.rs b/frame/membership/src/lib.rs
@@ -46,6 +46,7 @@ pub mod pallet {
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
 	#[pallet::storage_version(STORAGE_VERSION)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
 
 	#[pallet::config]

diff --git a/frame/merkle-mountain-range/src/lib.rs b/frame/merkle-mountain-range/src/lib.rs
@@ -84,6 +84,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
 
 	/// This pallet's configuration trait

diff --git a/frame/multisig/src/lib.rs b/frame/multisig/src/lib.rs
@@ -153,6 +153,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(_);
 
 	/// The set of open multisig operations.

diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs
@@ -114,6 +114,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(_);
 
 	#[pallet::call]

diff --git a/frame/node-authorization/src/lib.rs b/frame/node-authorization/src/lib.rs
@@ -57,6 +57,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(_);
 
 	/// The module configuration trait

diff --git a/frame/offences/src/lib.rs b/frame/offences/src/lib.rs
@@ -50,6 +50,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(_);
 
 	/// The pallet's config trait.

diff --git a/frame/preimage/src/lib.rs b/frame/preimage/src/lib.rs
@@ -100,7 +100,6 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
-	#[pallet::generate_storage_info]
 	pub struct Pallet<T>(PhantomData<T>);
 
 	#[pallet::event]

diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
@@ -102,7 +102,6 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
-	#[pallet::generate_storage_info]
 	pub struct Pallet<T>(_);
 
 	/// Configuration trait.

diff --git a/frame/randomness-collective-flip/src/lib.rs b/frame/randomness-collective-flip/src/lib.rs
@@ -91,6 +91,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(_);
 
 	#[pallet::config]

diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs
@@ -212,6 +212,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(_);
 
 	/// Configuration trait.

diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
@@ -203,6 +203,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(_);
 
 	/// `system::Config` should always be included in our implied traits.

diff --git a/frame/scored-pool/src/lib.rs b/frame/scored-pool/src/lib.rs
@@ -129,6 +129,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T, I = ()>(_);
 
 	#[pallet::config]

diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
@@ -373,6 +373,7 @@ pub mod pallet {
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
 	#[pallet::storage_version(STORAGE_VERSION)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(_);
 
 	#[pallet::config]

diff --git a/frame/society/src/lib.rs b/frame/society/src/lib.rs
@@ -371,6 +371,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T, I = ()>(_);
 
 	#[pallet::config]

diff --git a/frame/staking/src/pallet/mod.rs b/frame/staking/src/pallet/mod.rs
@@ -56,6 +56,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(crate) trait Store)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(_);
 
 	#[pallet::config]

diff --git a/frame/sudo/src/lib.rs b/frame/sudo/src/lib.rs
@@ -121,7 +121,6 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
-	#[pallet::generate_storage_info]
 	pub struct Pallet<T>(PhantomData<T>);
 
 	#[pallet::call]

diff --git a/frame/sudo/src/mock.rs b/frame/sudo/src/mock.rs
@@ -45,6 +45,7 @@ pub mod logger {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::without_storage_info]
 	pub struct Pallet<T>(PhantomData<T>);
 
 	#[pallet::call]

diff --git a/frame/support/procedural/src/pallet/expand/pallet_struct.rs b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
@@ -99,19 +99,19 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 	};
 
 	let storage_info_span =
-		def.pallet_struct.generate_storage_info.unwrap_or(def.pallet_struct.attr_span);
+		def.pallet_struct.without_storage_info.unwrap_or(def.pallet_struct.attr_span);
 
 	let storage_names = &def.storages.iter().map(|storage| &storage.ident).collect::<Vec<_>>();
 	let storage_cfg_attrs =
 		&def.storages.iter().map(|storage| &storage.cfg_attrs).collect::<Vec<_>>();
 
-	// Depending on the flag `generate_storage_info` and the storage attribute `unbounded`, we use
+	// Depending on the flag `without_storage_info` and the storage attribute `unbounded`, we use
 	// partial or full storage info from storage.
 	let storage_info_traits = &def
 		.storages
 		.iter()
 		.map(|storage| {
-			if storage.unbounded || def.pallet_struct.generate_storage_info.is_none() {
+			if storage.unbounded || def.pallet_struct.without_storage_info.is_some() {
 				quote::quote_spanned!(storage_info_span => PartialStorageInfoTrait)
 			} else {
 				quote::quote_spanned!(storage_info_span => StorageInfoTrait)
@@ -123,7 +123,7 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 		.storages
 		.iter()
 		.map(|storage| {
-			if storage.unbounded || def.pallet_struct.generate_storage_info.is_none() {
+			if storage.unbounded || def.pallet_struct.without_storage_info.is_some() {
 				quote::quote_spanned!(storage_info_span => partial_storage_info)
 			} else {
 				quote::quote_spanned!(storage_info_span => storage_info)