git.delta.rocks / unique-network / refs/commits / 93c5da388d2d

--- a/tests/src/nesting/collectionProperties.seqtest.ts
+++ b/tests/src/nesting/collectionProperties.seqtest.ts
@@ -15,7 +15,7 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 import {IKeyringPair} from '@polkadot/types/types';
-import {itSub, Pallets, usingPlaygrounds, expect, requirePalletsOrSkip} from '../util';
+import {itSub, Pallets, usingPlaygrounds, expect, requirePalletsOrSkip, sizeOfProperty} from '../util';
 
 describe('Integration Test: Collection Properties with sudo', () => {
   let superuser: IKeyringPair;
@@ -48,14 +48,14 @@
       ];
       const collection = await helper[testSuite.mode].mintCollection(alice, {properties});
 
-      const newProperty = ' '.repeat(4096);
-      await collection.setProperties(alice, [{key: 'space', value: newProperty}]);
+      const newProperty = {key: 'space', value: ' '.repeat(4096)};
+      await collection.setProperties(alice, [newProperty]);
       const originalSpace = await collection.getPropertiesConsumedSpace();
-      expect(originalSpace).to.be.equal(properties[0].value.length + properties[1].value.length + newProperty.length);
+      expect(originalSpace).to.be.equal(sizeOfProperty(properties[0]) + sizeOfProperty(properties[1]) + sizeOfProperty(newProperty));
 
       await helper.getSudo().executeExtrinsic(superuser, 'api.tx.unique.forceRepairCollection', [collection.collectionId], true);
       const recomputedSpace = await collection.getPropertiesConsumedSpace();
       expect(recomputedSpace).to.be.equal(originalSpace);
     });
   }));
-});
\ No newline at end of file
+});

--- a/tests/src/nesting/collectionProperties.test.ts
+++ b/tests/src/nesting/collectionProperties.test.ts
@@ -15,7 +15,7 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 import {IKeyringPair} from '@polkadot/types/types';
-import {itSub, Pallets, usingPlaygrounds, expect, requirePalletsOrSkip} from '../util';
+import {itSub, Pallets, usingPlaygrounds, expect, requirePalletsOrSkip, sizeOfProperty} from '../util';
 
 describe('Integration Test: Collection Properties', () => {
   let alice: IKeyringPair;
@@ -134,9 +134,10 @@
         return `${propDataChar}`.repeat(propDataSize);
       };
 
-      await collection.setProperties(alice, [{key: propKey, value: makeNewPropData()}]);
+      const property = {key: propKey, value: makeNewPropData()};
+      await collection.setProperties(alice, [property]);
       const originalSpace = await collection.getPropertiesConsumedSpace();
-      expect(originalSpace).to.be.equal(propDataSize);
+      expect(originalSpace).to.be.equal(sizeOfProperty(property));
 
       const sameSizePropertiesPossibleNum = maxCollectionPropertiesSize / propDataSize;
 
@@ -158,9 +159,10 @@
       const propDataSize = 4096;
       const propData = 'a'.repeat(propDataSize);
 
-      await collection.setProperties(alice, [{key: propKey, value: propData}]);
+      const property = {key: propKey, value: propData};
+      await collection.setProperties(alice, [property]);
       let consumedSpace = await collection.getPropertiesConsumedSpace();
-      expect(consumedSpace).to.be.equal(propDataSize);
+      expect(consumedSpace).to.be.equal(sizeOfProperty(property));
 
       await collection.deleteProperties(alice, [propKey]);
       consumedSpace = await collection.getPropertiesConsumedSpace();
@@ -173,31 +175,27 @@
       const collection = await helper[testSuite.mode].mintCollection(alice);
       const originalSpace = await collection.getPropertiesConsumedSpace();
 
-      const initPropDataSize = 4096;
-      const biggerPropDataSize = 5000;
-      const smallerPropDataSize = 4000;
-
-      const initPropData = 'a'.repeat(initPropDataSize);
-      const biggerPropData = 'b'.repeat(biggerPropDataSize);
-      const smallerPropData = 'c'.repeat(smallerPropDataSize);
+      const initProp = {key: propKey, value: 'a'.repeat(4096)};
+      const biggerProp = {key: propKey, value: 'b'.repeat(5000)};
+      const smallerProp = {key: propKey, value: 'c'.repeat(4000)};
 
       let consumedSpace;
       let expectedConsumedSpaceDiff;
 
-      await collection.setProperties(alice, [{key: propKey, value: initPropData}]);
+      await collection.setProperties(alice, [initProp]);
       consumedSpace = await collection.getPropertiesConsumedSpace();
-      expectedConsumedSpaceDiff = initPropDataSize - originalSpace;
+      expectedConsumedSpaceDiff = sizeOfProperty(initProp) - originalSpace;
       expect(consumedSpace).to.be.equal(originalSpace + expectedConsumedSpaceDiff);
 
-      await collection.setProperties(alice, [{key: propKey, value: biggerPropData}]);
+      await collection.setProperties(alice, [biggerProp]);
       consumedSpace = await collection.getPropertiesConsumedSpace();
-      expectedConsumedSpaceDiff = biggerPropDataSize - initPropDataSize;
-      expect(consumedSpace).to.be.equal(initPropDataSize + expectedConsumedSpaceDiff);
+      expectedConsumedSpaceDiff = sizeOfProperty(biggerProp) - sizeOfProperty(initProp);
+      expect(consumedSpace).to.be.equal(sizeOfProperty(initProp) + expectedConsumedSpaceDiff);
 
-      await collection.setProperties(alice, [{key: propKey, value: smallerPropData}]);
+      await collection.setProperties(alice, [smallerProp]);
       consumedSpace = await collection.getPropertiesConsumedSpace();
-      expectedConsumedSpaceDiff = biggerPropDataSize - smallerPropDataSize;
-      expect(consumedSpace).to.be.equal(biggerPropDataSize - expectedConsumedSpaceDiff);
+      expectedConsumedSpaceDiff = sizeOfProperty(biggerProp) - sizeOfProperty(smallerProp);
+      expect(consumedSpace).to.be.equal(sizeOfProperty(biggerProp) - expectedConsumedSpaceDiff);
     });
   }));
 });
