Merge remote-tracking branch 'origin/master' into m-cat/remove-parity…

…-util-mem
paritytech · Dec 6, 2022 · b6bc360 · b6bc360
2 parents b10c824 + 5f881f5
commit b6bc360
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/runtime/kusama/src/governance/mod.rs b/runtime/kusama/src/governance/mod.rs
@@ -72,7 +72,7 @@ impl pallet_whitelist::Config for Runtime {
 	type WhitelistOrigin =
 		EitherOf<EnsureRootWithSuccess<Self::AccountId, ConstU16<65535>>, Fellows>;
 	type DispatchWhitelistedOrigin = EitherOf<EnsureRoot<Self::AccountId>, WhitelistedCaller>;
-	type PreimageProvider = Preimage;
+	type Preimages = Preimage;
 }
 
 impl pallet_referenda::Config for Runtime {

diff --git a/runtime/kusama/src/weights/pallet_whitelist.rs b/runtime/kusama/src/weights/pallet_whitelist.rs
@@ -63,7 +63,8 @@ impl<T: frame_system::Config> pallet_whitelist::WeightInfo for WeightInfo<T> {
 	// Storage: Whitelist WhitelistedCall (r:1 w:1)
 	// Storage: Preimage PreimageFor (r:1 w:1)
 	// Storage: Preimage StatusFor (r:1 w:1)
-	fn dispatch_whitelisted_call() -> Weight {
+	// TODO regenerate
+	fn dispatch_whitelisted_call(_n: u32) -> Weight {
 		Weight::from_ref_time(7_327_364_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(3 as u64))
 			.saturating_add(T::DbWeight::get().writes(3 as u64))