diff --git a/ledger/acctonline_test.go b/ledger/acctonline_test.go index 28cc9c3b0d..4e8f7b1759 100644 --- a/ledger/acctonline_test.go +++ b/ledger/acctonline_test.go @@ -1334,7 +1334,7 @@ func TestAcctOnlineVotersLongerHistory(t *testing.T) { var foundCount int err = oa.dbs.Snapshot(func(ctx context.Context, tx trackerdb.SnapshotScope) error { // read staging = false, excludeBefore = excludeRound - it, err2 := tx.MakeOnlineAccountsIter(ctx, false, excludeRound) + it, err2 := tx.MakeOrderedOnlineAccountsIter(ctx, false, excludeRound) require.NoError(t, err2) defer it.Close() diff --git a/ledger/catchpointfilewriter.go b/ledger/catchpointfilewriter.go index 269020190f..edefa6f8a3 100644 --- a/ledger/catchpointfilewriter.go +++ b/ledger/catchpointfilewriter.go @@ -388,7 +388,7 @@ func (cw *catchpointFileWriter) readDatabaseStep(ctx context.Context) error { if cw.params.EnableCatchpointsWithOnlineAccounts && !cw.onlineAccountsDone { // Create the OnlineAccounts iterator JIT if cw.onlineAccountRows == nil { - rows, err := cw.tx.MakeOnlineAccountsIter(ctx, false, cw.onlineExcludeBefore) + rows, err := cw.tx.MakeOrderedOnlineAccountsIter(ctx, false, cw.onlineExcludeBefore) if err != nil { return err } diff --git a/ledger/catchpointfilewriter_test.go b/ledger/catchpointfilewriter_test.go index a218bc651a..189ec04653 100644 --- a/ledger/catchpointfilewriter_test.go +++ b/ledger/catchpointfilewriter_test.go @@ -1194,9 +1194,9 @@ assert t.Log("DB round generator", genDBRound, "validator", valDBRound) t.Log("Latest round generator", genLatestRound, "validator", valLatestRound) - genOAHash, genOARows, err := calculateVerificationHash(context.Background(), dl.generator.trackerDB().MakeOnlineAccountsIter, 0, false) + genOAHash, genOARows, err := calculateVerificationHash(context.Background(), dl.generator.trackerDB().MakeOrderedOnlineAccountsIter, 0, false) require.NoError(t, err) - valOAHash, valOARows, err := calculateVerificationHash(context.Background(), dl.validator.trackerDB().MakeOnlineAccountsIter, 0, false) + valOAHash, valOARows, err := calculateVerificationHash(context.Background(), dl.validator.trackerDB().MakeOrderedOnlineAccountsIter, 0, false) require.NoError(t, err) require.Equal(t, genOAHash, valOAHash) require.NotZero(t, genOAHash) @@ -1222,7 +1222,7 @@ assert l := testNewLedgerFromCatchpoint(t, dl.generator.trackerDB(), catchpointFilePath) defer l.Close() - catchpointOAHash, catchpointOARows, err := calculateVerificationHash(context.Background(), l.trackerDBs.MakeOnlineAccountsIter, 0, false) + catchpointOAHash, catchpointOARows, err := calculateVerificationHash(context.Background(), l.trackerDBs.MakeOrderedOnlineAccountsIter, 0, false) require.NoError(t, err) require.Equal(t, genOAHash, catchpointOAHash) t.Log("catchpoint onlineaccounts hash", catchpointOAHash, "matches") diff --git a/ledger/catchpointtracker.go b/ledger/catchpointtracker.go index 268542f4b8..7c0730a9c2 100644 --- a/ledger/catchpointtracker.go +++ b/ledger/catchpointtracker.go @@ -256,7 +256,7 @@ func (ct *catchpointTracker) finishFirstStage(ctx context.Context, dbRound basic // Generate hashes of the onlineaccounts and onlineroundparams tables. err := ct.dbs.Snapshot(func(ctx context.Context, tx trackerdb.SnapshotScope) error { var dbErr error - onlineAccountsHash, _, dbErr = calculateVerificationHash(ctx, tx.MakeOnlineAccountsIter, onlineExcludeBefore, false) + onlineAccountsHash, _, dbErr = calculateVerificationHash(ctx, tx.MakeOrderedOnlineAccountsIter, onlineExcludeBefore, false) if dbErr != nil { return dbErr diff --git a/ledger/catchupaccessor.go b/ledger/catchupaccessor.go index 7a3cae3e2c..dd64e46d1e 100644 --- a/ledger/catchupaccessor.go +++ b/ledger/catchupaccessor.go @@ -1031,7 +1031,7 @@ func (c *catchpointCatchupAccessorImpl) GetVerifyData(ctx context.Context) (bala return fmt.Errorf("unable to get state proof verification data: %v", err) } - onlineAccountsHash, _, err = calculateVerificationHash(ctx, tx.MakeOnlineAccountsIter, 0, true) + onlineAccountsHash, _, err = calculateVerificationHash(ctx, tx.MakeOrderedOnlineAccountsIter, 0, true) if err != nil { return fmt.Errorf("unable to get online accounts verification data: %v", err) } diff --git a/ledger/store/trackerdb/dualdriver/dualdriver.go b/ledger/store/trackerdb/dualdriver/dualdriver.go index dfb7aba14b..09e4cf085d 100644 --- a/ledger/store/trackerdb/dualdriver/dualdriver.go +++ b/ledger/store/trackerdb/dualdriver/dualdriver.go @@ -278,8 +278,8 @@ func (*reader) MakeKVsIter(ctx context.Context) (trackerdb.KVsIter, error) { return nil, nil } -// MakeOnlineAccountsIter implements trackerdb.Reader -func (*reader) MakeOnlineAccountsIter(context.Context, bool, basics.Round) (trackerdb.TableIterator[*encoded.OnlineAccountRecordV6], error) { +// MakeOrderedOnlineAccountsIter implements trackerdb.Reader +func (*reader) MakeOrderedOnlineAccountsIter(context.Context, bool, basics.Round) (trackerdb.TableIterator[*encoded.OnlineAccountRecordV6], error) { // TODO: catchpoint return nil, nil } diff --git a/ledger/store/trackerdb/generickv/reader.go b/ledger/store/trackerdb/generickv/reader.go index 110c983f59..bada2007c4 100644 --- a/ledger/store/trackerdb/generickv/reader.go +++ b/ledger/store/trackerdb/generickv/reader.go @@ -79,8 +79,8 @@ func (r *reader) MakeKVsIter(ctx context.Context) (trackerdb.KVsIter, error) { panic("unimplemented") } -// MakeOnlineAccountsIter implements trackerdb.Reader -func (r *reader) MakeOnlineAccountsIter(context.Context, bool, basics.Round) (trackerdb.TableIterator[*encoded.OnlineAccountRecordV6], error) { +// MakeOrderedOnlineAccountsIter implements trackerdb.Reader +func (r *reader) MakeOrderedOnlineAccountsIter(context.Context, bool, basics.Round) (trackerdb.TableIterator[*encoded.OnlineAccountRecordV6], error) { // TODO: catchpoint panic("unimplemented") } diff --git a/ledger/store/trackerdb/sqlitedriver/sqlitedriver.go b/ledger/store/trackerdb/sqlitedriver/sqlitedriver.go index 6cdbbf1501..28262de31a 100644 --- a/ledger/store/trackerdb/sqlitedriver/sqlitedriver.go +++ b/ledger/store/trackerdb/sqlitedriver/sqlitedriver.go @@ -211,8 +211,8 @@ func (r *sqlReader) MakeKVsIter(ctx context.Context) (trackerdb.KVsIter, error) return MakeKVsIter(ctx, r.q) } -// MakeOnlineAccountsIter implements trackerdb.Reader -func (r *sqlReader) MakeOnlineAccountsIter(ctx context.Context, useStaging bool, excludeBefore basics.Round) (trackerdb.TableIterator[*encoded.OnlineAccountRecordV6], error) { +// MakeOrderedOnlineAccountsIter implements trackerdb.Reader +func (r *sqlReader) MakeOrderedOnlineAccountsIter(ctx context.Context, useStaging bool, excludeBefore basics.Round) (trackerdb.TableIterator[*encoded.OnlineAccountRecordV6], error) { return MakeOnlineAccountsIter(ctx, r.q, useStaging, excludeBefore) } diff --git a/ledger/store/trackerdb/store.go b/ledger/store/trackerdb/store.go index 78988d6a16..dcba46c760 100644 --- a/ledger/store/trackerdb/store.go +++ b/ledger/store/trackerdb/store.go @@ -67,7 +67,7 @@ type Reader interface { MakeCatchpointReader() (CatchpointReader, error) MakeEncodedAccountsBatchIter() EncodedAccountsBatchIter MakeKVsIter(ctx context.Context) (KVsIter, error) - MakeOnlineAccountsIter(ctx context.Context, useStaging bool, excludeBefore basics.Round) (TableIterator[*encoded.OnlineAccountRecordV6], error) + MakeOrderedOnlineAccountsIter(ctx context.Context, useStaging bool, excludeBefore basics.Round) (TableIterator[*encoded.OnlineAccountRecordV6], error) MakeOnlineRoundParamsIter(ctx context.Context, useStaging bool, excludeBefore basics.Round) (TableIterator[*encoded.OnlineRoundParamsRecordV6], error) }