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

--- a/pallets/scheduler/src/lib.rs
+++ b/pallets/scheduler/src/lib.rs
@@ -704,45 +704,64 @@
 	use frame_system::{EnsureRoot, EnsureSignedBy};
 	use crate as scheduler;
 
-	mod logger {
-		use super::*;
+	#[frame_support::pallet]
+	pub mod logger {
+		use super::{OriginCaller, OriginTrait};
+		use frame_support::pallet_prelude::*;
+		use frame_system::pallet_prelude::*;
 		use std::cell::RefCell;
 
 		thread_local! {
 			static LOG: RefCell<Vec<(OriginCaller, u32)>> = RefCell::new(Vec::new());
 		}
-		pub trait Config: system::Config {
-			type Event: From<Event> + Into<<Self as system::Config>::Event>;
+		pub fn log() -> Vec<(OriginCaller, u32)> {
+			LOG.with(|log| log.borrow().clone())
 		}
-		decl_event! {
-			pub enum Event {
-				Logged(u32, Weight),
-			}
+
+		#[pallet::pallet]
+		#[pallet::generate_store(pub(super) trait Store)]
+		pub struct Pallet<T>(PhantomData<T>);
+
+		#[pallet::hooks]
+		impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+		#[pallet::config]
+		pub trait Config: frame_system::Config {
+			type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 		}
-		decl_module! {
-			pub struct Module<T: Config> for enum Call
-			where
-				origin: <T as system::Config>::Origin,
-				<T as system::Config>::Origin: OriginTrait<PalletsOrigin = OriginCaller>
-			{
-				fn deposit_event() = default;
 
-				#[weight = *weight]
-				fn log(origin, i: u32, weight: Weight) {
-					Self::deposit_event(Event::Logged(i, weight));
-					LOG.with(|log| {
-						log.borrow_mut().push((origin.caller().clone(), i));
-					})
-				}
+		#[pallet::event]
+		#[pallet::generate_deposit(pub(super) fn deposit_event)]
+		pub enum Event<T: Config> {
+			Logged(u32, Weight),
+		}
 
-				#[weight = *weight]
-				fn log_without_filter(origin, i: u32, weight: Weight) {
-					Self::deposit_event(Event::Logged(i, weight));
-					LOG.with(|log| {
-						log.borrow_mut().push((origin.caller().clone(), i));
-					})
-				}
+		#[pallet::call]
+		impl<T: Config> Pallet<T>
+		where
+			<T as frame_system::Config>::Origin: OriginTrait<PalletsOrigin = OriginCaller>,
+		{
+			#[pallet::weight(*weight)]
+			pub fn log(origin: OriginFor<T>, i: u32, weight: Weight) -> DispatchResult {
+				Self::deposit_event(Event::Logged(i, weight));
+				LOG.with(|log| {
+					log.borrow_mut().push((origin.caller().clone(), i));
+				});
+				Ok(())
 			}
+
+			#[pallet::weight(*weight)]
+			pub fn log_without_filter(
+				origin: OriginFor<T>,
+				i: u32,
+				weight: Weight,
+			) -> DispatchResult {
+				Self::deposit_event(Event::Logged(i, weight));
+				LOG.with(|log| {
+					log.borrow_mut().push((origin.caller().clone(), i));
+				});
+				Ok(())
+			}
 		}
 	}
 
@@ -756,7 +775,7 @@
 			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
 			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-			Logger: logger::{Pallet, Call, Event},
+			Logger: logger::{Pallet, Call, Event<T>},
 			Scheduler: scheduler::{Pallet, Call, Storage, Event<T>},
 		}
 	);

--- a/pallets/unique/src/mock.rs
+++ b/pallets/unique/src/mock.rs
@@ -101,13 +101,12 @@
 }
 
 parameter_types! {
-	pub const TransactionByteFee: u64 = 1;
 	pub const OperationalFeeMultiplier: u8 = 5;
 }
 
 impl pallet_transaction_payment::Config for Test {
 	type OnChargeTransaction = CurrencyAdapter<pallet_balances::Pallet<Test>, ()>;
-	type TransactionByteFee = TransactionByteFee;
+	type LengthToFee = IdentityFee<u64>;
 	type WeightToFee = IdentityFee<u64>;
 	type FeeMultiplierUpdate = ();
 	type OperationalFeeMultiplier = OperationalFeeMultiplier;
@@ -176,12 +175,7 @@
 
 pub struct TestEtheremTransactionSender;
 impl pallet_ethereum::EthereumTransactionSender for TestEtheremTransactionSender {
-	fn submit_logs_transaction(
-		_source: H160,
-		_tx: pallet_ethereum::Transaction,
-		_logs: Vec<MaybeMirroredLog>,
-	) {
-	}
+	fn submit_logs_transaction(_source: H160, _logs: Vec<MaybeMirroredLog>) {}
 }
 
 impl pallet_evm_coder_substrate::Config for Test {

18use super::*;18use super::*;
19use crate::mock::*;19use crate::mock::*;
20use crate::{AccessMode, CollectionMode};20use crate::{AccessMode, CollectionMode};
21use sp_runtime::AccountId32;
22use up_data_structs::{21use up_data_structs::{
23	COLLECTION_NUMBER_LIMIT, CollectionId, CreateItemData, CreateFungibleData, CreateNftData,22	COLLECTION_NUMBER_LIMIT, CollectionId, CreateItemData, CreateFungibleData, CreateNftData,
24	CreateReFungibleData, MAX_DECIMAL_POINTS, COLLECTION_ADMINS_LIMIT, MetaUpdatePermission,23	CreateReFungibleData, MAX_DECIMAL_POINTS, COLLECTION_ADMINS_LIMIT, MetaUpdatePermission,