Update Pallet placeholder struct as per FRAME v2 (paritytech#14348)

abhi3700 · nathanwhit · commit 03c3bd007098 · 2023-07-18T17:00:57.000-07:00
* Update Pallet placeholder struct as per FRAME v3

* ".git/.scripts/commands/fmt/fmt.sh"

* Update lib.rs

Removed the unused import

---------

Co-authored-by: command-bot &lt;&gt;
diff --git a/frame/asset-conversion/src/lib.rs b/frame/asset-conversion/src/lib.rs
@@ -111,7 +111,7 @@ pub mod pallet {
 	use sp_std::prelude::*;
 
 	#[pallet::pallet]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
diff --git a/frame/atomic-swap/src/lib.rs b/frame/atomic-swap/src/lib.rs
@@ -184,7 +184,7 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::storage]
 	pub type PendingSwaps<T: Config> = StorageDoubleMap<
diff --git a/frame/beefy/src/lib.rs b/frame/beefy/src/lib.rs
@@ -112,7 +112,7 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	/// The current authorities set
 	#[pallet::storage]
diff --git a/frame/benchmarking/pov/src/lib.rs b/frame/benchmarking/pov/src/lib.rs
@@ -32,7 +32,7 @@ pub mod pallet {
 	use sp_std::prelude::*;
 
 	#[pallet::pallet]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
@@ -35,7 +35,7 @@ mod pallet_test {
 	use frame_system::pallet_prelude::*;
 
 	#[pallet::pallet]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
@@ -129,7 +129,7 @@ use pallet_contracts_primitives::{
 use scale_info::TypeInfo;
 use smallvec::Array;
 use sp_runtime::traits::{Convert, Hash, Saturating, StaticLookup, Zero};
-use sp_std::{fmt::Debug, marker::PhantomData, prelude::*};
+use sp_std::{fmt::Debug, prelude::*};
 
 pub use crate::{
 	address::{AddressGenerator, DefaultAddressGenerator},
@@ -191,7 +191,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::storage_version(STORAGE_VERSION)]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
@@ -1343,7 +1343,7 @@ pub mod pallet {
 	#[pallet::pallet]
 	#[pallet::without_storage_info]
 	#[pallet::storage_version(STORAGE_VERSION)]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 }
 
 impl<T: Config> Pallet<T> {
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
@@ -192,7 +192,7 @@ pub mod pallet {
 	#[pallet::pallet]
 	#[pallet::storage_version(STORAGE_VERSION)]
 	#[pallet::without_storage_info]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
diff --git a/frame/indices/src/lib.rs b/frame/indices/src/lib.rs
@@ -75,7 +75,7 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
diff --git a/frame/nft-fractionalization/src/lib.rs b/frame/nft-fractionalization/src/lib.rs
@@ -86,7 +86,7 @@ pub mod pallet {
 	use sp_std::{fmt::Display, prelude::*};
 
 	#[pallet::pallet]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
diff --git a/frame/preimage/src/lib.rs b/frame/preimage/src/lib.rs
@@ -108,7 +108,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::storage_version(STORAGE_VERSION)]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
diff --git a/frame/scheduler/src/mock.rs b/frame/scheduler/src/mock.rs
@@ -50,7 +50,7 @@ pub mod logger {
 	}
 
 	#[pallet::pallet]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
diff --git a/frame/sudo/src/lib.rs b/frame/sudo/src/lib.rs
@@ -59,7 +59,7 @@
 //! 	use frame_system::pallet_prelude::*;
 //!
 //! 	#[pallet::pallet]
-//! 	pub struct Pallet<T>(PhantomData<T>);
+//! 	pub struct Pallet<T>(_);
 //!
 //! 	#[pallet::config]
 //! 	pub trait Config: frame_system::Config {}
@@ -141,7 +141,7 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
diff --git a/frame/sudo/src/mock.rs b/frame/sudo/src/mock.rs
@@ -39,7 +39,7 @@ pub mod logger {
 	}
 
 	#[pallet::pallet]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
@@ -3582,7 +3582,7 @@ mod weight_tests {
 		use crate::pallet_prelude::*;
 
 		#[pallet::pallet]
-		pub struct Pallet<T>(PhantomData<T>);
+		pub struct Pallet<T>(_);
 
 		#[pallet::config]
 		#[pallet::disable_frame_system_supertrait_check]
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
@@ -848,7 +848,7 @@ pub mod tests {
 		use crate::pallet_prelude::*;
 
 		#[pallet::pallet]
-		pub struct Pallet<T>(PhantomData<T>);
+		pub struct Pallet<T>(_);
 
 		#[pallet::config]
 		#[pallet::disable_frame_system_supertrait_check]
diff --git a/frame/support/src/storage/generator/mod.rs b/frame/support/src/storage/generator/mod.rs
@@ -53,7 +53,7 @@ mod tests {
 		use crate::pallet_prelude::*;
 
 		#[pallet::pallet]
-		pub struct Pallet<T>(PhantomData<T>);
+		pub struct Pallet<T>(_);
 
 		#[pallet::config]
 		#[pallet::disable_frame_system_supertrait_check]
diff --git a/frame/support/test/tests/final_keys.rs b/frame/support/test/tests/final_keys.rs
@@ -34,7 +34,7 @@ mod no_instance {
 	use frame_support_test as frame_system;
 
 	#[pallet::pallet]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {}
diff --git a/frame/support/test/tests/genesisconfig.rs b/frame/support/test/tests/genesisconfig.rs
@@ -28,7 +28,7 @@ pub mod pallet {
 	use frame_support_test as frame_system;
 
 	#[pallet::pallet]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {}
diff --git a/frame/support/test/tests/issue2219.rs b/frame/support/test/tests/issue2219.rs
@@ -80,7 +80,7 @@ mod module {
 	}
 
 	#[pallet::pallet]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config + TypeInfo {}
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
@@ -151,7 +151,7 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	/// Current time for the current block.
 	#[pallet::storage]
diff --git a/test-utils/runtime/src/substrate_test_pallet.rs b/test-utils/runtime/src/substrate_test_pallet.rs
@@ -45,7 +45,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::without_storage_info]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {}
diff --git a/utils/frame/rpc/support/src/lib.rs b/utils/frame/rpc/support/src/lib.rs
@@ -94,7 +94,7 @@ use sp_storage::{StorageData, StorageKey};
 /// 	use frame_support::pallet_prelude::*;
 ///
 /// 	#[pallet::pallet]
-/// 	pub struct Pallet<T>(PhantomData<T>);
+/// 	pub struct Pallet<T>(_);
 ///
 /// 	#[pallet::config]
 /// 	pub trait Config: frame_system::Config {}

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ pub mod pallet {`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`#[pallet::pallet]`
`187`		`- pub struct Pallet<T>(PhantomData<T>);`
	`187`	`+ pub struct Pallet<T>(_);`
`188`	`188`
`189`	`189`	`#[pallet::storage]`
`190`	`190`	`pub type PendingSwaps<T: Config> = StorageDoubleMap<`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ pub mod pallet {`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`#[pallet::pallet]`
`115`		`- pub struct Pallet<T>(PhantomData<T>);`
	`115`	`+ pub struct Pallet<T>(_);`
`116`	`116`
`117`	`117`	`/// The current authorities set`
`118`	`118`	`#[pallet::storage]`
Original file line number	Diff line number	Diff line change
`@@ -1343,7 +1343,7 @@ pub mod pallet {`
`1343`	`1343`	`#[pallet::pallet]`
`1344`	`1344`	`#[pallet::without_storage_info]`
`1345`	`1345`	`#[pallet::storage_version(STORAGE_VERSION)]`
`1346`		`- pub struct Pallet<T>(PhantomData<T>);`
	`1346`	`+ pub struct Pallet<T>(_);`
`1347`	`1347`	`}`
`1348`	`1348`
`1349`	`1349`	`impl<T: Config> Pallet<T> {`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ pub mod pallet {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`#[pallet::pallet]`
`78`		`- pub struct Pallet<T>(PhantomData<T>);`
	`78`	`+ pub struct Pallet<T>(_);`
`79`	`79`
`80`	`80`	`#[pallet::call]`
`81`	`81`	`impl<T: Config> Pallet<T> {`