difftreelog
Merge branch 'develop' into feature/CORE-37
in: master
4 files changed
pallets/nft/src/lib.rsdiffbeforeafterboth--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -255,6 +255,11 @@
.max(Self::create_item_fungible())
.max(Self::create_item_refungible(data))
}
+ fn create_multiple_items(amount: u32) -> Weight {
+ Self::create_multiple_items_nft(amount)
+ .max(Self::create_multiple_items_fungible(amount))
+ .max(Self::create_multiple_items_refungible(amount))
+ }
fn burn_item() -> Weight {
// TODO: refungible, fungible
Self::burn_item_nft()
@@ -901,9 +906,7 @@
/// * itemsData: Array items properties. Each property is an array of bytes itself, see [create_item].
///
/// * owner: Address, initial owner of the NFT.
- #[weight = <SelfWeightOf<T>>::create_item(items_data.iter()
- .map(|data| { data.data_size() as u32 })
- .sum())]
+ #[weight = <SelfWeightOf<T>>::create_multiple_items(items_data.len() as u32)]
#[transactional]
pub fn create_multiple_items(origin, collection_id: CollectionId, owner: T::CrossAccountId, items_data: Vec<CreateItemData>) -> DispatchResult {
@@ -929,7 +932,7 @@
/// * collection_id: ID of the collection.
///
/// * value: New flag value.
- #[weight = <SelfWeightOf<T>>::burn_item()]
+ #[weight = <SelfWeightOf<T>>::set_transfers_enabled_flag()]
#[transactional]
pub fn set_transfers_enabled_flag(origin, collection_id: CollectionId, value: bool) -> DispatchResult {
tests/src/pallet-presence.test.tsdiffbeforeafterboth--- a/tests/src/pallet-presence.test.ts
+++ b/tests/src/pallet-presence.test.ts
@@ -25,6 +25,7 @@
'evm',
'evmcodersubstrate',
'evmcontracthelpers',
+ 'evmmigration',
'evmtransactionpayment',
'ethereum',
'xcmpqueue',
tests/src/setChainLimits.test.tsdiffbeforeafterboth--- a/tests/src/setChainLimits.test.ts
+++ b/tests/src/setChainLimits.test.ts
@@ -13,7 +13,7 @@
IChainLimits,
} from './util/helpers';
-describe('Negative Integration Test setChainLimits', () => {
+describe.skip('Negative Integration Test setChainLimits', () => {
let alice: IKeyringPair;
let bob: IKeyringPair;
let dave: IKeyringPair;
tests/src/transfer.test.tsdiffbeforeafterboth1//2// This file is subject to the terms and conditions defined in3// file 'LICENSE', which is part of this source code package.4//56import { ApiPromise } from '@polkadot/api';7import { IKeyringPair } from '@polkadot/types/types';8import { expect } from 'chai';9import { alicesPublicKey, bobsPublicKey } from './accounts';10import getBalance from './substrate/get-balance';11import privateKey from './substrate/privateKey';12import { default as usingApi, submitTransactionAsync } from './substrate/substrate-api';13import {14 burnItemExpectSuccess, createCollectionExpectSuccess, createItemExpectSuccess,15 destroyCollectionExpectSuccess,16 findUnusedAddress,17 getCreateCollectionResult,18 getCreateItemResult,19 transferExpectFailure,20 transferExpectSuccess,21 addCollectionAdminExpectSuccess,22} from './util/helpers';2324let Alice: IKeyringPair;25let Bob: IKeyringPair;26let Charlie: IKeyringPair;2728describe('Integration Test Transfer(recipient, collection_id, item_id, value)', () => {29 it('Balance transfers and check balance', async () => {30 await usingApi(async (api: ApiPromise) => {31 const [alicesBalanceBefore, bobsBalanceBefore] = await getBalance(api, [alicesPublicKey, bobsPublicKey]);3233 const alicePrivateKey = privateKey('//Alice');3435 const transfer = api.tx.balances.transfer(bobsPublicKey, 1n);36 const events = await submitTransactionAsync(alicePrivateKey, transfer);37 const result = getCreateItemResult(events);38 // tslint:disable-next-line:no-unused-expression39 expect(result.success).to.be.true;4041 const [alicesBalanceAfter, bobsBalanceAfter] = await getBalance(api, [alicesPublicKey, bobsPublicKey]);4243 // tslint:disable-next-line:no-unused-expression44 expect(alicesBalanceAfter < alicesBalanceBefore).to.be.true;45 // tslint:disable-next-line:no-unused-expression46 expect(bobsBalanceAfter > bobsBalanceBefore).to.be.true;47 });48 });4950 it('Inability to pay fees error message is correct', async () => {51 await usingApi(async (api) => {52 // Find unused address53 const pk = await findUnusedAddress(api);5455 const badTransfer = api.tx.balances.transfer(bobsPublicKey, 1n);56 // const events = await submitTransactionAsync(pk, badTransfer);57 const badTransaction = async () => {58 const events = await submitTransactionAsync(pk, badTransfer);59 const result = getCreateCollectionResult(events);60 // tslint:disable-next-line:no-unused-expression61 expect(result.success).to.be.false;62 };63 expect(badTransaction()).to.be.rejectedWith('Inability to pay some fees , e.g. account balance too low');64 });65 });6667 it('User can transfer owned token', async () => {68 await usingApi(async () => {69 const Alice = privateKey('//Alice');70 const Bob = privateKey('//Bob');71 // nft72 const nftCollectionId = await createCollectionExpectSuccess();73 const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');74 await transferExpectSuccess(nftCollectionId, newNftTokenId, Alice, Bob, 1, 'NFT');75 // fungible76 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});77 const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible');78 await transferExpectSuccess(fungibleCollectionId, newFungibleTokenId, Alice, Bob, 1, 'Fungible');79 // reFungible80 const reFungibleCollectionId = await81 createCollectionExpectSuccess({mode: {type: 'ReFungible'}});82 const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');83 await transferExpectSuccess(84 reFungibleCollectionId,85 newReFungibleTokenId,86 Alice,87 Bob,88 100,89 'ReFungible',90 );91 });92 });9394 it('Collection admin can transfer owned token', async () => {95 await usingApi(async () => {96 const Alice = privateKey('//Alice');97 const Bob = privateKey('//Bob');98 // nft99 const nftCollectionId = await createCollectionExpectSuccess();100 await addCollectionAdminExpectSuccess(Alice, nftCollectionId, Bob);101 const newNftTokenId = await createItemExpectSuccess(Bob, nftCollectionId, 'NFT', Bob.address);102 await transferExpectSuccess(nftCollectionId, newNftTokenId, Bob, Alice, 1, 'NFT');103 // fungible104 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});105 await addCollectionAdminExpectSuccess(Alice, fungibleCollectionId, Bob);106 const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible', Bob.address);107 await transferExpectSuccess(fungibleCollectionId, newFungibleTokenId, Bob, Alice, 1, 'Fungible');108 // reFungible109 const reFungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});110 await addCollectionAdminExpectSuccess(Alice, reFungibleCollectionId, Bob);111 const newReFungibleTokenId = await createItemExpectSuccess(Bob, reFungibleCollectionId, 'ReFungible', Bob.address);112 await transferExpectSuccess(113 reFungibleCollectionId,114 newReFungibleTokenId,115 Bob,116 Alice,117 100,118 'ReFungible',119 );120 });121 });122});123124describe('Negative Integration Test Transfer(recipient, collection_id, item_id, value)', () => {125 before(async () => {126 await usingApi(async () => {127 Alice = privateKey('//Alice');128 Bob = privateKey('//Bob');129 Charlie = privateKey('//Charlie');130 });131 });132 it('Transfer with not existed collection_id', async () => {133 await usingApi(async (api) => {134 // nft135 const nftCollectionCount = await api.query.nft.createdCollectionCount() as unknown as number;136 await transferExpectFailure(nftCollectionCount + 1, 1, Alice, Bob, 1);137 // fungible138 const fungibleCollectionCount = await api.query.nft.createdCollectionCount() as unknown as number;139 await transferExpectFailure(fungibleCollectionCount + 1, 1, Alice, Bob, 1);140 // reFungible141 const reFungibleCollectionCount = await api.query.nft.createdCollectionCount() as unknown as number;142 await transferExpectFailure(reFungibleCollectionCount + 1, 1, Alice, Bob, 1);143 });144 });145 it('Transfer with deleted collection_id', async () => {146 // nft147 const nftCollectionId = await createCollectionExpectSuccess();148 const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');149 await destroyCollectionExpectSuccess(nftCollectionId);150 await transferExpectFailure(nftCollectionId, newNftTokenId, Alice, Bob, 1);151 // fungible152 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});153 const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible');154 await destroyCollectionExpectSuccess(fungibleCollectionId);155 await transferExpectFailure(fungibleCollectionId, newFungibleTokenId, Alice, Bob, 1);156 // reFungible157 const reFungibleCollectionId = await158 createCollectionExpectSuccess({mode: {type: 'ReFungible'}});159 const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');160 await destroyCollectionExpectSuccess(reFungibleCollectionId);161 await transferExpectFailure(162 reFungibleCollectionId,163 newReFungibleTokenId,164 Alice,165 Bob,166 1,167 );168 });169 it('Transfer with not existed item_id', async () => {170 // nft171 const nftCollectionId = await createCollectionExpectSuccess();172 await transferExpectFailure(nftCollectionId, 2, Alice, Bob, 1);173 // fungible174 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});175 await transferExpectFailure(fungibleCollectionId, 2, Alice, Bob, 1);176 // reFungible177 const reFungibleCollectionId = await178 createCollectionExpectSuccess({mode: {type: 'ReFungible'}});179 await transferExpectFailure(180 reFungibleCollectionId,181 2,182 Alice,183 Bob,184 1,185 );186 });187 it('Transfer with deleted item_id', async () => {188 // nft189 const nftCollectionId = await createCollectionExpectSuccess();190 const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');191 await burnItemExpectSuccess(Alice, nftCollectionId, newNftTokenId, 1);192 await transferExpectFailure(nftCollectionId, newNftTokenId, Alice, Bob, 1);193 // fungible194 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});195 const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible');196 await burnItemExpectSuccess(Alice, fungibleCollectionId, newFungibleTokenId, 10);197 await transferExpectFailure(fungibleCollectionId, newFungibleTokenId, Alice, Bob, 1);198 // reFungible199 const reFungibleCollectionId = await200 createCollectionExpectSuccess({mode: {type: 'ReFungible'}});201 const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');202 await burnItemExpectSuccess(Alice, reFungibleCollectionId, newReFungibleTokenId, 1);203 await transferExpectFailure(204 reFungibleCollectionId,205 newReFungibleTokenId,206 Alice,207 Bob,208 1,209 );210 });211 it('Transfer with recipient that is not owner', async () => {212 // nft213 const nftCollectionId = await createCollectionExpectSuccess();214 const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');215 await transferExpectFailure(nftCollectionId, newNftTokenId, Charlie, Bob, 1);216 // fungible217 const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});218 const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible');219 await transferExpectFailure(fungibleCollectionId, newFungibleTokenId, Charlie, Bob, 1);220 // reFungible221 const reFungibleCollectionId = await222 createCollectionExpectSuccess({mode: {type: 'ReFungible'}});223 const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');224 await transferExpectFailure(225 reFungibleCollectionId,226 newReFungibleTokenId,227 Charlie,228 Bob,229 1,230 );231 });232});