git.delta.rocks / unique-network / refs/commits / 5c283c1e8412

--- a/pallets/collator-selection/Cargo.toml
+++ b/pallets/collator-selection/Cargo.toml
@@ -55,9 +55,12 @@
 	"frame-system/std",
 	"log/std",
 	"pallet-authorship/std",
+	'pallet-aura/std',
+	'pallet-balances/std',
 	"pallet-session/std",
 	"rand/std",
 	"scale-info/std",
+	"sp-consensus-aura/std",
 	"sp-runtime/std",
 	"sp-staking/std",
 	"sp-std/std",

--- a/pallets/collator-selection/src/mock.rs
+++ b/pallets/collator-selection/src/mock.rs
@@ -102,6 +102,8 @@
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 5;
 	pub const MaxReserves: u32 = 50;
+	pub const MaxHolds: u32 = 2;
+	pub const MaxFreezes: u32 = 2;
 }
 
 impl pallet_balances::Config for Test {
@@ -114,6 +116,10 @@
 	type MaxLocks = ();
 	type MaxReserves = MaxReserves;
 	type ReserveIdentifier = [u8; 8];
+	type HoldIdentifier = [u8; 16];
+	type FreezeIdentifier = [u8; 16];
+	type MaxHolds = MaxHolds;
+	type MaxFreezes = MaxFreezes;
 }
 
 pub struct Author4;
@@ -209,6 +215,7 @@
 	pub const MaxXcmAllowedLocations: u32 = 16;
 	pub AppPromotionDailyRate: Perbill = Perbill::from_rational(5u32, 10_000);
 	pub const DayRelayBlocks: u32 = 1;
+	pub const LicenceBondIdentifier: [u8; 16] = *b"licenceidentifie";
 }
 
 impl pallet_configuration::Config for Test {
@@ -257,6 +264,7 @@
 	type ValidatorId = <Self as frame_system::Config>::AccountId;
 	type ValidatorIdOf = IdentityCollator;
 	type ValidatorRegistration = IsRegistered;
+	type LicenceBondIdentifier = LicenceBondIdentifier;
 	type WeightInfo = ();
 }
 
@@ -267,7 +275,9 @@
 		.unwrap();
 	let invulnerables = vec![1, 2];
 
