git.delta.rocks / unique-network / refs/commits / 8a37f3ec9fdf

--- a/pallets/inflation/src/lib.rs
+++ b/pallets/inflation/src/lib.rs
@@ -46,8 +46,8 @@
 pub type BalanceOf<T> =
 	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
-// pub const YEAR: u32 = 5_259_600; // 6-second block 
-pub const YEAR: u32 = 2_629_800; // 12-second block 
+// pub const YEAR: u32 = 5_259_600; // 6-second block
+pub const YEAR: u32 = 2_629_800; // 12-second block
 pub const TOTAL_YEARS_UNTIL_FLAT: u32 = 9;
 pub const START_INFLATION_PERCENT: u32 = 10;
 pub const END_INFLATION_PERCENT: u32 = 4;

--- a/pallets/scheduler/src/lib.rs
+++ b/pallets/scheduler/src/lib.rs
@@ -738,9 +738,7 @@
 	use super::*;
 
 	use frame_support::{
-		ord_parameter_types, parameter_types,
-		traits::Contains,
-		weights::constants::RocksDbWeight,
+		ord_parameter_types, parameter_types, traits::Contains, weights::constants::RocksDbWeight,
 	};
 	use sp_core::H256;
 	use sp_runtime::{

167		for (index, data) in items_data.into_iter().enumerate() {179		for (index, data) in items_data.into_iter().enumerate() {
168			let item = <pallet_nonfungible::TokenData<Test>>::get((CollectionId(1), TokenId((index + 1) as u32))).unwrap();180			let item = <pallet_nonfungible::TokenData<Test>>::get((
181				CollectionId(1),
182				TokenId((index + 1) as u32),
183			))
184			.unwrap();
169			assert_eq!(item.const_data.to_vec(), data.const_data.into_inner());185			assert_eq!(item.const_data.to_vec(), data.const_data.into_inner());
213		for (index, data) in items_data.into_iter().enumerate() {230		for (index, data) in items_data.into_iter().enumerate() {
214			let item = <pallet_refungible::TokenData<Test>>::get((CollectionId(1), TokenId((index + 1) as u32)));231			let item = <pallet_refungible::TokenData<Test>>::get((
232				CollectionId(1),
233				TokenId((index + 1) as u32),
234			));
215			let balance = <pallet_refungible::Balance<Test>>::get((CollectionId(1), TokenId(1), account(1)));235			let balance =
236				<pallet_refungible::Balance<Test>>::get((CollectionId(1), TokenId(1), account(1)));
483			account(3)684			account(3)
484		));685		));
485686
486		// Account 1 approves account 2 for NFT 1 687		// Account 1 approves account 2 for NFT 1
487		assert_ok!(TemplateModule::approve(688		assert_ok!(TemplateModule::approve(
488			origin1.clone(),689			origin1.clone(),
489			account(2),690			account(2),