Trying to fix test...

ar-io · Oct 18, 2024 · dda2b11 · dda2b11
1 parent 928541a
commit dda2b11
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 6 deletions.
diff --git a/src/main.lua b/src/main.lua
@@ -1197,7 +1197,13 @@ addEventingHandler(
 		local target = utils.formatAddress(msg.Tags.Target or msg.Tags.Address)
 		local quantity = tonumber(msg.Tags.Quantity)
 		-- Convert the string value of Instant to a boolean value
-		local instantWithdraw = msg.Tags.Instant == "true"
+		local instantWithdraw = false
+		if msg.Tags.Instant and msg.Tags.Instant == "true" then
+			instantWithdraw = true
+		else
+			instantWithdraw = false
+		end
+
 		msg.ioEvent:addField("TargetFormatted", target)
 
 		local shouldContinue2, gateway = eventingPcall(msg.ioEvent, function(error)
@@ -1217,7 +1223,7 @@ addEventingHandler(
 			msg.ioEvent:addField("PreviousStake", newStake + quantity)
 			msg.ioEvent:addField("NewStake", newStake)
 			msg.ioEvent:addField("GatewayTotalDelegatedStake", gateway.totalDelegatedStake)
-			msg.ioEvent:addField("InstantWithdrawal", insantWithdraw)
+			msg.ioEvent:addField("InstantWithdrawal", instantWithdraw)
 			delegateResult = gateway.delegates[from]
 			local newDelegateVaults = delegateResult.vaults
 			if newDelegateVaults ~= nil then

diff --git a/tests/gar.test.mjs b/tests/gar.test.mjs
@@ -830,7 +830,6 @@ describe('GatewayRegistry', async () => {
       );
 
       const gatewayData = JSON.parse(gateway.Messages[0].Data);
-      console.log ("1: Gateway Data Is: ", gatewayData)
 
       assert.deepEqual(gatewayData.delegates, {
         [newStubAddress]: {
@@ -843,6 +842,39 @@ describe('GatewayRegistry', async () => {
       sharedMemory = cancelWithdrawalResult.Memory;
     });
 
+    it('should not decrease delegate stake with invalid instant withdrawal tag', async () => {
+      const instantWithdrawalTimestamp = stubbedTimestamp + 1000 * 60 * 15; // 15 minutes after stubbedTimestamp
+      const decreaseStakeResult = await handle(
+        {
+          From: newStubAddress,
+          Owner: newStubAddress,
+          Timestamp: instantWithdrawalTimestamp,
+          Id: ''.padEnd(43, 'x'),
+          Tags: [
+            { name: 'Action', value: 'Decrease-Delegate-Stake' },
+            { name: 'Address', value: STUB_ADDRESS },
+            { name: 'Quantity', value: '1000000000' }, // 1K IO
+            { name: 'Instant', value: 'false' }, // FOR SOME REASON THIS WORKS IF YOU PUT 'false' :O
+          ],
+        },
+        sharedMemory,
+      );
+
+      // get the updated gateway record
+      const gateway = await handle(
+        {
+          Tags: [
+            { name: 'Action', value: 'Gateway' },
+            { name: 'Address', value: STUB_ADDRESS },
+          ],
+          Timestamp: instantWithdrawalTimestamp + 1,
+        },
+        decreaseStakeResult.Memory,
+      );
+      const gatewayData = JSON.parse(gateway.Messages[0].Data);
+      assert.deepEqual(gatewayData.totalDelegatedStake, 2_000_000_000);
+    });
+
     it('should decrease delegate stake with instant withdrawal', async () => {
       const instantWithdrawalTimestamp = stubbedTimestamp + 1000 * 60 * 15; // 15 minutes after stubbedTimestamp
       const decreaseStakeResult = await handle(
@@ -860,8 +892,6 @@ describe('GatewayRegistry', async () => {
         },
         sharedMemory,
       );
-
-      console.log ("2: decrease stake result: ", decreaseStakeResult.Messages[0].Data)
 
       // get the updated gateway record
       const gateway = await handle(
@@ -875,7 +905,6 @@ describe('GatewayRegistry', async () => {
         decreaseStakeResult.Memory,
       );
       const gatewayData = JSON.parse(gateway.Messages[0].Data);
-      console.log ("3: gateway result: ", gatewayData)
       // Assertions
       assert.deepEqual(gatewayData.delegates, {
         [newStubAddress]: {
@@ -948,9 +977,12 @@ describe('GatewayRegistry', async () => {
       );
 
       gatewayData = JSON.parse(gateway.Messages[0].Data);
+      console.log ("1: ", gatewayData)
       assert.deepEqual(gatewayData.delegates, []);
       assert.deepEqual(gatewayData.totalDelegatedStake, 0);
       sharedMemory = instantDecreaseStakeResult.Memory;
     });
+
+
   });
 });