diff options
Diffstat (limited to 'ledger/archival_test.go')
| -rw-r--r-- | ledger/archival_test.go | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/ledger/archival_test.go b/ledger/archival_test.go index 8ec3c6127..9d4f3b15d 100644 --- a/ledger/archival_test.go +++ b/ledger/archival_test.go @@ -40,6 +40,7 @@ import ( "github.com/algorand/go-algorand/data/bookkeeping" "github.com/algorand/go-algorand/data/transactions" "github.com/algorand/go-algorand/data/transactions/logic" + "github.com/algorand/go-algorand/ledger/internal" "github.com/algorand/go-algorand/ledger/ledgercore" "github.com/algorand/go-algorand/logging" "github.com/algorand/go-algorand/protocol" @@ -68,7 +69,7 @@ func (wl *wrappedLedger) BlockHdr(rnd basics.Round) (bookkeeping.BlockHeader, er return wl.l.BlockHdr(rnd) } -func (wl *wrappedLedger) trackerEvalVerified(blk bookkeeping.Block, accUpdatesLedger ledgerForEvaluator) (ledgercore.StateDelta, error) { +func (wl *wrappedLedger) trackerEvalVerified(blk bookkeeping.Block, accUpdatesLedger internal.LedgerForEvaluator) (ledgercore.StateDelta, error) { return wl.l.trackerEvalVerified(blk, accUpdatesLedger) } @@ -96,7 +97,11 @@ func (wl *wrappedLedger) GenesisProto() config.ConsensusParams { return wl.l.GenesisProto() } -func getInitState() (genesisInitState InitState) { +func (wl *wrappedLedger) GenesisAccounts() map[basics.Address]basics.AccountData { + return wl.l.GenesisAccounts() +} + +func getInitState() (genesisInitState ledgercore.InitState) { blk := bookkeeping.Block{} blk.CurrentProtocol = protocol.ConsensusCurrentVersion blk.RewardsPool = testPoolAddr @@ -790,9 +795,10 @@ func checkTrackers(t *testing.T, wl *wrappedLedger, rnd basics.Round) (basics.Ro defer wl.l.trackerMu.RUnlock() for _, trk := range wl.l.trackers.trackers { if au, ok := trk.(*accountUpdates); ok { - au.waitAccountsWriting() - minSave = trk.committedUpTo(rnd) - au.waitAccountsWriting() + wl.l.trackers.waitAccountsWriting() + minSave, _ = trk.committedUpTo(rnd) + wl.l.trackers.committedUpTo(rnd) + wl.l.trackers.waitAccountsWriting() if minSave < minMinSave { minMinSave = minSave } @@ -804,9 +810,9 @@ func checkTrackers(t *testing.T, wl *wrappedLedger, rnd basics.Round) (basics.Ro au = cleanTracker.(*accountUpdates) cfg := config.GetDefaultLocal() cfg.Archival = true - au.initialize(cfg, "", au.initProto, wl.l.accts.initAccounts) + au.initialize(cfg) } else { - minSave = trk.committedUpTo(rnd) + minSave, _ = trk.committedUpTo(rnd) if minSave < minMinSave { minMinSave = minSave } @@ -817,7 +823,7 @@ func checkTrackers(t *testing.T, wl *wrappedLedger, rnd basics.Round) (basics.Ro } cleanTracker.close() - err := cleanTracker.loadFromDisk(wl) + err := cleanTracker.loadFromDisk(wl, wl.l.trackers.dbRound) require.NoError(t, err) cleanTracker.close() |