git.delta.rocks / unique-network / refs/commits / 79a50fe0450d

--- a/pallets/nft-charge-transaction/src/lib.rs
+++ b/pallets/nft-charge-transaction/src/lib.rs
@@ -135,10 +135,10 @@
         }
 
         // check errors
-        let error = <pallet_nft_transaction_payment::Module<T>>::check_error(who, call);
-        match error {
-            Err(error) => return Err(error),
-            Ok(error) => {}
+        let _error = <pallet_nft_transaction_payment::Module<T>>::check_error(who, call);
+        match _error {
+            Err(_error) => return Err(_error),
+            Ok(_error) => {}
         };
 
         // Determine who is paying transaction fee based on ecnomic model

--- a/pallets/nft-transaction-payment/src/lib.rs
+++ b/pallets/nft-transaction-payment/src/lib.rs
@@ -140,7 +140,7 @@
             },
             Some(pallet_nft::Call::set_variable_meta_data(collection_id, item_id, data)) => {
 
-                Self::withdraw_set_variable_meta_data(who, collection_id, item_id, &data)
+                Self::withdraw_set_variable_meta_data(collection_id, item_id, &data)
 			},
 			_ => None,
         };
@@ -175,7 +175,7 @@
 		let collection = pallet_nft::CollectionById::<T>::get(collection_id)?;
 
 		// sponsor timeout
-		let block_number = <frame_system::Module<T>>::block_number() as T::BlockNumber;
+		let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
 
 		let limit = collection.limits.sponsor_transfer_timeout;
 		if pallet_nft::CreateItemBasket::<T>::contains_key((collection_id, &who)) {
@@ -212,7 +212,7 @@
 			let collection_mode = collection.mode.clone();
 
 			// sponsor timeout
-			let block_number = <frame_system::Module<T>>::block_number() as T::BlockNumber;
+			let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
 			sponsor_transfer = match collection_mode {
 				CollectionMode::NFT => {
 
@@ -246,7 +246,7 @@
 						limits.fungible_sponsor_transfer_timeout
 					};
 
-					let block_number = <frame_system::Module<T>>::block_number() as T::BlockNumber;
+					let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
 					let mut sponsored = true;
 					if pallet_nft::FungibleTransferBasket::<T>::contains_key(collection_id, who) {
 						let last_tx_block = pallet_nft::FungibleTransferBasket::<T>::get(collection_id, who);
@@ -299,7 +299,6 @@
 	}
 	
 	pub fn withdraw_set_variable_meta_data(
-		who: &T::AccountId,
 		collection_id: &CollectionId,
 		item_id: &TokenId,
 		data: &Vec<u8>,
@@ -317,7 +316,7 @@
 			data.len() <= collection.limits.sponsored_data_size as usize
 		{
 			if let Some(rate_limit) = collection.limits.sponsored_data_rate_limit {
-				let block_number = <frame_system::Module<T>>::block_number() as T::BlockNumber;
+				let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
 
 				if pallet_nft::VariableMetaDataBasket::<T>::get(collection_id, item_id)
 					.map(|last_block| block_number - last_block > rate_limit)
@@ -358,7 +357,7 @@
 		let mut sponsor_transfer = false;
 		if pallet_nft::ContractSponsoringRateLimit::<T>::contains_key(called_contract.clone()) {
 			let last_tx_block = pallet_nft::ContractSponsorBasket::<T>::get((&called_contract, &who));
-			let block_number = <frame_system::Module<T>>::block_number() as T::BlockNumber;
+			let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
 			let rate_limit = pallet_nft::ContractSponsoringRateLimit::<T>::get(&called_contract);
 			let limit_time = last_tx_block + rate_limit;
 
@@ -390,7 +389,7 @@
 	T::AccountId: UncheckedFrom<T::Hash>
 	{
 
-		let new_contract_address = <pallet_contracts::Module<T>>::contract_address(
+		let new_contract_address = <pallet_contracts::Pallet<T>>::contract_address(
 			&who,
 			code_hash,
 			salt,

--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -13,7 +13,6 @@
 #[cfg(feature = "std")]
 pub use serde::*;
 
-use codec::{Decode, Encode};
 pub use frame_support::{
     construct_runtime, decl_event, decl_module, decl_storage, decl_error,
     dispatch::DispatchResult,

18extern crate pallet_nft;18extern crate pallet_nft;
19pub use pallet_nft::*;19pub use pallet_nft::*;
20use nft_data_structs::*;20use nft_data_structs::*;
21// use crate::Runtime;
22
23use sp_runtime::AccountId32;
24use crate::Vec;
2521
26/// Create item parameters22/// Create item parameters
27#[derive(Debug, PartialEq, Encode, Decode)]23#[derive(Debug, PartialEq, Encode, Decode)]

--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -22,8 +22,8 @@
     Permill, Perbill, Percent,
     create_runtime_str, generic, impl_opaque_keys,
     traits::{
-        AccountIdLookup, Convert, ConvertInto, BlakeTwo256, Block as BlockT, IdentifyAccount, 
-		IdentityLookup, NumberFor, Verify, AccountIdConversion,
+        AccountIdLookup, ConvertInto, BlakeTwo256, Block as BlockT, IdentifyAccount, 
+		Verify, AccountIdConversion,
     },
     transaction_validity::{TransactionSource, TransactionValidity},
     ApplyExtrinsicResult, MultiSignature,
@@ -53,8 +53,6 @@
         WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients
     },
 };
-use pallet_nft_transaction_payment::*;
-use pallet_nft_charge_transaction::*;
 use nft_data_structs::*;
 use pallet_contracts::weights::WeightInfo;
 // #[cfg(any(feature = "std", test))]