git.delta.rocks / unique-network / refs/commits / 281677a9f1f9

difftreelog

Merge branch 'develop' into feature/CORE-37

Igor Kozyrev2021-09-01parents: #55d2f5b #ded6402.patch.diff
in: master

4 files changed

modifiedpallets/nft/src/lib.rsdiffbeforeafterboth
255 .max(Self::create_item_fungible())255 .max(Self::create_item_fungible())
256 .max(Self::create_item_refungible(data))256 .max(Self::create_item_refungible(data))
257 }257 }
258 fn create_multiple_items(amount: u32) -> Weight {
259 Self::create_multiple_items_nft(amount)
260 .max(Self::create_multiple_items_fungible(amount))
261 .max(Self::create_multiple_items_refungible(amount))
262 }
258 fn burn_item() -> Weight {263 fn burn_item() -> Weight {
259 // TODO: refungible, fungible264 // TODO: refungible, fungible
260 Self::burn_item_nft()265 Self::burn_item_nft()
901 /// * itemsData: Array items properties. Each property is an array of bytes itself, see [create_item].906 /// * itemsData: Array items properties. Each property is an array of bytes itself, see [create_item].
902 ///907 ///
903 /// * owner: Address, initial owner of the NFT.908 /// * owner: Address, initial owner of the NFT.
904 #[weight = <SelfWeightOf<T>>::create_item(items_data.iter()909 #[weight = <SelfWeightOf<T>>::create_multiple_items(items_data.len() as u32)]
905 .map(|data| { data.data_size() as u32 })
906 .sum())]
907 #[transactional]910 #[transactional]
908 pub fn create_multiple_items(origin, collection_id: CollectionId, owner: T::CrossAccountId, items_data: Vec<CreateItemData>) -> DispatchResult {911 pub fn create_multiple_items(origin, collection_id: CollectionId, owner: T::CrossAccountId, items_data: Vec<CreateItemData>) -> DispatchResult {
909912
929 /// * collection_id: ID of the collection.932 /// * collection_id: ID of the collection.
930 ///933 ///
931 /// * value: New flag value.934 /// * value: New flag value.
932 #[weight = <SelfWeightOf<T>>::burn_item()]935 #[weight = <SelfWeightOf<T>>::set_transfers_enabled_flag()]
933 #[transactional]936 #[transactional]
934 pub fn set_transfers_enabled_flag(origin, collection_id: CollectionId, value: bool) -> DispatchResult {937 pub fn set_transfers_enabled_flag(origin, collection_id: CollectionId, value: bool) -> DispatchResult {
935938
modifiedtests/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',
modifiedtests/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;
modifiedtests/src/transfer.test.tsdiffbeforeafterboth
--- a/tests/src/transfer.test.ts
+++ b/tests/src/transfer.test.ts
@@ -60,7 +60,7 @@
         // tslint:disable-next-line:no-unused-expression
         expect(result.success).to.be.false;
       };
-      expect(badTransaction()).to.be.rejectedWith('Inability to pay some fees , e.g. account balance too low');
+      await expect(badTransaction()).to.be.rejectedWith('Inability to pay some fees , e.g. account balance too low');
     });
   });