fix: shadows

algorand · Jun 2, 2023 · e53c6ca · e53c6ca
1 parent 52c7ca7
commit e53c6ca
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/ledger/store/trackerdb/generickv/accounts_ext_writer.go b/ledger/store/trackerdb/generickv/accounts_ext_writer.go
@@ -173,7 +173,8 @@ func (w *accountsWriter) OnlineAccountsDelete(forgetBefore basics.Round) (err er
 
 			// delete on voting empty
 			var oad trackerdb.BaseOnlineAccountData
-			data, err := iter.Value()
+			var data []byte
+			data, err = iter.Value()
 			if err != nil {
 				return err
 			}

diff --git a/ledger/store/trackerdb/generickv/migrations.go b/ledger/store/trackerdb/generickv/migrations.go
@@ -183,7 +183,7 @@ func (m *migrator) initialVersion(ctx context.Context) error {
 				baseOnlineAD.MicroAlgos = bad.MicroAlgos
 				baseOnlineAD.RewardsBase = bad.RewardsBase
 
-				_, err := oaow.InsertOnlineAccount(addr, account.NormalizedOnlineBalance(proto), baseOnlineAD, uint64(updRound), uint64(baseOnlineAD.VoteLastValid))
+				_, err = oaow.InsertOnlineAccount(addr, account.NormalizedOnlineBalance(proto), baseOnlineAD, uint64(updRound), uint64(baseOnlineAD.VoteLastValid))
 				if err != nil {
 					return err
 				}

diff --git a/ledger/trackerdb.go b/ledger/trackerdb.go
@@ -70,7 +70,8 @@ func trackerDBInitialize(l ledgerForTracker, catchpointEnabled bool, dbPathPrefi
 	if lastBalancesRound > lastestBlockRound {
 		log.Warnf("trackerDBInitialize: resetting accounts DB (on round %v, but blocks DB's latest is %v)", lastBalancesRound, lastestBlockRound)
 		err = dbs.Transaction(func(ctx context.Context, tx trackerdb.TransactionScope) error {
-			aw, err := tx.MakeAccountsWriter()
+			var aw trackerdb.AccountsWriterExt
+			aw, err = tx.MakeAccountsWriter()
 			if err != nil {
 				return err
 			}

diff --git a/tools/debug/transplanter/main.go b/tools/debug/transplanter/main.go
@@ -212,18 +212,18 @@ func transcribeSnappyLog(filePath string, output chan txGroupItem, wg *sync.Wait
 	}
 	defer file.Close()
 
-	var headerDecoder headerDecoder
+	var hd headerDecoder
 	if strings.Contains(path.Base(filePath), "_v2") {
-		headerDecoder = decoderV2{}
+		hd = decoderV2{}
 	} else {
-		headerDecoder = decoderV1{}
+		hd = decoderV1{}
 	}
 
 	snappyReader := snappy.NewReader(file)
 	var n int
 
 	for {
-		headers, lenMsg, err := headerDecoder.decodeHeader(snappyReader)
+		headers, lenMsg, err := hd.decodeHeader(snappyReader)
 		if err == io.EOF {
 			break
 		} else if err != nil {
@@ -395,7 +395,7 @@ func main() {
 			os.Exit(1)
 		}
 		syncRound := uint64(*roundStart) - cfg.MaxAcctLookback + 1
-		err := followerNode.SetSyncRound(syncRound)
+		err = followerNode.SetSyncRound(syncRound)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Cannot configure catchup: %v", err)
 			os.Exit(1)