Skip to content

Commit

Permalink
Fix regression in TestReproducibleCatchpointLabels (algorand#3037)
Browse files Browse the repository at this point in the history
Fix the test TestReproducibleCatchpointLabels, by provide proper calculation of the account totals.
  • Loading branch information
tsachiherman authored and cce committed Oct 28, 2021
1 parent 363acbe commit d3a4b40
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 0 deletions.
4 changes: 4 additions & 0 deletions ledger/acctupdates_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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)
Expand Down
41 changes: 41 additions & 0 deletions ledger/testing/accountsTotals.go
Original file line number Diff line number Diff line change
@@ -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
}

0 comments on commit d3a4b40

Please sign in to comment.