style: x/genutil: CollectTxs should move []os.DirEntry close to where it is used and also reuse valAccAddr as key to balancesMap

[odeke-em]

Is there an existing issue for this?

• I have searched the existing issues

What happened?

This is a stylistic nit but also makes the code much better

Move []os.DirEntry closest to where it is used

Please see

cosmos-sdk/x/genutil/collect.go

Lines 79 to 99 in 86ab989

	var fos []os.DirEntry
	fos, err = os.ReadDir(genTxsDir)
	if err != nil {
	return appGenTxs, persistentPeers, err
	}
	balancesMap := make(map[string]bankexported.GenesisBalance)
	genBalIterator.IterateGenesisBalances(
	cdc, appState,
	func(balance bankexported.GenesisBalance) (stop bool) {
	addr := balance.GetAddress()
	balancesMap[addr] = balance
	return false
	},
	)
	// addresses and IPs (and port) validator server info
	var addressesIPs []string
	for _, fo := range fos {

and fix it up like this

diff --git a/x/genutil/collect.go b/x/genutil/collect.go
index 422a278b5a..5fc817f47d 100644
--- a/x/genutil/collect.go
+++ b/x/genutil/collect.go
@@ -76,12 +76,6 @@ func CollectTxs(cdc codec.JSONCodec, txJSONDecoder sdk.TxDecoder, moniker, genTx
 		return appGenTxs, persistentPeers, err
 	}
 
-	var fos []os.DirEntry
-	fos, err = os.ReadDir(genTxsDir)
-	if err != nil {
-		return appGenTxs, persistentPeers, err
-	}
-
 	balancesMap := make(map[string]bankexported.GenesisBalance)
 
 	genBalIterator.IterateGenesisBalances(
@@ -93,6 +87,12 @@ func CollectTxs(cdc codec.JSONCodec, txJSONDecoder sdk.TxDecoder, moniker, genTx
 		},
 	)
 
+	var fos []os.DirEntry
+	fos, err = os.ReadDir(genTxsDir)
+	if err != nil {
+		return appGenTxs, persistentPeers, err
+	}
+
 	// addresses and IPs (and port) validator server info
 	var addressesIPs []string
 
@@ -151,7 +151,7 @@ func CollectTxs(cdc codec.JSONCodec, txJSONDecoder sdk.TxDecoder, moniker, genTx
 			return appGenTxs, persistentPeers, fmt.Errorf("account %s balance not in genesis state: %+v", valAccAddr, balancesMap)
 		}
 
-		_, valOk := balancesMap[sdk.AccAddress(valAddr).String()]
+		_, valOk := balancesMap[valAccAddr]
 		if !valOk {
 			_, file, no, ok := runtime.Caller(1)
 			if ok {

Cosmos SDK Version

86ab989

How to reproduce?

No response