git.delta.rocks / unique-network / refs/commits / f5d9c56df151

--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -1328,10 +1328,15 @@
 			return Err(PropertiesError::NoSpaceForProperty);
 		}
 
+		let value_len = value_len as u32;
 		let old_value = self.map.try_scoped_set(scope, key, value)?;
 
-		if old_value.is_none() {
-			self.consumed_space += value_len as u32;
+		let old_value_len = old_value.as_ref().map(|v| v.len() as u32).unwrap_or(0);
+
+		if value_len > old_value_len {
+			self.consumed_space += value_len - old_value_len;
+		} else {
+			self.consumed_space -= old_value_len - value_len;
 		}
 
 		Ok(old_value)

25  before(async () => {25  before(async () => {
26    await usingPlaygrounds(async (helper, privateKey) => {26    await usingPlaygrounds(async (helper, privateKey) => {
27      const donor = await privateKey({filename: __filename});27      const donor = await privateKey({filename: __filename});
28      [alice, bob] = await helper.arrange.createAccounts([100n, 10n], donor);28      [alice, bob] = await helper.arrange.createAccounts([200n, 10n], donor);
29    });29    });
30  });30  });
31  31  
138    {mode: 'nft' as const, requiredPallets: []},138    {mode: 'nft' as const, requiredPallets: []},
139    {mode: 'rft' as const, requiredPallets: [Pallets.ReFungible]}, 139    {mode: 'rft' as const, requiredPallets: [Pallets.ReFungible]}, 
140  ].map(testCase =>140  ].map(testCase =>
141    itSub.ifWithPallets(`Allows modifying a collection property multiple times (${testCase.mode})`, testCase.requiredPallets, async({helper}) => {141    itSub.ifWithPallets(`Allows modifying a collection property multiple times with the same size (${testCase.mode})`, testCase.requiredPallets, async({helper}) => {
142      const propKey = 'tok-prop';142      const propKey = 'tok-prop';
143143
144      const collection = await helper[testCase.mode].mintCollection(alice);144      const collection = await helper[testCase.mode].mintCollection(alice);
192      expect(consumedSpace).to.be.equal(originalSpace);192      expect(consumedSpace).to.be.equal(originalSpace);
193    }));193    }));
194
195  [
196    // TODO enable properties for FT collection in Substrate (release 040)
197    // {mode: 'ft' as const, requiredPallets: []},
198    {mode: 'nft' as const, requiredPallets: []},
199    {mode: 'rft' as const, requiredPallets: [Pallets.ReFungible]}, 
200  ].map(testCase =>
201    itSub.ifWithPallets(`Modifying a collection property with different sizes correctly changes the consumed space (${testCase.mode})`, testCase.requiredPallets, async({helper}) => {
202      const propKey = 'tok-prop';
203
204      const collection = await helper[testCase.mode].mintCollection(alice);
205      const originalSpace = await collection.getPropertiesConsumedSpace();
206
207      const initPropDataSize = 4096;
208      const biggerPropDataSize = 5000;
209      const smallerPropDataSize = 4000;
210
211      const initPropData = 'a'.repeat(initPropDataSize);
212      const biggerPropData = 'b'.repeat(biggerPropDataSize);
213      const smallerPropData = 'c'.repeat(smallerPropDataSize);
214
215      let consumedSpace;
216      let expectedConsumedSpaceDiff;
217
218      await collection.setProperties(alice, [{key: propKey, value: initPropData}]);
219      consumedSpace = await collection.getPropertiesConsumedSpace();
220      expectedConsumedSpaceDiff = initPropDataSize - originalSpace;
221      expect(consumedSpace).to.be.equal(originalSpace + expectedConsumedSpaceDiff);
222
223      await collection.setProperties(alice, [{key: propKey, value: biggerPropData}]);
224      consumedSpace = await collection.getPropertiesConsumedSpace();
225      expectedConsumedSpaceDiff = biggerPropDataSize - initPropDataSize;
226      expect(consumedSpace).to.be.equal(initPropDataSize + expectedConsumedSpaceDiff);
227
228      await collection.setProperties(alice, [{key: propKey, value: smallerPropData}]);
229      consumedSpace = await collection.getPropertiesConsumedSpace();
230      expectedConsumedSpaceDiff = biggerPropDataSize - smallerPropDataSize;
231      expect(consumedSpace).to.be.equal(biggerPropDataSize - expectedConsumedSpaceDiff);
232    }));
194});233});
195  234  
196describe('Negative Integration Test: Collection Properties', () => {235describe('Negative Integration Test: Collection Properties', () => {

--- a/tests/src/nesting/tokenProperties.test.ts
+++ b/tests/src/nesting/tokenProperties.test.ts
@@ -325,7 +325,7 @@
     {mode: 'nft' as const, storage: 'nonfungible' as const, pieces: undefined, requiredPallets: []},
     {mode: 'rft' as const, storage: 'refungible' as const, pieces: 100n, requiredPallets: [Pallets.ReFungible]}, 
   ].map(testCase =>
-    itSub.ifWithPallets(`Allows modifying a token property multiple times (${testCase.mode})`, testCase.requiredPallets, async({helper}) => {
+    itSub.ifWithPallets(`Allows modifying a token property multiple times with the same size (${testCase.mode})`, testCase.requiredPallets, async({helper}) => {
       const propKey = 'tok-prop';
 
       const collection = await helper[testCase.mode].mintCollection(alice, {
@@ -434,6 +434,55 @@
       const recomputedSpace = await token.getTokenPropertiesConsumedSpace();
       expect(recomputedSpace).to.be.equal(originalSpace);
     }));
+
+  [
+    {mode: 'nft' as const, pieces: undefined, requiredPallets: []},
+    {mode: 'rft' as const, pieces: 100n, requiredPallets: [Pallets.ReFungible]}, 
+  ].map(testCase =>
+    itSub.ifWithPallets(`Modifying a token property with different sizes correctly changes the consumed space (${testCase.mode})`, testCase.requiredPallets, async({helper}) => {
+      const propKey = 'tok-prop';
+
+      const collection = await helper[testCase.mode].mintCollection(alice, {
+        tokenPropertyPermissions: [
+          {
+            key: propKey,
+            permission: {mutable: true, tokenOwner: true},
+          },
+        ],
+      });
+      const token = await (
+        testCase.pieces
+          ? collection.mintToken(alice, testCase.pieces)
+          : collection.mintToken(alice)
+      );
+      const originalSpace = await token.getTokenPropertiesConsumedSpace();
+
+      const initPropDataSize = 4096;
+      const biggerPropDataSize = 5000;
+      const smallerPropDataSize = 4000;
+
+      const initPropData = 'a'.repeat(initPropDataSize);
+      const biggerPropData = 'b'.repeat(biggerPropDataSize);
+      const smallerPropData = 'c'.repeat(smallerPropDataSize);
+
+      let consumedSpace;
+      let expectedConsumedSpaceDiff;
+
+      await token.setProperties(alice, [{key: propKey, value: initPropData}]);
+      consumedSpace = await token.getTokenPropertiesConsumedSpace();
+      expectedConsumedSpaceDiff = initPropDataSize - originalSpace;
+      expect(consumedSpace).to.be.equal(originalSpace + expectedConsumedSpaceDiff);
+
+      await token.setProperties(alice, [{key: propKey, value: biggerPropData}]);
+      consumedSpace = await token.getTokenPropertiesConsumedSpace();
+      expectedConsumedSpaceDiff = biggerPropDataSize - initPropDataSize;
+      expect(consumedSpace).to.be.equal(initPropDataSize + expectedConsumedSpaceDiff);
+
+      await token.setProperties(alice, [{key: propKey, value: smallerPropData}]);
+      consumedSpace = await token.getTokenPropertiesConsumedSpace();
+      expectedConsumedSpaceDiff = biggerPropDataSize - smallerPropDataSize;
+      expect(consumedSpace).to.be.equal(biggerPropDataSize - expectedConsumedSpaceDiff);
+    }));
 });
 
 describe('Negative Integration Test: Token Properties', () => {