CR fixes and one comment

algorand · May 30, 2023 · 81c8461 · 81c8461
1 parent 2f25253
commit 81c8461
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/ledger/acctupdates.go b/ledger/acctupdates.go
@@ -1508,8 +1508,7 @@ func (au *accountUpdates) lookupWithoutRewards(rnd basics.Round, addr basics.Add
 }
 
 // getCreatorForRound returns the asset/app creator for a given asset/app index at a given round
-func (au *accountUpdates) getCreatorForRound(rnd basics.Round, cidx basics.CreatableIndex, ctype basics.CreatableType, synchronized bool) (
-	/* creator */ basics.Address /* found */, bool, error) {
+func (au *accountUpdates) getCreatorForRound(rnd basics.Round, cidx basics.CreatableIndex, ctype basics.CreatableType, synchronized bool) (basics.Address, bool, error) {
 	unlock := false
 	if synchronized {
 		au.accountsMu.RLock()

diff --git a/ledger/catchpointtracker.go b/ledger/catchpointtracker.go
@@ -1066,6 +1066,7 @@ func (ct *catchpointTracker) accountsUpdateBalances(accountsDeltas compactAccoun
 	if ct.log.GetTelemetryEnabled() {
 		root, rootErr := ct.balancesTrie.RootHash()
 		if rootErr != nil {
+			// log rootErr if failed to fetch for reporting in telemetry, then return whether Commit() succeeded or not
 			ct.log.Errorf("accountsUpdateBalances: error retrieving balances trie root: %v", rootErr)
 			return commitErr
 		}

diff --git a/ledger/catchupaccessor.go b/ledger/catchupaccessor.go
@@ -603,9 +603,9 @@ func (c *catchpointCatchupAccessorImpl) processStagingBalances(ctx context.Conte
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		writeBalStart := time.Now()
+		writeBalancesStart := time.Now()
 		errBalances = c.stagingWriter.writeBalances(ctx, normalizedAccountBalances)
-		durBalances = time.Since(writeBalStart)
+		durBalances = time.Since(writeBalancesStart)
 	}()
 
 	// on a in-memory database, wait for the writer to finish before starting the new writer
@@ -627,9 +627,9 @@ func (c *catchpointCatchupAccessorImpl) processStagingBalances(ctx context.Conte
 			}
 		}
 		if hasCreatables {
-			writeStart := time.Now()
+			writeCreatablesStart := time.Now()
 			errCreatables = c.stagingWriter.writeCreatables(ctx, normalizedAccountBalances)
-			durCreatables = time.Since(writeStart)
+			durCreatables = time.Since(writeCreatablesStart)
 		}
 	}()