git.delta.rocks / unique-network / refs/commits / c3c95caf228f

--- a/pallets/collator-selection/src/mock.rs
+++ b/pallets/collator-selection/src/mock.rs
@@ -32,23 +32,22 @@
 
 use frame_support::{
 	ord_parameter_types, parameter_types,
-	traits::{FindAuthor, GenesisBuild, ValidatorRegistration},
+	traits::{ConstU32, FindAuthor, ValidatorRegistration},
 	PalletId,
 };
 use frame_system as system;
 use frame_system::EnsureSignedBy;
-use sp_core::H256;
+use sp_core::{ConstBool, H256};
 use sp_runtime::{
-	testing::{Header, UintAuthorityId},
+	testing::UintAuthorityId,
 	traits::{BlakeTwo256, IdentityLookup, OpaqueKeys},
-	Perbill, RuntimeAppPublic,
+	BuildStorage, Perbill, RuntimeAppPublic,
 };
 
 use super::*;
 use crate as collator_selection;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
-type Block = frame_system::mocking::MockBlock<Test>;
+type Block = frame_system::mocking::MockBlockU32<Test>;
 
 // Configure a mock runtime to test the pallet.
 frame_support::construct_runtime!(
@@ -64,12 +63,13 @@
 );
 
 parameter_types! {
-	pub const BlockHashCount: u64 = 250;
+	pub const BlockHashCount: u32 = 250;
 	pub const SS58Prefix: u8 = 42;
 }
 
 impl system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
+	type Block = Block;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
@@ -90,7 +90,7 @@
 	type SystemWeightInfo = ();
 	type SS58Prefix = SS58Prefix;
 	type OnSetCode = ();
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type MaxConsumers = ConstU32<16>;
 }
 
 parameter_types! {
@@ -113,6 +113,7 @@
 	type FreezeIdentifier = [u8; 16];
 	type MaxHolds = MaxHolds;
 	type MaxFreezes = MaxFreezes;
+	type RuntimeHoldReason = RuntimeHoldReason;
 }
 
 pub struct Author4;
@@ -145,6 +146,7 @@
 	type AuthorityId = sp_consensus_aura::sr25519::AuthorityId;
 	type MaxAuthorities = MaxAuthorities;
 	type DisabledValidators = ();
