fix(events): use reduce properly PE-6976

ar-io · Oct 25, 2024 · 62df6d6 · 62df6d6
1 parent ff06e0a
commit 62df6d6
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 25 deletions.
diff --git a/spec/utils_spec.lua b/spec/utils_spec.lua
@@ -63,12 +63,28 @@ describe("utils", function()
 			assert.are.same("foo", utils.reduce(input, stubReducer, "foo"))
 		end)
 
-		it("should return the reduced value", function()
-			local input = { 1, 2, 3, 4, 5 }
-			local reducer = function(acc, value)
+		it("should return the reduced value for a numeric table", function()
+			local input = { 1, 3, 5, 7, 9 }
+			assert.are.same(
+				15,
+				utils.reduce(input, function(acc, key)
+					return acc + key
+				end, 0)
+			)
+			assert.are.same(
+				25,
+				utils.reduce(input, function(acc, _, value)
+					return acc + value
+				end, 0)
+			)
+		end)
+
+		it("should return the reduced value for a keyed table", function()
+			local input = { foo = 2, bar = 4, baz = 6, oof = 8, rab = 10 }
+			local reducer = function(acc, _, value)
 				return acc + value
 			end
-			assert.are.same(15, utils.reduce(input, reducer, 0))
+			assert.are.same(30, utils.reduce(input, reducer, 0))
 		end)
 	end)
 

diff --git a/src/main.lua b/src/main.lua
@@ -1797,27 +1797,32 @@ addEventingHandler("distribute", utils.hasMatchingTag("Action", "Tick"), functio
 	end
 	if #newPruneGatewaysResults > 0 then
 		-- Reduce the prune gatways results and then track changes
-		local aggregatedPruneGatewaysResult = utils.reduce(newPruneGatewaysResults, function(acc, pruneGatewaysResult)
-			for _, address in pairs(pruneGatewaysResult.prunedGateways) do
-				table.insert(acc.prunedGateways, address)
-			end
-			for address, slashAmount in pairs(pruneGatewaysResult.slashedGateways) do
-				acc.slashedGateways[address] = (acc.slashedGateways[address] or 0) + slashAmount
-			end
-			acc.gatewayStakeReturned = acc.gatewayStakeReturned + pruneGatewaysResult.gatewayStakeReturned
-			acc.delegateStakeReturned = acc.delegateStakeReturned + pruneGatewaysResult.delegateStakeReturned
-			acc.gatewayStakeWithdrawing = acc.gatewayStakeWithdrawing + pruneGatewaysResult.gatewayStakeWithdrawing
-			acc.delegateStakeWithdrawing = acc.delegateStakeWithdrawing + pruneGatewaysResult.delegateStakeWithdrawing
-			return acc
-		end, {
-			prunedGateways = {},
-			slashedGateways = {},
-			gatewayStakeReturned = 0,
-			delegateStakeReturned = 0,
-			gatewayStakeWithdrawing = 0,
-			delegateStakeWithdrawing = 0,
-			stakeSlashed = 0,
-		})
+		local aggregatedPruneGatewaysResult = utils.reduce(
+			newPruneGatewaysResults,
+			function(acc, _, pruneGatewaysResult)
+				for _, address in pairs(pruneGatewaysResult.prunedGateways) do
+					table.insert(acc.prunedGateways, address)
+				end
+				for address, slashAmount in pairs(pruneGatewaysResult.slashedGateways) do
+					acc.slashedGateways[address] = (acc.slashedGateways[address] or 0) + slashAmount
+				end
+				acc.gatewayStakeReturned = acc.gatewayStakeReturned + pruneGatewaysResult.gatewayStakeReturned
+				acc.delegateStakeReturned = acc.delegateStakeReturned + pruneGatewaysResult.delegateStakeReturned
+				acc.gatewayStakeWithdrawing = acc.gatewayStakeWithdrawing + pruneGatewaysResult.gatewayStakeWithdrawing
+				acc.delegateStakeWithdrawing = acc.delegateStakeWithdrawing
+					+ pruneGatewaysResult.delegateStakeWithdrawing
+				return acc
+			end,
+			{
+				prunedGateways = {},
+				slashedGateways = {},
+				gatewayStakeReturned = 0,
+				delegateStakeReturned = 0,
+				gatewayStakeWithdrawing = 0,
+				delegateStakeWithdrawing = 0,
+				stakeSlashed = 0,
+			}
+		)
 		addPruneGatewaysResults(msg.ioEvent, aggregatedPruneGatewaysResult)
 	end
 	if utils.lengthOfTable(tickedRewardDistributions) > 0 then