refactor: remove defer in loop

store/commitment/store.go

@@ -399,7 +399,10 @@ loop:
 				if err := importer.Commit(); err != nil {
 					return snapshotstypes.SnapshotItem{}, fmt.Errorf("failed to commit importer: %w", err)
 				}
-				importer.Close()
+				err := importer.Close()
+				if err != nil {
+					return snapshotstypes.SnapshotItem{}, err
+				}
 			}
 
 			storeKey = item.Store.Name
@@ -411,7 +414,6 @@ loop:
 			if err != nil {
 				return snapshotstypes.SnapshotItem{}, fmt.Errorf("failed to import tree for version %d: %w", version, err)
 			}
-			defer importer.Close()
 
 		case *snapshotstypes.SnapshotItem_IAVL:
 			if importer == nil {
@@ -460,6 +462,11 @@ loop:
 		}
 	}
 
+	err := importer.Close()
+	if err != nil {
+		return snapshotstypes.SnapshotItem{}, err
+	}
+
 	return snapshotItem, c.LoadVersion(version)
 }
 

store/migration/manager.go

@@ -134,14 +134,18 @@ func (m *Manager) writeChangeset() error {
 		}
 
 		batch := m.db.NewBatch()
-		defer batch.Close()
 
 		if err := batch.Set(csKey, csBytes); err != nil {
 			return fmt.Errorf("failed to write changeset to db.Batch: %w", err)
 		}
 		if err := batch.Write(); err != nil {
 			return fmt.Errorf("failed to write changeset to db: %w", err)
 		}
+
+		err = batch.Close()
+		if err != nil {
+			return err
+		}
 	}
 
 	return nil

store/snapshots/store.go

@@ -172,7 +172,6 @@ func (s *Store) Load(height uint64, format uint32) (*types.Snapshot, <-chan io.R
 				_ = pw.CloseWithError(err)
 				return
 			}
-			defer chunk.Close()
 			_, err = io.Copy(pw, chunk)
 			if err != nil {
 				_ = pw.CloseWithError(err)

store/storage/storage_test_suite.go

@@ -256,8 +256,6 @@ func (s *StorageTestSuite) TestDatabase_Iterator() {
 		itr, err := db.Iterator(storeKey1Bytes, v, []byte("key000"), nil)
 		s.Require().NoError(err)
 
-		defer itr.Close()
-
 		var i, count int
 		for ; itr.Valid(); itr.Next() {
 			s.Require().Equal([]byte(fmt.Sprintf("key%03d", i)), itr.Key(), string(itr.Key()))
@@ -271,15 +269,18 @@ func (s *StorageTestSuite) TestDatabase_Iterator() {
 
 		// seek past domain, which should make the iterator invalid and produce an error
 		s.Require().False(itr.Valid())
+
+		err = itr.Close()
+		if err != nil {
+			return
+		}
 	}
 
 	// iterator with a start and end domain over multiple versions
 	for v := uint64(1); v < 5; v++ {
 		itr2, err := db.Iterator(storeKey1Bytes, v, []byte("key010"), []byte("key019"))
 		s.Require().NoError(err)
 
-		defer itr2.Close()
-
 		i, count := 10, 0
 		for ; itr2.Valid(); itr2.Next() {
 			s.Require().Equal([]byte(fmt.Sprintf("key%03d", i)), itr2.Key())
@@ -293,6 +294,11 @@ func (s *StorageTestSuite) TestDatabase_Iterator() {
 
 		// seek past domain, which should make the iterator invalid and produce an error
 		s.Require().False(itr2.Valid())
+
+		err = itr2.Close()
+		if err != nil {
+			return
+		}
 	}
 
 	// start must be <= end

tests/integration/auth/client/cli/suite_test.go

@@ -207,14 +207,15 @@ func (s *CLITestSuite) TestCLISignBatchTotalFees() {
 					sdk.NewCoins(sendTokens), clitestutil.TestTxConfig{GenOnly: true})
 				s.Require().NoError(err)
 				txFile := testutil.WriteToNewTempFile(s.T(), tx.String()+"\n")
-				defer txFile.Close()
 				txFiles[i] = txFile.Name()
 
 				unsignedTx, err := txCfg.TxJSONDecoder()(tx.Bytes())
 				s.Require().NoError(err)
 				txBuilder, err := txCfg.WrapTxBuilder(unsignedTx)
 				s.Require().NoError(err)
 				expectedBatchedTotalFee += txBuilder.GetTx().GetFee().AmountOf(tc.denom).Int64()
+				err = txFile.Close()
+				s.NoError(err)
 			}
 
 			// Test batch sign

x/group/keeper/invariants.go

@@ -42,7 +42,12 @@ func GroupTotalWeightInvariantHelper(ctx sdk.Context, storeService storetypes.KV
 		msg += fmt.Sprintf("PrefixScan failure on group table\n%v\n", err)
 		return msg, broken
 	}
-	defer groupIt.Close()
+	defer func(groupIt orm.Iterator) {
+		err := groupIt.Close()
+		if err != nil {
+			return
+		}
+	}(groupIt)
 
 	groups := make(map[uint64]group.GroupInfo)
 	for {
@@ -76,7 +81,6 @@ func GroupTotalWeightInvariantHelper(ctx sdk.Context, storeService storetypes.KV
 			msg += fmt.Sprintf("error while returning group member iterator for group with ID %d\n%v\n", groupInfo.Id, err)
 			return msg, broken
 		}
-		defer memIt.Close()
 
 		for {
 			var groupMember group.GroupMember
@@ -113,6 +117,10 @@ func GroupTotalWeightInvariantHelper(ctx sdk.Context, storeService storetypes.KV
 			msg += fmt.Sprintf("group's TotalWeight must be equal to the sum of its members' weights\ngroup weight: %s\nSum of group members weights: %s\n", groupWeight.String(), membersWeight.String())
 			break
 		}
+		err = memIt.Close()
+		if err != nil {
+			return "", broken
+		}
 	}
 
 	return msg, broken