+	type AllowMultipleBlocksPerSlot = ConstBool<true>;
 }
 
 sp_runtime::impl_opaque_keys! {
@@ -162,27 +164,27 @@
 
 parameter_types! {
 	pub static SessionHandlerCollators: Vec<u64> = Vec::new();
-	pub static SessionChangeBlock: u64 = 0;
+	pub static SessionChangeBlock: u32 = 0;
 }
 
 pub struct TestSessionHandler;
 impl pallet_session::SessionHandler<u64> for TestSessionHandler {
 	const KEY_TYPE_IDS: &'static [sp_runtime::KeyTypeId] = &[UintAuthorityId::ID];
 	fn on_genesis_session<Ks: OpaqueKeys>(keys: &[(u64, Ks)]) {
-		SessionHandlerCollators::set(keys.into_iter().map(|(a, _)| *a).collect::<Vec<_>>())
+		SessionHandlerCollators::set(keys.iter().map(|(a, _)| *a).collect::<Vec<_>>())
 	}
 	fn on_new_session<Ks: OpaqueKeys>(_: bool, keys: &[(u64, Ks)], _: &[(u64, Ks)]) {
 		SessionChangeBlock::set(System::block_number());
 		dbg!(keys.len());
-		SessionHandlerCollators::set(keys.into_iter().map(|(a, _)| *a).collect::<Vec<_>>())
+		SessionHandlerCollators::set(keys.iter().map(|(a, _)| *a).collect::<Vec<_>>())
 	}
 	fn on_before_session_ending() {}
 	fn on_disabled(_: u32) {}
 }
 
 parameter_types! {
-	pub const Offset: u64 = 0;
-	pub const Period: u64 = 10;
+	pub const Offset: u32 = 0;
+	pub const Period: u32 = 10;
 }
 
 impl pallet_session::Config for Test {
@@ -201,7 +203,7 @@
 parameter_types! {
 	pub const MaxCollators: u32 = 5;
 	pub const LicenseBond: u64 = 10;
-	pub const KickThreshold: u64 = 10;
+	pub const KickThreshold: u32 = 10;
 	// the following values do not matter and are meaningless, etc.
 	pub const DefaultWeightToFeeCoefficient: u64 = 100_000;
 	pub const DefaultMinGasPrice: u64 = 100_000;
@@ -230,6 +232,7 @@
 
 impl Config for Test {
 	type RuntimeEvent = RuntimeEvent;
+	type RuntimeHoldReason = RuntimeHoldReason;
 	type UpdateOrigin = EnsureSignedBy<RootAccount, u64>;
 	type PotId = PotId;
 	type MaxCollators = MaxCollators;
@@ -238,7 +241,6 @@
 	type ValidatorId = <Self as frame_system::Config>::AccountId;
 	type ValidatorIdOf = IdentityCollator;
 	type ValidatorRegistration = IsRegistered;
-	type LicenceBondIdentifier = LicenceBondIdentifier;
 	type Currency = Balances;
 	type DesiredCollators = MaxCollators;
 	type LicenseBond = LicenseBond;
@@ -248,8 +250,8 @@
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	sp_tracing::try_init_simple();
-	let mut t = frame_system::GenesisConfig::default()
-		.build_storage::<Test>()
+	let mut t = <frame_system::GenesisConfig<Test>>::default()
+		.build_storage()
 		.unwrap();
 	let invulnerables = vec![1, 2];
 
@@ -284,9 +286,9 @@
 	t.into()
 }
 
-pub fn initialize_to_block(n: u64) {
+pub fn initialize_to_block(n: u32) {
 	for i in System::block_number() + 1..=n {
 		System::set_block_number(i);
-		<AllPalletsWithSystem as frame_support::traits::OnInitialize<u64>>::on_initialize(i);
+		<AllPalletsWithSystem as frame_support::traits::OnInitialize<u32>>::on_initialize(i);
 	}
 }

--- a/pallets/collator-selection/src/tests.rs
+++ b/pallets/collator-selection/src/tests.rs
@@ -32,10 +32,10 @@
 
 use frame_support::{
 	assert_noop, assert_ok,
-	traits::{fungible, GenesisBuild, OnInitialize},
+	traits::{fungible, OnInitialize},
 };
 use scale_info::prelude::*;
-use sp_runtime::{traits::BadOrigin, TokenError};
+use sp_runtime::{traits::BadOrigin, BuildStorage, TokenError};
 
 use crate::{self as collator_selection, mock::*, Config, Error};
 
@@ -464,8 +464,8 @@
 #[should_panic = "duplicate invulnerables in genesis."]
 fn cannot_set_genesis_value_twice() {
 	sp_tracing::try_init_simple();
-	let mut t = frame_system::GenesisConfig::default()
-		.build_storage::<Test>()
+	let mut t = <frame_system::GenesisConfig<Test>>::default()
+		.build_storage()
 		.unwrap();
 	let invulnerables = vec![1, 1];
 

--- a/pallets/identity/src/tests.rs
+++ b/pallets/identity/src/tests.rs
@@ -43,7 +43,6 @@
 use parity_scale_codec::{Decode, Encode};
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{BadOrigin, BlakeTwo256, IdentityLookup},
 	BuildStorage,
 };
@@ -51,8 +50,7 @@
 use super::*;
 use crate as pallet_identity;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
-type Block = frame_system::mocking::MockBlock<Test>;
+type Block = frame_system::mocking::MockBlockU32<Test>;
 
 frame_support::construct_runtime!(
 	pub enum Test {
@@ -79,7 +77,7 @@
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type RuntimeEvent = RuntimeEvent;
-	type BlockHashCount = ConstU64<250>;
+	type BlockHashCount = ConstU32<250>;
 	type DbWeight = ();
 	type Version = ();
 	type PalletInfo = PalletInfo;

3434
35use crate as pallet_inflation;35use crate as pallet_inflation;
3636
37type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
38type Block = frame_system::mocking::MockBlock<Test>;37type Block = frame_system::mocking::MockBlockU32<Test>;
3938
39// 6-second blocks
40// const YEAR: u32 = 2_629_800; // 12-second blocks
41// Expected 100-block inflation for year 1 is 100 * 100_000_000 / YEAR = FIRST_YEAR_BLOCK_INFLATION
40const YEAR: u64 = 5_259_600; // 6-second blocks42const YEAR: u32 = 5_259_600;
41							 // const YEAR: u64 = 2_629_800; // 12-second blocks
42							 // Expected 100-block inflation for year 1 is 100 * 100_000_000 / YEAR = FIRST_YEAR_BLOCK_INFLATION
43const FIRST_YEAR_BLOCK_INFLATION: u64 = 1901;43const FIRST_YEAR_BLOCK_INFLATION: u64 = 1901;
4444
45parameter_types! {45parameter_types! {
60	type FreezeIdentifier = ();60	type FreezeIdentifier = ();
61	type MaxHolds = ();61	type MaxHolds = ();
62	type MaxFreezes = ();62	type MaxFreezes = ();
63	type RuntimeHoldReason = RuntimeHoldReason;
63}64}
6465
65frame_support::construct_runtime!(66frame_support::construct_runtime!(
71);72);
7273
73parameter_types! {74parameter_types! {
74	pub const BlockHashCount: u64 = 250;75	pub const BlockHashCount: u32 = 250;
75	pub BlockWeights: frame_system::limits::BlockWeights =76	pub BlockWeights: frame_system::limits::BlockWeights =
76		frame_system::limits::BlockWeights::simple_max(Weight::from_parts(1024, 0));77		frame_system::limits::BlockWeights::simple_max(Weight::from_parts(1024, 0));
77	pub const SS58Prefix: u8 = 42;78	pub const SS58Prefix: u8 = 42;
78}79}
7980
80impl frame_system::Config for Test {81impl frame_system::Config for Test {
81	type BaseCallFilter = Everything;82	type BaseCallFilter = Everything;
83	type Block = Block;
82	type BlockWeights = ();84	type BlockWeights = ();
83	type BlockLength = ();85	type BlockLength = ();
84	type DbWeight = ();86	type DbWeight = ();
187fn inflation_second_deposit() {189fn inflation_second_deposit() {
188	new_test_ext().execute_with(|| {190	new_test_ext().execute_with(|| {
189		// Total issuance = 1_000_000_000191		// Total issuance = 1_000_000_000
190		let initial_issuance: u64 = 1_000_000_000;192		let initial_issuance = 1_000_000_000;
191		let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);193		let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);
192		assert_eq!(Balances::free_balance(1234), initial_issuance);194		assert_eq!(Balances::free_balance(1234), initial_issuance);
193		MockBlockNumberProvider::set(1);195		MockBlockNumberProvider::set(1);
196		assert_ok!(Inflation::start_inflation(RawOrigin::Root.into(), 1));198		assert_ok!(Inflation::start_inflation(RawOrigin::Root.into(), 1));
197199
198		// Next inflation deposit happens when block is greater then or equal to NextInflationBlock200		// Next inflation deposit happens when block is greater then or equal to NextInflationBlock
199		let mut block: u64 = 2;201		let mut block = 2;
200		let balance_before: u64 = Balances::free_balance(1234);202		let balance_before = Balances::free_balance(1234);
201		while block < <pallet_inflation::NextInflationBlock<Test>>::get() {203		while block < <pallet_inflation::NextInflationBlock<Test>>::get() {
202			MockBlockNumberProvider::set(block as u64);204			MockBlockNumberProvider::set(block);
203			Inflation::on_initialize(0);205			Inflation::on_initialize(0);
204			block += 1;206			block += 1;
205		}207		}
206		let balance_just_before: u64 = Balances::free_balance(1234);208		let balance_just_before = Balances::free_balance(1234);
207		assert_eq!(balance_before, balance_just_before);209		assert_eq!(balance_before, balance_just_before);
208210
209		// The block with inflation211		// The block with inflation
210		MockBlockNumberProvider::set(block as u64);212		MockBlockNumberProvider::set(block);
211		Inflation::on_initialize(0);213		Inflation::on_initialize(0);
212		let balance_after: u64 = Balances::free_balance(1234);214		let balance_after = Balances::free_balance(1234);
213		assert_eq!(balance_after - balance_just_before, block_inflation!());215		assert_eq!(balance_after - balance_just_before, block_inflation!());
214	});216	});
215}217}
234			Inflation::on_initialize(0);236			Inflation::on_initialize(0);
235		}237		}
236		assert_eq!(238		assert_eq!(
237			initial_issuance + (FIRST_YEAR_BLOCK_INFLATION * (YEAR / 100)),239			initial_issuance + (FIRST_YEAR_BLOCK_INFLATION * ((YEAR as u64) / 100)),
238			<Balances as Inspect<_>>::total_issuance()240			<Balances as Inspect<_>>::total_issuance()
239		);241		);
240242
243		let block_inflation_year_2 = block_inflation!();245		let block_inflation_year_2 = block_inflation!();
244		// Expected 100-block inflation for year 2: 100 * 9.33% * initial issuance * 110% / YEAR == 1951246		// Expected 100-block inflation for year 2: 100 * 9.33% * initial issuance * 110% / YEAR == 1951
245		let expecter_year_2_inflation: u64 = (initial_issuance247		let expecter_year_2_inflation: u64 = (initial_issuance
246			+ FIRST_YEAR_BLOCK_INFLATION * YEAR / 100)248			+ FIRST_YEAR_BLOCK_INFLATION * (YEAR as u64) / 100)
247			* 933 * 100 / (10000 * YEAR);249			* 933 * 100 / (10000 * (YEAR as u64));
248		assert_eq!(block_inflation_year_2 / 10, expecter_year_2_inflation / 10); // divide by 10 for approx. equality250		assert_eq!(block_inflation_year_2 / 10, expecter_year_2_inflation / 10); // divide by 10 for approx. equality
249	});251	});
250}252}
253fn inflation_start_large_kusama_block() {255fn inflation_start_large_kusama_block() {
254	new_test_ext().execute_with(|| {256	new_test_ext().execute_with(|| {
255		// Total issuance = 1_000_000_000257		// Total issuance = 1_000_000_000
256		let initial_issuance: u64 = 1_000_000_000;258		let initial_issuance = 1_000_000_000;
257		let start_block: u64 = 10457457;259		let start_block = 10457457;
258		let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);260		let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);
259		assert_eq!(Balances::free_balance(1234), initial_issuance);261		assert_eq!(Balances::free_balance(1234), initial_issuance);
260		MockBlockNumberProvider::set(start_block);262		MockBlockNumberProvider::set(start_block);
273			Inflation::on_initialize(0);275			Inflation::on_initialize(0);
274		}276		}
275		assert_eq!(277		assert_eq!(
276			initial_issuance + (FIRST_YEAR_BLOCK_INFLATION * (YEAR / 100)),278			initial_issuance + (FIRST_YEAR_BLOCK_INFLATION * ((YEAR as u64) / 100)),
277			<Balances as Inspect<_>>::total_issuance()279			<Balances as Inspect<_>>::total_issuance()
278		);280		);
279281
282		let block_inflation_year_2 = block_inflation!();284		let block_inflation_year_2 = block_inflation!();
283		// Expected 100-block inflation for year 2: 100 * 9.33% * initial issuance * 110% / YEAR == 1951285		// Expected 100-block inflation for year 2: 100 * 9.33% * initial issuance * 110% / YEAR == 1951
284		let expecter_year_2_inflation: u64 = (initial_issuance286		let expecter_year_2_inflation: u64 = (initial_issuance
285			+ FIRST_YEAR_BLOCK_INFLATION * YEAR / 100)287			+ FIRST_YEAR_BLOCK_INFLATION * (YEAR as u64) / 100)
286			* 933 * 100 / (10000 * YEAR);288			* 933 * 100 / (10000 * (YEAR as u64));
287		assert_eq!(block_inflation_year_2 / 10, expecter_year_2_inflation / 10); // divide by 10 for approx. equality289		assert_eq!(block_inflation_year_2 / 10, expecter_year_2_inflation / 10); // divide by 10 for approx. equality
288	});290	});
289}291}
320#[test]322#[test]
321fn inflation_rate_by_year() {323fn inflation_rate_by_year() {
322	new_test_ext().execute_with(|| {324	new_test_ext().execute_with(|| {
323		let payouts: u64 = YEAR / InflationBlockInterval::get() as u64;325		let payouts = (YEAR / InflationBlockInterval::get()) as u64;
324326
325		// Inflation starts at 10% and does down by 2/3% every year until year 9 (included),327		// Inflation starts at 10% and does down by 2/3% every year until year 9 (included),
326		// then it is flat.328		// then it is flat.
327		let payout_by_year: [u64; 11] = [1000, 933, 867, 800, 733, 667, 600, 533, 467, 400, 400];329		let payout_by_year: [u64; 11] = [1000, 933, 867, 800, 733, 667, 600, 533, 467, 400, 400];
328330
329		// For accuracy total issuance = payout0 * payouts * 10;331		// For accuracy total issuance = payout0 * payouts * 10;
330		let initial_issuance: u64 = payout_by_year[0] * payouts * 10;332		let initial_issuance = payout_by_year[0] * payouts * 10;
331		let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);333		let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);
332		assert_eq!(Balances::free_balance(1234), initial_issuance);334		assert_eq!(Balances::free_balance(1234), initial_issuance);
333335

--- a/runtime/common/tests/mod.rs
+++ b/runtime/common/tests/mod.rs
@@ -19,7 +19,7 @@
 use sp_runtime::{BuildStorage, Storage};
 use up_common::types::AuraId;
 
-use crate::{BuildGenesisConfig, ParachainInfoConfig, Runtime, RuntimeEvent, System};
+use crate::{ParachainInfoConfig, Runtime, RuntimeEvent, RuntimeGenesisConfig, System};
 pub type Balance = u128;
 
 pub mod xcm;
@@ -51,8 +51,8 @@
 fn new_test_ext(balances: Vec<(AccountId, Balance)>) -> sp_io::TestExternalities {
 	let mut storage = make_basic_storage();
 
-	pallet_balances::BuildGenesisConfig::<Runtime> { balances }
-		.build_storage(&mut storage)
+	pallet_balances::GenesisConfig::<Runtime> { balances }
+		.assimilate_storage(&mut storage)
 		.unwrap();
 
 	let mut ext = sp_io::TestExternalities::new(storage);
@@ -95,7 +95,7 @@
 		.map(|acc| get_account_id_from_seed::<sr25519::Public>(acc))
 		.collect::<Vec<_>>();
 
-	let cfg = BuildGenesisConfig {
+	let cfg = RuntimeGenesisConfig {
 		collator_selection: CollatorSelectionConfig { invulnerables },
 		session: SessionConfig { keys },
 		parachain_info: ParachainInfoConfig {
@@ -112,7 +112,7 @@
 fn make_basic_storage() -> Storage {
 	use crate::AuraConfig;
 
-	let cfg = BuildGenesisConfig {
+	let cfg = RuntimeGenesisConfig {
 		aura: AuraConfig {
 			authorities: vec![
 				get_from_seed::<AuraId>("Alice"),

--- a/runtime/common/tests/xcm.rs
+++ b/runtime/common/tests/xcm.rs
@@ -52,9 +52,9 @@
 
 		let xcm_event = &last_events(1)[0];
 		match xcm_event {
-			RuntimeEvent::PolkadotXcm(pallet_xcm::Event::<Runtime>::Attempted(
-				Outcome::Incomplete(_weight, Error::NoPermission),
-			)) => { /* Pass */ }
+			RuntimeEvent::PolkadotXcm(pallet_xcm::Event::<Runtime>::Attempted {
+				outcome: Outcome::Incomplete(_weight, Error::NoPermission),
+			}) => { /* Pass */ }
 			_ => panic!(
 				"Expected PolkadotXcm.Attempted(Incomplete(_weight, NoPermission)),\
 				found: {xcm_event:#?}"

--- a/runtime/tests/src/lib.rs
+++ b/runtime/tests/src/lib.rs
@@ -33,23 +33,20 @@
 use scale_info::TypeInfo;
 use sp_core::{H160, H256, U256};
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
+	BuildStorage,
 };
 use up_data_structs::mapping::{CrossTokenAddressMapping, EvmTokenAddressMapping};
 
-#[path = "../../common/dispatch.rs"]
 mod dispatch;
 
 use dispatch::CollectionDispatchT;
 
-#[path = "../../common/weights/mod.rs"]
 mod weights;
 
 use weights::CommonWeights;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
-type Block = frame_system::mocking::MockBlock<Test>;
+type Block = frame_system::mocking::MockBlockU32<Test>;
 
 #[cfg(test)]
 mod tests;
@@ -73,13 +70,14 @@
 );
 
 parameter_types! {
-	pub const BlockHashCount: u64 = 250;
+	pub const BlockHashCount: u32 = 250;
 	pub const SS58Prefix: u8 = 42;
 }
 
 impl system::Config for Test {
 	type RuntimeEvent = RuntimeEvent;
 	type BaseCallFilter = Everything;
+	type Block = Block;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
@@ -120,6 +118,7 @@
 	type MaxFreezes = MaxLocks;
 	type FreezeIdentifier = [u8; 8];
 	type MaxHolds = MaxLocks;
+	type RuntimeHoldReason = RuntimeHoldReason;
 }
 
 parameter_types! {
@@ -232,6 +231,7 @@
 	type OnMethodCall = ();
 	type OnCreate = ();
 	type OnChargeTransaction = ();
+	type OnCheckEvmTransaction = ();
 	type FindAuthor = ();
 	type BlockHashMapping = SubstrateBlockHashMapping<Self>;
 	type Timestamp = Timestamp;
@@ -296,8 +296,8 @@
 
 // Build genesis storage according to the mock runtime.
 pub fn new_test_ext() -> sp_io::TestExternalities {
-	system::GenesisConfig::default()
-		.build_storage::<Test>()
+	<system::GenesisConfig<Test>>::default()
+		.build_storage()
 		.unwrap()
 		.into()
 }