fix name confusion with EnableOnlineAccountCatchpoints

algorand · Jan 7, 2025 · 0097856 · 0097856
1 parent 4fdd46a
commit 0097856
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/ledger/catchpointfilewriter.go b/ledger/catchpointfilewriter.go
@@ -379,7 +379,7 @@ func (cw *catchpointFileWriter) readDatabaseStep(ctx context.Context) error {
 		cw.kvDone = true
 	}
 
-	if cw.params.EnableOnlineAccountCatchpoints && !cw.onlineAccountsDone {
+	if cw.params.EnableCatchpointsWithOnlineAccounts && !cw.onlineAccountsDone {
 		// Create the OnlineAccounts iterator JIT
 		if cw.onlineAccountRows == nil {
 			rows, err := cw.tx.MakeOnlineAccountsIter(ctx, false, cw.onlineExcludeBefore)
@@ -408,7 +408,7 @@ func (cw *catchpointFileWriter) readDatabaseStep(ctx context.Context) error {
 		cw.onlineAccountsDone = true
 	}
 
-	if cw.params.EnableOnlineAccountCatchpoints && !cw.onlineRoundParamsDone {
+	if cw.params.EnableCatchpointsWithOnlineAccounts && !cw.onlineRoundParamsDone {
 		// Create the OnlineRoundParams iterator JIT
 		if cw.onlineRoundParamsRows == nil {
 			rows, err := cw.tx.MakeOnlineRoundParamsIter(ctx, false, cw.onlineExcludeBefore)

diff --git a/ledger/catchpointfilewriter_test.go b/ledger/catchpointfilewriter_test.go
@@ -831,14 +831,14 @@ func testCatchpointFlushRound(l *Ledger) {
 
 func TestExactAccountChunk(t *testing.T) {
 	partitiontest.PartitionTest(t)
-	t.Parallel()
+	// t.Parallel() // probably not good to parallelize catchpoint file save/load
 
-	t.Run("v33", func(t *testing.T) {
-		proto := protocol.ConsensusV33
+	t.Run("v39", func(t *testing.T) {
+		proto := protocol.ConsensusV39
 		testExactAccountChunk(t, proto, 1)
 	})
-	t.Run("v34", func(t *testing.T) {
-		proto := protocol.ConsensusV34
+	t.Run("v40", func(t *testing.T) {
+		proto := protocol.ConsensusV40
 		testExactAccountChunk(t, proto, 2)
 	})
 	t.Run("future", func(t *testing.T) {