@@ -237,7 +235,7 @@
     itSub('Fails to set properties that exceed the limits', async ({helper}) =>  {
       const collection = await helper[testSuite.mode].mintCollection(alice);
 
-      const spaceLimit = (await (collection.helper!.api! as any).query.common.collectionProperties(collection.collectionId)).spaceLimit.toNumber();
+      const spaceLimit = helper.getApi().consts.unique.maxCollectionPropertiesSize.toNumber();
 
       // Mute the general tx parsing error, too many bytes to process
       {

--- a/tests/src/nesting/tokenProperties.seqtest.ts
+++ b/tests/src/nesting/tokenProperties.seqtest.ts
@@ -15,7 +15,7 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 import {IKeyringPair} from '@polkadot/types/types';
-import {itSub, Pallets, usingPlaygrounds, expect, requirePalletsOrSkip} from '../util';
+import {itSub, Pallets, usingPlaygrounds, expect, requirePalletsOrSkip, sizeOfProperty} from '../util';
 
 describe('Integration Test: Token Properties with sudo', () => {
   let superuser: IKeyringPair;
@@ -57,16 +57,15 @@
           : collection.mintToken(alice)
       );
 
-      const propDataSize = 4096;
-      const propData = 'a'.repeat(propDataSize);
+      const prop = {key: propKey, value: 'a'.repeat(4096)};
 
-      await token.setProperties(alice, [{key: propKey, value: propData}]);
+      await token.setProperties(alice, [prop]);
       const originalSpace = await token.getTokenPropertiesConsumedSpace();
-      expect(originalSpace).to.be.equal(propDataSize);
+      expect(originalSpace).to.be.equal(sizeOfProperty(prop));
 
       await helper.getSudo().executeExtrinsic(superuser, 'api.tx.unique.forceRepairItem', [token.collectionId, token.tokenId], true);
       const recomputedSpace = await token.getTokenPropertiesConsumedSpace();
       expect(recomputedSpace).to.be.equal(originalSpace);
     });
   }));
-});
\ No newline at end of file
+});

