Merge branch 'master' into hasher_trait_for_pallet_beefy

Author: Klapeyron

Cargo.lock

@@ -417,6 +417,8 @@ members = [
 	"substrate/frame/referenda",
 	"substrate/frame/remark",
 	"substrate/frame/revive",
+	"substrate/frame/revive/dev-node/node",
+	"substrate/frame/revive/dev-node/runtime",
 	"substrate/frame/revive/fixtures",
 	"substrate/frame/revive/proc-macro",
 	"substrate/frame/revive/rpc",
@@ -1040,6 +1042,8 @@ pallet-staking = { path = "substrate/frame/staking", default-features = false }
 pallet-staking-reward-curve = { path = "substrate/frame/staking/reward-curve", default-features = false }
 pallet-staking-reward-fn = { path = "substrate/frame/staking/reward-fn", default-features = false }
 pallet-staking-runtime-api = { path = "substrate/frame/staking/runtime-api", default-features = false }
+revive-dev-node = { path = "substrate/frame/revive/dev-node/node" }
+revive-dev-runtime = { path = "substrate/frame/revive/dev-node/runtime" }
 # TODO: remove the reward stuff as they are not needed here
 pallet-staking-async = { path = "substrate/frame/staking-async", default-features = false }
 pallet-staking-async-ah-client = { path = "substrate/frame/staking-async/ah-client", default-features = false }

Cargo.toml

@@ -49,8 +49,8 @@ fn create_funded_user<T: Config>(
 	balance_factor: u32,
 ) -> T::AccountId {
 	let user = account(string, n, SEED);
-	let balance = T::Currency::minimum_balance() * balance_factor.into();
-	let _ = T::Currency::make_free_balance_be(&user, balance);
+	let balance = <T as pallet::Config>::Currency::minimum_balance() * balance_factor.into();
+	let _ = <T as pallet::Config>::Currency::make_free_balance_be(&user, balance);
 	user
 }
 
@@ -90,7 +90,10 @@ fn register_candidates<T: Config>(count: u32) {
 	assert!(CandidacyBond::<T>::get() > 0u32.into(), "Bond cannot be zero!");
 
 	for who in candidates {
-		T::Currency::make_free_balance_be(&who, CandidacyBond::<T>::get() * 3u32.into());
+		<T as pallet::Config>::Currency::make_free_balance_be(
+			&who,
+			CandidacyBond::<T>::get() * 3u32.into(),
+		);
 		<CollatorSelection<T>>::register_as_candidate(RawOrigin::Signed(who).into()).unwrap();
 	}
 }
@@ -144,7 +147,7 @@ mod benchmarks {
 			T::UpdateOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
 
 		// need to fill up candidates
-		CandidacyBond::<T>::put(T::Currency::minimum_balance());
+		CandidacyBond::<T>::put(<T as pallet::Config>::Currency::minimum_balance());
 		DesiredCandidates::<T>::put(c);
 		// get accounts and keys for the `c` candidates
 		let mut candidates = (0..c).map(|cc| validator::<T>(cc)).collect::<Vec<_>>();
@@ -161,13 +164,13 @@ mod benchmarks {
 		// ... and register them.
 		for (who, _) in candidates.iter() {
 			let deposit = CandidacyBond::<T>::get();
-			T::Currency::make_free_balance_be(who, deposit * 1000_u32.into());
+			<T as pallet::Config>::Currency::make_free_balance_be(who, deposit * 1000_u32.into());
 			CandidateList::<T>::try_mutate(|list| {
 				list.try_push(CandidateInfo { who: who.clone(), deposit }).unwrap();
 				Ok::<(), BenchmarkError>(())
 			})
 			.unwrap();
-			T::Currency::reserve(who, deposit)?;
+			<T as pallet::Config>::Currency::reserve(who, deposit)?;
 			LastAuthoredBlock::<T>::insert(
 				who.clone(),
 				frame_system::Pallet::<T>::block_number() + T::KickThreshold::get(),
@@ -226,7 +229,8 @@ mod benchmarks {
 		c: Linear<0, { T::MaxCandidates::get() }>,
 		k: Linear<0, { T::MaxCandidates::get() }>,
 	) -> Result<(), BenchmarkError> {
-		let initial_bond_amount: BalanceOf<T> = T::Currency::minimum_balance() * 2u32.into();
+		let initial_bond_amount: BalanceOf<T> =
+			<T as pallet::Config>::Currency::minimum_balance() * 2u32.into();
 		CandidacyBond::<T>::put(initial_bond_amount);
 		register_validators::<T>(c);
 		register_candidates::<T>(c);
@@ -236,12 +240,12 @@ mod benchmarks {
 		let bond_amount = if k > 0 {
 			CandidateList::<T>::mutate(|candidates| {
 				for info in candidates.iter_mut().skip(kicked as usize) {
-					info.deposit = T::Currency::minimum_balance() * 3u32.into();
+					info.deposit = <T as pallet::Config>::Currency::minimum_balance() * 3u32.into();
 				}
 			});
-			T::Currency::minimum_balance() * 3u32.into()
+			<T as pallet::Config>::Currency::minimum_balance() * 3u32.into()
 		} else {
-			T::Currency::minimum_balance()
+			<T as pallet::Config>::Currency::minimum_balance()
 		};
 
 		#[extrinsic_call]
@@ -255,7 +259,7 @@ mod benchmarks {
 	fn update_bond(
 		c: Linear<{ min_candidates::<T>() + 1 }, { T::MaxCandidates::get() }>,
 	) -> Result<(), BenchmarkError> {
-		CandidacyBond::<T>::put(T::Currency::minimum_balance());
+		CandidacyBond::<T>::put(<T as pallet::Config>::Currency::minimum_balance());
 		DesiredCandidates::<T>::put(c);
 
 		register_validators::<T>(c);
@@ -264,8 +268,8 @@ mod benchmarks {
 		let caller = CandidateList::<T>::get()[0].who.clone();
 		v2::whitelist!(caller);
 
-		let bond_amount: BalanceOf<T> =
-			T::Currency::minimum_balance() + T::Currency::minimum_balance();
+		let bond_amount: BalanceOf<T> = <T as pallet::Config>::Currency::minimum_balance() +
+			<T as pallet::Config>::Currency::minimum_balance();
 
 		#[extrinsic_call]
 		_(RawOrigin::Signed(caller.clone()), bond_amount);
@@ -275,7 +279,7 @@ mod benchmarks {
 		);
 		assert!(
 			CandidateList::<T>::get().iter().last().unwrap().deposit ==
-				T::Currency::minimum_balance() * 2u32.into()
+				<T as pallet::Config>::Currency::minimum_balance() * 2u32.into()
 		);
 		Ok(())
 	}
@@ -284,15 +288,15 @@ mod benchmarks {
 	// one.
 	#[benchmark]
 	fn register_as_candidate(c: Linear<1, { T::MaxCandidates::get() - 1 }>) {
-		CandidacyBond::<T>::put(T::Currency::minimum_balance());
+		CandidacyBond::<T>::put(<T as pallet::Config>::Currency::minimum_balance());
 		DesiredCandidates::<T>::put(c + 1);
 
 		register_validators::<T>(c);
 		register_candidates::<T>(c);
 
 		let caller: T::AccountId = whitelisted_caller();
-		let bond: BalanceOf<T> = T::Currency::minimum_balance() * 2u32.into();
-		T::Currency::make_free_balance_be(&caller, bond);
+		let bond: BalanceOf<T> = <T as pallet::Config>::Currency::minimum_balance() * 2u32.into();
+		<T as pallet::Config>::Currency::make_free_balance_be(&caller, bond);
 
 		<session::Pallet<T>>::set_keys(
 			RawOrigin::Signed(caller.clone()).into(),
@@ -311,15 +315,15 @@ mod benchmarks {
 
 	#[benchmark]
 	fn take_candidate_slot(c: Linear<{ min_candidates::<T>() + 1 }, { T::MaxCandidates::get() }>) {
-		CandidacyBond::<T>::put(T::Currency::minimum_balance());
+		CandidacyBond::<T>::put(<T as pallet::Config>::Currency::minimum_balance());
 		DesiredCandidates::<T>::put(1);
 
 		register_validators::<T>(c);
 		register_candidates::<T>(c);
 
 		let caller: T::AccountId = whitelisted_caller();
-		let bond: BalanceOf<T> = T::Currency::minimum_balance() * 10u32.into();
-		T::Currency::make_free_balance_be(&caller, bond);
+		let bond: BalanceOf<T> = <T as pallet::Config>::Currency::minimum_balance() * 10u32.into();
+		<T as pallet::Config>::Currency::make_free_balance_be(&caller, bond);
 
 		<session::Pallet<T>>::set_keys(
 			RawOrigin::Signed(caller.clone()).into(),
@@ -342,7 +346,7 @@ mod benchmarks {
 	// worse case is the last candidate leaving.
 	#[benchmark]
 	fn leave_intent(c: Linear<{ min_candidates::<T>() + 1 }, { T::MaxCandidates::get() }>) {
-		CandidacyBond::<T>::put(T::Currency::minimum_balance());
+		CandidacyBond::<T>::put(<T as pallet::Config>::Currency::minimum_balance());
 		DesiredCandidates::<T>::put(c);
 
 		register_validators::<T>(c);
@@ -360,23 +364,23 @@ mod benchmarks {
 	// worse case is paying a non-existing candidate account.
 	#[benchmark]
 	fn note_author() {
-		CandidacyBond::<T>::put(T::Currency::minimum_balance());
-		T::Currency::make_free_balance_be(
+		CandidacyBond::<T>::put(<T as pallet::Config>::Currency::minimum_balance());
+		<T as pallet::Config>::Currency::make_free_balance_be(
 			&<CollatorSelection<T>>::account_id(),
-			T::Currency::minimum_balance() * 4u32.into(),
+			<T as pallet::Config>::Currency::minimum_balance() * 4u32.into(),
 		);
 		let author = account("author", 0, SEED);
 		let new_block: BlockNumberFor<T> = 10u32.into();
 
 		frame_system::Pallet::<T>::set_block_number(new_block);
-		assert!(T::Currency::free_balance(&author) == 0u32.into());
+		assert!(<T as pallet::Config>::Currency::free_balance(&author) == 0u32.into());
 
 		#[block]
 		{
 			<CollatorSelection<T> as EventHandler<_, _>>::note_author(author.clone())
 		}
 
-		assert!(T::Currency::free_balance(&author) > 0u32.into());
+		assert!(<T as pallet::Config>::Currency::free_balance(&author) > 0u32.into());
 		assert_eq!(frame_system::Pallet::<T>::block_number(), new_block);
 	}
 
@@ -386,7 +390,7 @@ mod benchmarks {
 		r: Linear<1, { T::MaxCandidates::get() }>,
 		c: Linear<1, { T::MaxCandidates::get() }>,
 	) {
-		CandidacyBond::<T>::put(T::Currency::minimum_balance());
+		CandidacyBond::<T>::put(<T as pallet::Config>::Currency::minimum_balance());
 		DesiredCandidates::<T>::put(c);
 		frame_system::Pallet::<T>::set_block_number(0u32.into());
 

cumulus/pallets/collator-selection/src/benchmarking.rs

@@ -140,6 +140,8 @@ impl pallet_session::Config for Test {
 	type Keys = MockSessionKeys;
 	type DisablingStrategy = ();
 	type WeightInfo = ();
+	type Currency = Balances;
+	type KeyDeposit = ();
 }
 
 ord_parameter_types! {

cumulus/pallets/collator-selection/src/mock.rs

@@ -1847,7 +1847,7 @@ impl<T: Config> BlockNumberProvider for RelaychainDataProvider<T> {
 			.unwrap_or_else(|| Pallet::<T>::last_relay_block_number())
 	}
 
-	#[cfg(feature = "runtime-benchmarks")]
+	#[cfg(any(feature = "std", feature = "runtime-benchmarks", test))]
 	fn set_block_number(block: Self::BlockNumber) {
 		let mut validation_data = ValidationData::<T>::get().unwrap_or_else(||
 			// PersistedValidationData does not impl default in non-std

cumulus/pallets/parachain-system/src/lib.rs

@@ -837,6 +837,8 @@ impl pallet_session::Config for Runtime {
 	type Keys = SessionKeys;
 	type DisablingStrategy = ();
 	type WeightInfo = weights::pallet_session::WeightInfo<Runtime>;
+	type Currency = Balances;
+	type KeyDeposit = ();
 }
 
 impl pallet_aura::Config for Runtime {

cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs

@@ -890,6 +890,8 @@ impl pallet_session::Config for Runtime {
 	type Keys = SessionKeys;
 	type DisablingStrategy = ();
 	type WeightInfo = weights::pallet_session::WeightInfo<Runtime>;
+	type Currency = Balances;
+	type KeyDeposit = ();
 }
 
 impl pallet_aura::Config for Runtime {