difftreelog
Merge pull request #15 from usetech-llc/fix/nftpar-150
in: master
Unit tests repaired
3 files changed
pallets/nft/Cargo.tomldiffbeforeafterboth--- a/pallets/nft/Cargo.toml
+++ b/pallets/nft/Cargo.toml
@@ -80,6 +80,27 @@
branch = 'v2.0.0_release'
version = '2.0.0'
+[dependencies.pallet-balances]
+default-features = false
+git = 'https://github.com/usetech-llc/substrate.git'
+package = 'pallet-balances'
+branch = 'v2.0.0_release'
+version = '2.0.0'
+
+[dependencies.pallet-timestamp]
+default-features = false
+git = 'https://github.com/usetech-llc/substrate.git'
+package = 'pallet-timestamp'
+branch = 'v2.0.0_release'
+version = '2.0.0'
+
+[dependencies.pallet-randomness-collective-flip]
+default-features = false
+git = 'https://github.com/usetech-llc/substrate.git'
+package = 'pallet-randomness-collective-flip'
+branch = 'v2.0.0_release'
+version = '2.0.0'
+
[features]
default = ['std']
std = [
@@ -87,6 +108,9 @@
"serde/std",
'frame-support/std',
'frame-system/std',
+ 'pallet-balances/std',
+ 'pallet-timestamp/std',
+ 'pallet-randomness-collective-flip/std',
'sp-std/std',
'sp-runtime/std',
'frame-benchmarking/std',
pallets/nft/src/mock.rsdiffbeforeafterboth1// Creating mock runtime here23use crate::{Module, Trait};4use frame_support::{5 impl_outer_origin, parameter_types,6 weights::{7 constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight},8 Weight,9 },10};11use frame_system as system;12use sp_core::H256;13use sp_runtime::{14 testing::Header,15 traits::{BlakeTwo256, IdentityLookup, Saturating},16 Perbill,17};1819impl_outer_origin! {20 pub enum Origin for Test {}21}2223// For testing the pallet, we construct most of a mock runtime. This means24// first constructing a configuration type (`Test`) which `impl`s each of the25// configuration traits of pallets we want to use.26#[derive(Clone, Eq, PartialEq)]27pub struct Test;28parameter_types! {29 pub const BlockHashCount: u64 = 250;30 pub const MaximumBlockWeight: Weight = 1024;31 pub const MaximumBlockLength: u32 = 2 * 1024;32 pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);33 pub MaximumExtrinsicWeight: Weight = AvailableBlockRatio::get()34 .saturating_sub(Perbill::from_percent(10)) * MaximumBlockWeight::get();35}3637impl system::Trait for Test {38 type BaseCallFilter = ();39 type Origin = Origin;40 type Call = ();41 type Index = u64;42 type BlockNumber = u64;43 type Hash = H256;44 type Hashing = BlakeTwo256;45 type AccountId = u64;46 type Lookup = IdentityLookup<Self::AccountId>;47 type Header = Header;48 type Event = ();49 type BlockHashCount = BlockHashCount;50 type MaximumBlockWeight = MaximumBlockWeight;51 type DbWeight = ();52 type BlockExecutionWeight = ();53 type ExtrinsicBaseWeight = ();54 type MaximumExtrinsicWeight = MaximumBlockWeight;55 type MaximumBlockLength = MaximumBlockLength;56 type AvailableBlockRatio = AvailableBlockRatio;57 type Version = ();58 type PalletInfo = ();59 type AccountData = ();60 type OnNewAccount = ();61 type OnKilledAccount = ();62 type SystemWeightInfo = ();63}64impl Trait for Test {65 type Event = ();66}67pub type TemplateModule = Module<Test>;686970// This function basically just builds a genesis storage key/value store according to71// our desired mockup.72pub fn new_test_ext() -> sp_io::TestExternalities {73 system::GenesisConfig::default()74 .build_storage::<Test>()75 .unwrap()76 .into()77}1// Creating mock runtime here23use crate::{Module, Trait};45use pallet_contracts::{6 ContractAddressFor, TrieId, TrieIdGenerator,7};89use frame_support::{10 impl_outer_origin, parameter_types,11 weights::{12 // constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight},13 Weight, IdentityFee,14 },15};16use frame_system as system;17use transaction_payment;18use sp_core::H256;19use sp_runtime::{20 testing::Header,21 traits::{BlakeTwo256, IdentityLookup, Saturating},22 Perbill,23};24pub use pallet_balances;2526impl_outer_origin! {27 pub enum Origin for Test {}28}2930// For testing the pallet, we construct most of a mock runtime. This means31// first constructing a configuration type (`Test`) which `impl`s each of the32// configuration traits of pallets we want to use.33#[derive(Clone, Eq, PartialEq)]34pub struct Test;35parameter_types! {36 pub const BlockHashCount: u64 = 250;37 pub const MaximumBlockWeight: Weight = 1024;38 pub const MaximumBlockLength: u32 = 2 * 1024;39 pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);40 pub MaximumExtrinsicWeight: Weight = AvailableBlockRatio::get()41 .saturating_sub(Perbill::from_percent(10)) * MaximumBlockWeight::get();42}4344impl system::Trait for Test {45 type BaseCallFilter = ();46 type Origin = Origin;47 type Call = ();48 type Index = u64;49 type BlockNumber = u64;50 type Hash = H256;51 type Hashing = BlakeTwo256;52 type AccountId = u64;53 type Lookup = IdentityLookup<Self::AccountId>;54 type Header = Header;55 type Event = ();56 type BlockHashCount = BlockHashCount;57 type MaximumBlockWeight = MaximumBlockWeight;58 type DbWeight = ();59 type BlockExecutionWeight = ();60 type ExtrinsicBaseWeight = ();61 type MaximumExtrinsicWeight = MaximumBlockWeight;62 type MaximumBlockLength = MaximumBlockLength;63 type AvailableBlockRatio = AvailableBlockRatio;64 type Version = ();65 type PalletInfo = ();66 type AccountData = pallet_balances::AccountData<u64>;67 type OnNewAccount = ();68 type OnKilledAccount = ();69 type SystemWeightInfo = ();70}7172parameter_types! {73 pub const ExistentialDeposit: u64 = 1;74 pub const MaxLocks: u32 = 50;75}7677type System = frame_system::Module<Test>;78impl pallet_balances::Trait for Test {79 type AccountStore = System;80 type Balance = u64;81 type DustRemoval = ();82 type Event = ();83 type ExistentialDeposit = ExistentialDeposit;84 type WeightInfo = ();85 type MaxLocks = MaxLocks;86}8788parameter_types! {89 pub const TransactionByteFee: u64 = 1;90}91impl transaction_payment::Trait for Test {92 type Currency = pallet_balances::Module<Test>;93 type OnTransactionPayment = ();94 type TransactionByteFee = TransactionByteFee;95 type WeightToFee = IdentityFee<u64>;96 type FeeMultiplierUpdate = ();97}9899100parameter_types! {101 pub const MinimumPeriod: u64 = 1;102}103impl pallet_timestamp::Trait for Test {104 type Moment = u64;105 type OnTimestampSet = ();106 type MinimumPeriod = MinimumPeriod;107 type WeightInfo = ();108}109110type Timestamp = pallet_timestamp::Module<Test>;111type Randomness = pallet_randomness_collective_flip::Module<Test>;112113parameter_types! {114 pub const TombstoneDeposit: u64 = 1;115 pub const RentByteFee: u64 = 1;116 pub const RentDepositOffset: u64 = 1;117 pub const SurchargeReward: u64 = 1;118}119120pub struct DummyTrieIdGenerator;121impl TrieIdGenerator<u64> for DummyTrieIdGenerator {122 fn trie_id(account_id: &u64) -> TrieId {123 let new_seed = *account_id + 1;124 let mut res = vec![];125 res.extend_from_slice(&new_seed.to_le_bytes());126 res.extend_from_slice(&account_id.to_le_bytes());127 res128 }129}130131pub struct DummyContractAddressFor;132impl ContractAddressFor<H256, u64> for DummyContractAddressFor {133 fn contract_address_for(_code_hash: &H256, _data: &[u8], origin: &u64) -> u64 {134 *origin + 1135 }136}137138impl pallet_contracts::Trait for Test {139 type Time = Timestamp;140 type Randomness = Randomness;141 type Currency = pallet_balances::Module<Test>;142 type Event = ();143 type DetermineContractAddress = DummyContractAddressFor;144 type TrieIdGenerator = DummyTrieIdGenerator;145 type RentPayment = ();146 type SignedClaimHandicap = pallet_contracts::DefaultSignedClaimHandicap;147 type TombstoneDeposit = TombstoneDeposit;148 type StorageSizeOffset = pallet_contracts::DefaultStorageSizeOffset;149 type RentByteFee = RentByteFee;150 type RentDepositOffset = RentDepositOffset;151 type SurchargeReward = SurchargeReward;152 type MaxDepth = pallet_contracts::DefaultMaxDepth;153 type MaxValueSize = pallet_contracts::DefaultMaxValueSize;154 type WeightPrice = ();155}156157impl Trait for Test {158 type Event = ();159 type WeightInfo = ();160161}162pub type TemplateModule = Module<Test>;163164165// This function basically just builds a genesis storage key/value store according to166// our desired mockup.167pub fn new_test_ext() -> sp_io::TestExternalities {168 system::GenesisConfig::default()169 .build_storage::<Test>()170 .unwrap()171 .into()172}pallets/nft/src/tests.rsdiffbeforeafterboth--- a/pallets/nft/src/tests.rs
+++ b/pallets/nft/src/tests.rs
@@ -394,6 +394,77 @@
assert_eq!(TemplateModule::balance_count(1, 1), 1);
assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
+ // neg transfer
+ assert_noop!(TemplateModule::transfer_from(
+ origin2.clone(),
+ 1,
+ 2,
+ 1,
+ 1,
+ 1), "Only item owner, collection owner and admins can modify items");
+
+ // do approve
+ assert_ok!(TemplateModule::approve(origin1.clone(), 2, 1, 1));
+ assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 1);
+ assert_eq!(
+ TemplateModule::approved(1, (1, 1))[0],
+ ApprovePermissions {
+ approved: 2,
+ amount: 100000000
+ }
+ );
+
+ assert_ok!(TemplateModule::transfer_from(
+ origin2.clone(),
+ 1,
+ 2,
+ 1,
+ 1,
+ 1
+ ));
+ assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 0);
+ });
+}
+
+#[test]
+fn nft_approve_and_transfer_from_white_list() {
+ new_test_ext().execute_with(|| {
+ let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+ let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+ let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+ let mode: CollectionMode = CollectionMode::NFT(2000);
+
+ assert_ok!(TemplateModule::set_chain_limits(RawOrigin::Root.into(), ChainLimits {
+ collection_numbers_limit: 10,
+ account_token_ownership_limit: 10,
+ collections_admins_limit: 5,
+ custom_data_limit: 2048,
+ nft_sponsor_transfer_timeout: 15,
+ fungible_sponsor_transfer_timeout: 15,
+ refungible_sponsor_transfer_timeout: 15,
+ }));
+
+ let origin1 = Origin::signed(1);
+ let origin2 = Origin::signed(2);
+ assert_ok!(TemplateModule::create_collection(
+ origin1.clone(),
+ col_name1.clone(),
+ col_desc1.clone(),
+ token_prefix1.clone(),
+ mode
+ ));
+ assert_eq!(TemplateModule::collection(1).owner, 1);
+
+ assert_ok!(TemplateModule::create_item(
+ origin1.clone(),
+ 1,
+ [1, 2, 3].to_vec(),
+ 1
+ ));
+ assert_eq!(TemplateModule::nft_item_id(1, 1).data, [1, 2, 3].to_vec());
+ assert_eq!(TemplateModule::balance_count(1, 1), 1);
+ assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
+
assert_ok!(TemplateModule::set_mint_permission(
origin1.clone(),
1,