15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
1616
17import {IKeyringPair} from '@polkadot/types/types';17import {IKeyringPair} from '@polkadot/types/types';
18import {itSub, Pallets, requirePalletsOrSkip, usingPlaygrounds, expect} from '../util';18import {itSub, Pallets, requirePalletsOrSkip, usingPlaygrounds, expect, sizeOfProperty} from '../util';
19import {UniqueHelper, UniqueNFToken, UniqueRFToken} from '../util/playgrounds/unique';19import {UniqueHelper, UniqueNFToken, UniqueRFToken} from '../util/playgrounds/unique';
2020
21describe('Integration Test: Token Properties', () => {21describe('Integration Test: Token Properties', () => {
353          : collection.mintToken(alice)353          : collection.mintToken(alice)
354      );354      );
355355
356      await token.setProperties(alice, [{key: propKey, value: makeNewPropData()}]);356      const property = {key: propKey, value: makeNewPropData()};
357      await token.setProperties(alice, [property]);
357      const originalSpace = await token.getTokenPropertiesConsumedSpace();358      const originalSpace = await token.getTokenPropertiesConsumedSpace();
358      expect(originalSpace).to.be.equal(propDataSize);359      expect(originalSpace).to.be.equal(sizeOfProperty(property));
359360
360      const sameSizePropertiesPossibleNum = maxTokenPropertiesSize / propDataSize;361      const sameSizePropertiesPossibleNum = maxTokenPropertiesSize / propDataSize;
361362
393      const propDataSize = 4096;394      const propDataSize = 4096;
394      const propData = 'a'.repeat(propDataSize);395      const propData = 'a'.repeat(propDataSize);
395396
396      await token.setProperties(alice, [{key: propKey, value: propData}]);397      const property = {key: propKey, value: propData};
398      await token.setProperties(alice, [property]);
397      let consumedSpace = await token.getTokenPropertiesConsumedSpace();399      let consumedSpace = await token.getTokenPropertiesConsumedSpace();
398      expect(consumedSpace).to.be.equal(propDataSize);400      expect(consumedSpace).to.be.equal(sizeOfProperty(property));
399401
400      await token.deleteProperties(alice, [propKey]);402      await token.deleteProperties(alice, [propKey]);
401      consumedSpace = await token.getTokenPropertiesConsumedSpace();403      consumedSpace = await token.getTokenPropertiesConsumedSpace();
424      );426      );
425      const originalSpace = await token.getTokenPropertiesConsumedSpace();427      const originalSpace = await token.getTokenPropertiesConsumedSpace();
426
427      const initPropDataSize = 4096;
428      const biggerPropDataSize = 5000;
429      const smallerPropDataSize = 4000;
430428
431      const initPropData = 'a'.repeat(initPropDataSize);429      const initProp = {key: propKey, value: 'a'.repeat(4096)};
432      const biggerPropData = 'b'.repeat(biggerPropDataSize);430      const biggerProp = {key: propKey, value: 'b'.repeat(5000)};
433      const smallerPropData = 'c'.repeat(smallerPropDataSize);431      const smallerProp = {key: propKey, value: 'c'.repeat(4000)};
434432
435      let consumedSpace;433      let consumedSpace;
436      let expectedConsumedSpaceDiff;434      let expectedConsumedSpaceDiff;
437435
438      await token.setProperties(alice, [{key: propKey, value: initPropData}]);436      await token.setProperties(alice, [initProp]);
439      consumedSpace = await token.getTokenPropertiesConsumedSpace();437      consumedSpace = await token.getTokenPropertiesConsumedSpace();
440      expectedConsumedSpaceDiff = initPropDataSize - originalSpace;438      expectedConsumedSpaceDiff = sizeOfProperty(initProp) - originalSpace;
441      expect(consumedSpace).to.be.equal(originalSpace + expectedConsumedSpaceDiff);439      expect(consumedSpace).to.be.equal(originalSpace + expectedConsumedSpaceDiff);
442440
443      await token.setProperties(alice, [{key: propKey, value: biggerPropData}]);441      await token.setProperties(alice, [biggerProp]);
444      consumedSpace = await token.getTokenPropertiesConsumedSpace();442      consumedSpace = await token.getTokenPropertiesConsumedSpace();
445      expectedConsumedSpaceDiff = biggerPropDataSize - initPropDataSize;443      expectedConsumedSpaceDiff = sizeOfProperty(biggerProp) - sizeOfProperty(initProp);
446      expect(consumedSpace).to.be.equal(initPropDataSize + expectedConsumedSpaceDiff);444      expect(consumedSpace).to.be.equal(sizeOfProperty(initProp) + expectedConsumedSpaceDiff);
447445
448      await token.setProperties(alice, [{key: propKey, value: smallerPropData}]);446      await token.setProperties(alice, [smallerProp]);
449      consumedSpace = await token.getTokenPropertiesConsumedSpace();447      consumedSpace = await token.getTokenPropertiesConsumedSpace();
450      expectedConsumedSpaceDiff = biggerPropDataSize - smallerPropDataSize;448      expectedConsumedSpaceDiff = sizeOfProperty(biggerProp) - sizeOfProperty(smallerProp);
451      expect(consumedSpace).to.be.equal(biggerPropDataSize - expectedConsumedSpaceDiff);449      expect(consumedSpace).to.be.equal(sizeOfProperty(biggerProp) - expectedConsumedSpaceDiff);
452    }));450    }));
453});451});
454452

--- a/tests/src/util/index.ts
+++ b/tests/src/util/index.ts
@@ -176,3 +176,26 @@
 }
 
 describeXCM.skip = (name: string, fn: (this: Mocha.Suite) => void) => describeXCM(name, fn, {skip: true});
+
+export function sizeOfInt(i: number) {
+  if (i < 0 || i > 0xffffffff) throw new Error('out of range');
+  if(i < 0b11_1111) {
+    return 1;
+  } else if (i < 0b11_1111_1111_1111) {
+    return 2;
+  } else if (i < 0b11_1111_1111_1111_1111_1111_1111_1111) {
+    return 4;
+  } else {
+    return 5;
+  }
+}
+
+const UTF8_ENCODER = new TextEncoder();
+export function sizeOfEncodedStr(v: string) {
+  const encoded = UTF8_ENCODER.encode(v);
+  return sizeOfInt(encoded.length) + encoded.length;
+}
+
+export function sizeOfProperty(prop: {key: string, value: string}) {
+  return sizeOfEncodedStr(prop.key) + sizeOfEncodedStr(prop.value);
+}