Update for new type

bin/node-template/runtime/src/lib.rs

@@ -227,9 +227,11 @@ impl pallet_timestamp::Trait for Runtime {
 
 parameter_types! {
 	pub const ExistentialDeposit: u128 = 500;
+	pub const MaxLocks: u32 = 50;
 }
 
 impl pallet_balances::Trait for Runtime {
+	type MaxLocks = MaxLocks;
 	/// The type for recording an account's balance.
 	type Balance = Balance;
 	/// The ubiquitous event type.
@@ -423,7 +425,7 @@ impl_runtime_apis! {
 			None
 		}
 	}
-	
+
 	impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Index> for Runtime {
 		fn account_nonce(account: AccountId) -> Index {
 			System::account_nonce(account)

bin/node/runtime/src/lib.rs

@@ -325,9 +325,13 @@ impl pallet_indices::Trait for Runtime {
 
 parameter_types! {
 	pub const ExistentialDeposit: Balance = 1 * DOLLARS;
+	// For weight estimation, we assume that the most locks on an individual account will be 50.
+	// This number may need to be adjusted in the future if this assumption no longer holds true.
+	pub const MaxLocks: u32 = 50;
 }
 
 impl pallet_balances::Trait for Runtime {
+	type MaxLocks = MaxLocks;
 	type Balance = Balance;
 	type DustRemoval = ();
 	type Event = Event;
@@ -849,17 +853,13 @@ impl pallet_society::Trait for Runtime {
 
 parameter_types! {
 	pub const MinVestedTransfer: Balance = 100 * DOLLARS;
-	// For weight estimation, we assume that the most locks on an individual account will be 50.
-	// This number may need to be adjusted in the future if this assumption no longer holds true.
-	pub const MaxLocks: u32 = 50;
 }
 
 impl pallet_vesting::Trait for Runtime {
 	type Event = Event;
 	type Currency = Balances;
 	type BlockNumberToBalance = ConvertInto;
 	type MinVestedTransfer = MinVestedTransfer;
-	type MaxLocks = MaxLocks;
 	type WeightInfo = weights::pallet_vesting::WeightInfo;
 }
 

frame/atomic-swap/src/tests.rs

@@ -55,6 +55,7 @@ parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
 impl pallet_balances::Trait for Test {
+	type MaxLocks = ();
 	type Balance = u64;
 	type DustRemoval = ();
 	type Event = ();

frame/babe/src/mock.rs

@@ -152,6 +152,7 @@ parameter_types! {
 }
 
 impl pallet_balances::Trait for Test {
+	type MaxLocks = ();
 	type Balance = u128;
 	type DustRemoval = ();
 	type Event = ();

frame/contracts/src/tests.rs

@@ -144,6 +144,7 @@ impl frame_system::Trait for Test {
 	type SystemWeightInfo = ();
 }
 impl pallet_balances::Trait for Test {
+	type MaxLocks = ();
 	type Balance = u64;
 	type Event = MetaEvent;
 	type DustRemoval = ();

frame/democracy/src/tests.rs

@@ -134,6 +134,7 @@ parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
 impl pallet_balances::Trait for Test {
+	type MaxLocks = ();
 	type Balance = u64;
 	type Event = Event;
 	type DustRemoval = ();

frame/elections-phragmen/src/lib.rs

@@ -1148,9 +1148,11 @@ mod tests {
 
 	parameter_types! {
 		pub const ExistentialDeposit: u64 = 1;
+		pub const MaxLocks: u32 = 10;
 	}
 
 	impl pallet_balances::Trait for Test {
+		type MaxLocks = MaxLocks;
 		type Balance = u64;
 		type Event = Event;
 		type DustRemoval = ();

frame/elections/src/mock.rs

@@ -70,6 +70,7 @@ parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
 impl pallet_balances::Trait for Test {
+	type MaxLocks = ();
 	type Balance = u64;
 	type DustRemoval = ();
 	type Event = Event;

frame/evm/src/tests.rs

@@ -63,6 +63,7 @@ parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
 impl pallet_balances::Trait for Test {
+	type MaxLocks = ();
 	type Balance = u64;
 	type DustRemoval = ();
 	type Event = ();

frame/example/src/lib.rs

@@ -774,6 +774,7 @@ mod tests {
 		pub const ExistentialDeposit: u64 = 1;
 	}
 	impl pallet_balances::Trait for Test {
+		type MaxLocks = ();
 		type Balance = u64;
 		type DustRemoval = ();
 		type Event = ();

frame/executive/src/lib.rs

@@ -577,8 +577,10 @@ mod tests {
 	type Balance = u64;
 	parameter_types! {
 		pub const ExistentialDeposit: Balance = 1;
+		pub const MaxLocks: u32 = 10;
 	}
 	impl pallet_balances::Trait for Runtime {
+		type MaxLocks = MaxLocks;
 		type Balance = Balance;
 		type Event = MetaEvent;
 		type DustRemoval = ();

frame/identity/src/lib.rs

@@ -1387,6 +1387,7 @@ mod tests {
 		pub const ExistentialDeposit: u64 = 1;
 	}
 	impl pallet_balances::Trait for Test {
+		type MaxLocks = ();
 		type Balance = u64;
 		type Event = ();
 		type DustRemoval = ();

frame/indices/src/mock.rs

@@ -82,6 +82,7 @@ parameter_types! {
 }
 
 impl pallet_balances::Trait for Test {
+	type MaxLocks = ();
 	type Balance = u64;
 	type DustRemoval = ();
 	type Event = MetaEvent;

frame/multisig/src/tests.rs

@@ -90,6 +90,7 @@ parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
 impl pallet_balances::Trait for Test {
+	type MaxLocks = ();
 	type Balance = u64;
 	type Event = TestEvent;
 	type DustRemoval = ();

frame/nicks/src/lib.rs

@@ -293,6 +293,7 @@ mod tests {
 		pub const ExistentialDeposit: u64 = 1;
 	}
 	impl pallet_balances::Trait for Test {
+		type MaxLocks = ();
 		type Balance = u64;
 		type Event = ();
 		type DustRemoval = ();

frame/offences/benchmarking/src/mock.rs

@@ -72,6 +72,7 @@ parameter_types! {
 	pub const ExistentialDeposit: Balance = 10;
 }
 impl pallet_balances::Trait for Test {
+	type MaxLocks = ();
 	type Balance = Balance;
 	type Event = Event;
 	type DustRemoval = ();

frame/proxy/src/tests.rs

@@ -92,6 +92,7 @@ parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
 impl pallet_balances::Trait for Test {
+	type MaxLocks = ();
 	type Balance = u64;
 	type Event = TestEvent;
 	type DustRemoval = ();

frame/recovery/src/mock.rs

@@ -91,6 +91,7 @@ parameter_types! {
 }
 
 impl pallet_balances::Trait for Test {
+	type MaxLocks = ();
 	type Balance = u128;
 	type DustRemoval = ();
 	type Event = TestEvent;

frame/scored-pool/src/mock.rs

@@ -78,6 +78,7 @@ impl frame_system::Trait for Test {
 }
 
 impl pallet_balances::Trait for Test {
+	type MaxLocks = ();
 	type Balance = u64;
 	type Event = ();
 	type DustRemoval = ();

frame/session/benchmarking/src/mock.rs

@@ -88,6 +88,7 @@ parameter_types! {
 	pub const ExistentialDeposit: Balance = 10;
 }
 impl pallet_balances::Trait for Test {
+	type MaxLocks = ();
 	type Balance = Balance;
 	type Event = ();
 	type DustRemoval = ();

frame/society/src/mock.rs

@@ -89,6 +89,7 @@ impl frame_system::Trait for Test {
 }
 
 impl pallet_balances::Trait for Test {
+	type MaxLocks = ();
 	type Balance = u64;
 	type Event = ();
 	type DustRemoval = ();

frame/staking/fuzzer/src/mock.rs

@@ -87,6 +87,7 @@ parameter_types! {
 	pub const ExistentialDeposit: Balance = 10;
 }
 impl pallet_balances::Trait for Test {
+	type MaxLocks = ();
 	type Balance = Balance;
 	type Event = ();
 	type DustRemoval = ();

frame/staking/src/mock.rs

@@ -227,6 +227,7 @@ impl frame_system::Trait for Test {
 	type SystemWeightInfo = ();
 }
 impl pallet_balances::Trait for Test {
+	type MaxLocks = ();
 	type Balance = Balance;
 	type Event = MetaEvent;
 	type DustRemoval = ();

frame/support/src/traits.rs

@@ -1111,7 +1111,7 @@ pub trait LockableCurrency<AccountId>: Currency<AccountId> {
 	type Moment;
 
 	/// The maximum number of locks a user should have on their account.
-	type MaxLocks;
+	type MaxLocks: Get<u32>;
 
 	/// Create a new balance lock on account `who`.
 	///

frame/transaction-payment/src/lib.rs

@@ -663,9 +663,11 @@ mod tests {
 
 	parameter_types! {
 		pub const ExistentialDeposit: u64 = 1;
+		pub const MaxLocks: u32 = 10;
 	}
 
 	impl pallet_balances::Trait for Runtime {
+		type MaxLocks = MaxLocks;
 		type Balance = u64;
 		type Event = Event;
 		type DustRemoval = ();

frame/treasury/src/tests.rs

@@ -90,6 +90,7 @@ parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
 impl pallet_balances::Trait for Test {
+	type MaxLocks = ();
 	type Balance = u64;
 	type Event = Event;
 	type DustRemoval = ();

frame/utility/src/tests.rs

@@ -89,6 +89,7 @@ parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
 impl pallet_balances::Trait for Test {
+	type MaxLocks = ();
 	type Balance = u64;
 	type DustRemoval = ();
 	type Event = TestEvent;

frame/vesting/src/lib.rs

@@ -209,8 +209,8 @@ decl_module! {
 		///     - Reads: Vesting Storage, Balances Locks, [Sender Account]
 		///     - Writes: Vesting Storage, Balances Locks, [Sender Account]
 		/// # </weight>
-		#[weight = T::WeightInfo::vest_locked(<MaxLocksOf<T> as Get<u32>>::get())
-			.max(T::WeightInfo::vest_unlocked(<MaxLocksOf<T> as Get<u32>>::get()))
+		#[weight = T::WeightInfo::vest_locked(MaxLocksOf::<T>::get())
+			.max(T::WeightInfo::vest_unlocked(MaxLocksOf::<T>::get()))
 		]
 		fn vest(origin) -> DispatchResult {
 			let who = ensure_signed(origin)?;
@@ -232,8 +232,8 @@ decl_module! {
 		///     - Reads: Vesting Storage, Balances Locks, Target Account
 		///     - Writes: Vesting Storage, Balances Locks, Target Account
 		/// # </weight>
-		#[weight = T::WeightInfo::vest_other_locked(<MaxLocksOf<T> as Get<u32>>::get())
-			.max(T::WeightInfo::vest_other_unlocked(<MaxLocksOf<T> as Get<u32>>::get()))
+		#[weight = T::WeightInfo::vest_other_locked(MaxLocksOf::<T>::get())
+			.max(T::WeightInfo::vest_other_unlocked(MaxLocksOf::<T>::get()))
 		]
 		fn vest_other(origin, target: <T::Lookup as StaticLookup>::Source) -> DispatchResult {
 			ensure_signed(origin)?;
@@ -256,7 +256,7 @@ decl_module! {
 		///     - Reads: Vesting Storage, Balances Locks, Target Account, [Sender Account]
 		///     - Writes: Vesting Storage, Balances Locks, Target Account, [Sender Account]
 		/// # </weight>
-		#[weight = T::WeightInfo::vested_transfer(<MaxLocksOf<T> as Get<u32>>::get())]
+		#[weight = T::WeightInfo::vested_transfer(MaxLocksOf::<T>::get())]
 		pub fn vested_transfer(
 			origin,
 			target: <T::Lookup as StaticLookup>::Source,
@@ -293,7 +293,7 @@ decl_module! {
 		///     - Reads: Vesting Storage, Balances Locks, Target Account, Source Account
 		///     - Writes: Vesting Storage, Balances Locks, Target Account, Source Account
 		/// # </weight>
-		#[weight = T::WeightInfo::force_vested_transfer(<MaxLocksOf<T> as Get<u32>>::get())]
+		#[weight = T::WeightInfo::force_vested_transfer(MaxLocksOf::<T>::get())]
 		pub fn force_vested_transfer(
 			origin,
 			source: <T::Lookup as StaticLookup>::Source,
@@ -454,6 +454,7 @@ mod tests {
 		pub const MaxLocks: u32 = 10;
 	}
 	impl pallet_balances::Trait for Test {
+		type MaxLocks = ();
 		type Balance = u64;
 		type DustRemoval = ();
 		type Event = ();