From d3a4b40335eea9984c2c287ee182fe0bf6bcd944 Mon Sep 17 00:00:00 2001 From: Tsachi Herman Date: Mon, 11 Oct 2021 16:21:07 -0400 Subject: [PATCH] Fix regression in TestReproducibleCatchpointLabels (#3037) Fix the test TestReproducibleCatchpointLabels, by provide proper calculation of the account totals. --- ledger/acctupdates_test.go | 4 ++++ ledger/testing/accountsTotals.go | 41 ++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 ledger/testing/accountsTotals.go diff --git a/ledger/acctupdates_test.go b/ledger/acctupdates_test.go index cfd1ab1db7..402d4a7710 100644 --- a/ledger/acctupdates_test.go +++ b/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) diff --git a/ledger/testing/accountsTotals.go b/ledger/testing/accountsTotals.go new file mode 100644 index 0000000000..b646a68292 --- /dev/null +++ b/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 . + +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 +}