-	let balances = vec![(1, 100), (2, 100), (3, 100), (4, 100), (5, 100)];
+	let ed = <Test as pallet_balances::Config>::ExistentialDeposit::get();
+
+	let balances = vec![(1, 100), (2, 100), (3, 100), (4, 100), (5, 100), (33, ed)];
 	let keys = balances
 		.iter()
 		.map(|&(i, _)| {

--- a/pallets/collator-selection/src/tests.rs
+++ b/pallets/collator-selection/src/tests.rs
@@ -34,16 +34,16 @@
 use crate::{mock::*, Error};
 use frame_support::{
 	assert_noop, assert_ok,
-	traits::{Currency, GenesisBuild, OnInitialize},
+	traits::{fungible, GenesisBuild, OnInitialize},
 };
 use frame_system::RawOrigin;
-use pallet_balances::Error as BalancesError;
-use sp_runtime::traits::BadOrigin;
+use sp_runtime::{traits::BadOrigin, TokenError};
 use pallet_configuration::{
 	CollatorSelectionDesiredCollatorsOverride as DesiredCollators,
 	CollatorSelectionKickThresholdOverride as KickThreshold,
 	CollatorSelectionLicenseBondOverride as LicenseBond,
 };
+use scale_info::prelude::*;
 
 fn get_license_and_onboard(account_id: <Test as frame_system::Config>::AccountId) {
 	assert_ok!(CollatorSelection::get_license(RuntimeOrigin::signed(
@@ -226,8 +226,9 @@
 #[test]
 fn cannot_obtain_license_if_poor() {
 	new_test_ext().execute_with(|| {
+		let ed = <Test as pallet_balances::Config>::ExistentialDeposit::get();
 		assert_eq!(Balances::free_balance(&3), 100);
-		assert_eq!(Balances::free_balance(&33), 0);
+		assert_eq!(Balances::free_balance(&33), ed);
 
 		// works
 		assert_ok!(CollatorSelection::get_license(RuntimeOrigin::signed(3)));
@@ -235,7 +236,7 @@
 		// poor
 		assert_noop!(
 			CollatorSelection::get_license(RuntimeOrigin::signed(33)),
-			BalancesError::<Test>::InsufficientBalance,
+			TokenError::FundsUnavailable,
 		);
 	});
 }
@@ -417,10 +418,7 @@
 fn authorship_event_handler() {
 	new_test_ext().execute_with(|| {
 		// put 100 in the pot + 5 for ED
-		<pallet_balances::Pallet<T> as fungible::Mutate<T::AccountId>>::set_balance(
-			&CollatorSelection::account_id(),
-			105,
-		);
+		<Balances as fungible::Mutate<_>>::set_balance(&CollatorSelection::account_id(), 105);
 
 		// 4 is the default author.
 		assert_eq!(Balances::free_balance(4), 100);
@@ -444,10 +442,7 @@
 		// Nothing panics, no reward when no ED in balance
 		Authorship::on_initialize(1);
 		// put some money into the pot at ED
-		<pallet_balances::Pallet<T> as fungible::Mutate<T::AccountId>>::set_balance(
-			&CollatorSelection::account_id(),
-			5,
-		);
+		<Balances as fungible::Mutate<_>>::set_balance(&CollatorSelection::account_id(), 5);
 		// 4 is the default author.
 		assert_eq!(Balances::free_balance(4), 100);
 		get_license_and_onboard(4);

--- a/pallets/foreign-assets/Cargo.toml
+++ b/pallets/foreign-assets/Cargo.toml
@@ -42,5 +42,6 @@
 	"sp-runtime/std",
 	"sp-std/std",
 	"up-data-structs/std",
+	"xcm-executor/std"
 ]
 try-runtime = ["frame-support/try-runtime"]

--- a/pallets/identity/Cargo.toml
+++ b/pallets/identity/Cargo.toml
@@ -46,5 +46,6 @@
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
+	"pallet-balances/std",
 ]
 try-runtime = ["frame-support/try-runtime"]

--- a/pallets/identity/src/tests.rs
+++ b/pallets/identity/src/tests.rs
@@ -106,6 +106,10 @@
 	type MaxReserves = ();
 	type ReserveIdentifier = [u8; 8];
 	type WeightInfo = ();
+	type HoldIdentifier = ();
+	type FreezeIdentifier = ();
+	type MaxHolds = ();
+	type MaxFreezes = ();
 }
 
 parameter_types! {

--- a/pallets/inflation/src/lib.rs
+++ b/pallets/inflation/src/lib.rs
@@ -187,12 +187,11 @@
 				<NextInflationBlock<T>>::set(inflation_start_relay_block + block_interval.into());
 
 				// First time deposit - create Treasury account so that we can call deposit_into_existing everywhere else
-				let imbalance = T::Currency::deposit(
+				let _ = T::Currency::deposit(
 					&T::TreasuryAccountId::get(),
 					<BlockInflation<T>>::get(),
 					Precision::Exact,
 				)?;
-				debug_assert!(imbalance.peek().is_zero());
 			}
 
 			Ok(())

2020
21use frame_support::{21use frame_support::{
22	assert_ok, parameter_types,22	assert_ok, parameter_types,
23	traits::{Currency, OnInitialize, Everything, ConstU32},23	traits::{fungible::{Balanced, Inspect}, OnInitialize, Everything, ConstU32, tokens::Precision},
24	weights::Weight,24	weights::Weight,
25};25};
26use frame_system::RawOrigin;26use frame_system::RawOrigin;
53	type MaxLocks = MaxLocks;53	type MaxLocks = MaxLocks;
54	type MaxReserves = ();54	type MaxReserves = ();
55	type ReserveIdentifier = ();55	type ReserveIdentifier = ();
56	type HoldIdentifier = ();
57	type FreezeIdentifier = ();
58	type MaxHolds = ();
59	type MaxFreezes = ();
56}60}
5761
58frame_support::construct_runtime!(62frame_support::construct_runtime!(
141fn uninitialized_inflation() {145fn uninitialized_inflation() {
142	new_test_ext().execute_with(|| {146	new_test_ext().execute_with(|| {
143		let initial_issuance: u64 = 1_000_000_000;147		let initial_issuance: u64 = 1_000_000_000;
144		let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);148		let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);
145		assert_eq!(Balances::free_balance(1234), initial_issuance);149		assert_eq!(Balances::free_balance(1234), initial_issuance);
146150
147		// BlockInflation should be set after inflation is started151		// BlockInflation should be set after inflation is started
157	new_test_ext().execute_with(|| {161	new_test_ext().execute_with(|| {
158		// Total issuance = 1_000_000_000162		// Total issuance = 1_000_000_000
159		let initial_issuance: u64 = 1_000_000_000;163		let initial_issuance: u64 = 1_000_000_000;
160		let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);164		let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);
161		assert_eq!(Balances::free_balance(1234), initial_issuance);165		assert_eq!(Balances::free_balance(1234), initial_issuance);
162166
163		// BlockInflation should be set after inflation is started167		// BlockInflation should be set after inflation is started
187	new_test_ext().execute_with(|| {191	new_test_ext().execute_with(|| {
188		// Total issuance = 1_000_000_000192		// Total issuance = 1_000_000_000
189		let initial_issuance: u64 = 1_000_000_000;193		let initial_issuance: u64 = 1_000_000_000;
190		let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);194		let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);
191		assert_eq!(Balances::free_balance(1234), initial_issuance);195		assert_eq!(Balances::free_balance(1234), initial_issuance);
192		MockBlockNumberProvider::set(1);196		MockBlockNumberProvider::set(1);
193197
218	new_test_ext().execute_with(|| {222	new_test_ext().execute_with(|| {
219		// Total issuance = 1_000_000_000223		// Total issuance = 1_000_000_000
220		let initial_issuance: u64 = 1_000_000_000;224		let initial_issuance: u64 = 1_000_000_000;
221		let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);225		let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);
222		assert_eq!(Balances::free_balance(1234), initial_issuance);226		assert_eq!(Balances::free_balance(1234), initial_issuance);
223		MockBlockNumberProvider::set(1);227		MockBlockNumberProvider::set(1);
224228
234		}238		}
235		assert_eq!(239		assert_eq!(
236			initial_issuance + (FIRST_YEAR_BLOCK_INFLATION * (YEAR / 100)),240			initial_issuance + (FIRST_YEAR_BLOCK_INFLATION * (YEAR / 100)),
237			<Balances as Currency<_>>::total_issuance()241			<Balances as Inspect<_>>::total_issuance()
238		);242		);
239243
240		MockBlockNumberProvider::set(YEAR + 1);244		MockBlockNumberProvider::set(YEAR + 1);
254		// Total issuance = 1_000_000_000258		// Total issuance = 1_000_000_000
255		let initial_issuance: u64 = 1_000_000_000;259		let initial_issuance: u64 = 1_000_000_000;
256		let start_block: u64 = 10457457;260		let start_block: u64 = 10457457;
257		let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);261		let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);
258		assert_eq!(Balances::free_balance(1234), initial_issuance);262		assert_eq!(Balances::free_balance(1234), initial_issuance);
259		MockBlockNumberProvider::set(start_block);263		MockBlockNumberProvider::set(start_block);
260264
273		}277		}
274		assert_eq!(278		assert_eq!(
275			initial_issuance + (FIRST_YEAR_BLOCK_INFLATION * (YEAR / 100)),279			initial_issuance + (FIRST_YEAR_BLOCK_INFLATION * (YEAR / 100)),
276			<Balances as Currency<_>>::total_issuance()280			<Balances as Inspect<_>>::total_issuance()
277		);281		);
278282
279		MockBlockNumberProvider::set(start_block + YEAR + 1);283		MockBlockNumberProvider::set(start_block + YEAR + 1);
292	new_test_ext().execute_with(|| {296	new_test_ext().execute_with(|| {
293		// Total issuance = 1_000_000_000297		// Total issuance = 1_000_000_000
294		let initial_issuance: u64 = 1_000_000_000;298		let initial_issuance: u64 = 1_000_000_000;
295		let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);299		let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);
296		assert_eq!(Balances::free_balance(1234), initial_issuance);300		assert_eq!(Balances::free_balance(1234), initial_issuance);
297		MockBlockNumberProvider::set(YEAR * 9 + 1);301		MockBlockNumberProvider::set(YEAR * 9 + 1);
298302
327331
328		// For accuracy total issuance = payout0 * payouts * 10;332		// For accuracy total issuance = payout0 * payouts * 10;
329		let initial_issuance: u64 = payout_by_year[0] * payouts * 10;333		let initial_issuance: u64 = payout_by_year[0] * payouts * 10;
330		let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);334		let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);
331		assert_eq!(Balances::free_balance(1234), initial_issuance);335		assert_eq!(Balances::free_balance(1234), initial_issuance);
332336
333		// Start inflation as sudo337		// Start inflation as sudo