difftreelog
Warnings fixed
in: master
5 files changed
pallets/nft-charge-transaction/src/lib.rsdiffbeforeafterboth--- 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
pallets/nft-transaction-payment/src/lib.rsdiffbeforeafterboth--- 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,
pallets/nft/src/lib.rsdiffbeforeafterboth--- 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,
runtime/src/chain_extension.rsdiffbeforeafterboth1//! NFT Chain Extension23//4// This file is subject to the terms and conditions defined in5// file 'LICENSE', which is part of this source code package.6//78use codec::{Decode, Encode};910pub use pallet_contracts::chain_extension::RetVal;11use pallet_contracts::chain_extension::{12 ChainExtension, Environment, Ext, InitState, SysConfig, UncheckedFrom,13};1415pub use frame_support::debug;16use frame_support::dispatch::DispatchError;1718extern crate pallet_nft;19pub use pallet_nft::*;20use nft_data_structs::*;21// use crate::Runtime;2223use sp_runtime::AccountId32;24use crate::Vec;2526/// Create item parameters27#[derive(Debug, PartialEq, Encode, Decode)]28pub struct NFTExtCreateItem<E: Ext> {29 pub owner: <E::T as SysConfig>::AccountId,30 pub collection_id: u32,31 pub data: CreateItemData,32}3334/// Transfer parameters35#[derive(Debug, PartialEq, Encode, Decode)]36pub struct NFTExtTransfer<E: Ext> {37 pub recipient: <E::T as SysConfig>::AccountId,38 pub collection_id: u32,39 pub token_id: u32,40 pub amount: u128,41}4243/// The chain Extension of NFT pallet44pub struct NFTExtension;4546impl<C: Config + pallet_contracts::Config> ChainExtension<C> for NFTExtension {47 fn call<E: Ext>(func_id: u32, env: Environment<E, InitState>) -> Result<RetVal, DispatchError>48 where49 E: Ext<T = C>,50 <E::T as SysConfig>::AccountId: UncheckedFrom<<E::T as SysConfig>::Hash> + AsRef<[u8]>,51 {52 // The memory of the vm stores buf in scale-codec53 match func_id {54 0 => {55 let mut env = env.buf_in_buf_out();56 let input: NFTExtTransfer<E> = env.read_as()?;5758 let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;5960 match pallet_nft::Module::<C>::transfer_internal(61 env.ext().caller().clone(),62 input.recipient,63 &collection,64 input.token_id,65 input.amount,66 ) {67 Ok(_) => Ok(RetVal::Converging(func_id)),68 _ => Err(DispatchError::Other("Transfer error"))69 }70 },71 1 => {72 // Create Item73 let mut env = env.buf_in_buf_out();74 let input: NFTExtCreateItem<E> = env.read_as()?;7576 match pallet_nft::Module::<C>::create_item_internal(77 env.ext().address().clone(),78 input.collection_id,79 input.owner,80 input.data,81 ) {82 Ok(_) => Ok(RetVal::Converging(func_id)),83 _ => Err(DispatchError::Other("CreateItem error"))84 }85 },86 _ => {87 panic!("Passed unknown func_id to test chain extension: {}", func_id);88 }89 }90 }91}1//! NFT Chain Extension23//4// This file is subject to the terms and conditions defined in5// file 'LICENSE', which is part of this source code package.6//78use codec::{Decode, Encode};910pub use pallet_contracts::chain_extension::RetVal;11use pallet_contracts::chain_extension::{12 ChainExtension, Environment, Ext, InitState, SysConfig, UncheckedFrom,13};1415pub use frame_support::debug;16use frame_support::dispatch::DispatchError;1718extern crate pallet_nft;19pub use pallet_nft::*;20use nft_data_structs::*;2122/// Create item parameters23#[derive(Debug, PartialEq, Encode, Decode)]24pub struct NFTExtCreateItem<E: Ext> {25 pub owner: <E::T as SysConfig>::AccountId,26 pub collection_id: u32,27 pub data: CreateItemData,28}2930/// Transfer parameters31#[derive(Debug, PartialEq, Encode, Decode)]32pub struct NFTExtTransfer<E: Ext> {33 pub recipient: <E::T as SysConfig>::AccountId,34 pub collection_id: u32,35 pub token_id: u32,36 pub amount: u128,37}3839/// The chain Extension of NFT pallet40pub struct NFTExtension;4142impl<C: Config + pallet_contracts::Config> ChainExtension<C> for NFTExtension {43 fn call<E: Ext>(func_id: u32, env: Environment<E, InitState>) -> Result<RetVal, DispatchError>44 where45 E: Ext<T = C>,46 <E::T as SysConfig>::AccountId: UncheckedFrom<<E::T as SysConfig>::Hash> + AsRef<[u8]>,47 {48 // The memory of the vm stores buf in scale-codec49 match func_id {50 0 => {51 let mut env = env.buf_in_buf_out();52 let input: NFTExtTransfer<E> = env.read_as()?;5354 let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;5556 match pallet_nft::Module::<C>::transfer_internal(57 env.ext().caller().clone(),58 input.recipient,59 &collection,60 input.token_id,61 input.amount,62 ) {63 Ok(_) => Ok(RetVal::Converging(func_id)),64 _ => Err(DispatchError::Other("Transfer error"))65 }66 },67 1 => {68 // Create Item69 let mut env = env.buf_in_buf_out();70 let input: NFTExtCreateItem<E> = env.read_as()?;7172 match pallet_nft::Module::<C>::create_item_internal(73 env.ext().address().clone(),74 input.collection_id,75 input.owner,76 input.data,77 ) {78 Ok(_) => Ok(RetVal::Converging(func_id)),79 _ => Err(DispatchError::Other("CreateItem error"))80 }81 },82 _ => {83 panic!("Passed unknown func_id to test chain extension: {}", func_id);84 }85 }86 }87}runtime/src/lib.rsdiffbeforeafterboth--- 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))]