Fix regression in TestReproducibleCatchpointLabels (#3037)

Fix the test TestReproducibleCatchpointLabels, by provide proper calculation of the account totals.

Author: tsachiherman

ledger/acctupdates_test.go

@@ -1537,6 +1537,8 @@ func TestReproducibleCatchpointLabels(t *testing.T) {
 		updates.Upsert(testPoolAddr, newPool)
 		totals[testPoolAddr] = newPool
 
+		newTotals := ledgertesting.CalculateNewRoundAccountTotals(t, updates, rewardLevel, protoParams, base, prevTotals)
+
 		blk := bookkeeping.Block{
 			BlockHeader: bookkeeping.BlockHeader{
 				Round: basics.Round(i),
@@ -1547,6 +1549,8 @@ func TestReproducibleCatchpointLabels(t *testing.T) {
 		delta := ledgercore.MakeStateDelta(&blk.BlockHeader, 0, updates.Len(), 0)
 		delta.Accts.MergeAccounts(updates)
 		delta.Creatables = creatablesFromUpdates(base, updates, knownCreatables)
+		delta.Totals = newTotals
+
 		au.newBlock(blk, delta)
 		au.committedUpTo(i)
 		ml.addMockBlock(blockEntry{block: blk}, delta)

ledger/testing/accountsTotals.go

@@ -0,0 +1,41 @@
+// Copyright (C) 2019-2021 Algorand, Inc.
+// This file is part of go-algorand
+//
+// go-algorand is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// go-algorand is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with go-algorand.  If not, see <https://www.gnu.org/licenses/>.
+
+package testing
+
+import (
+	gotesting "testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/algorand/go-algorand/config"
+	"github.com/algorand/go-algorand/data/basics"
+	"github.com/algorand/go-algorand/ledger/ledgercore"
+)
+
+// CalculateNewRoundAccountTotals calculates the accounts totals for a given round
+func CalculateNewRoundAccountTotals(t *gotesting.T, newRoundDeltas ledgercore.AccountDeltas, newRoundRewardLevel uint64, newRoundConsensusParams config.ConsensusParams, prevRoundBalances map[basics.Address]basics.AccountData, prevRoundTotals ledgercore.AccountTotals) (newTotals ledgercore.AccountTotals) {
+	newTotals = prevRoundTotals
+	var ot basics.OverflowTracker
+	newTotals.ApplyRewards(newRoundRewardLevel, &ot)
+	for i := 0; i < newRoundDeltas.Len(); i++ {
+		addr, ad := newRoundDeltas.GetByIdx(i)
+		newTotals.DelAccount(newRoundConsensusParams, prevRoundBalances[addr], &ot)
+		newTotals.AddAccount(newRoundConsensusParams, ad, &ot)
+	}
+	require.False(t, ot.Overflowed)
+	return
+}