chore: gofumpt (#11839)

* fumpt using main not master...

* be more descriptive

* fumpt

* fix nits

Co-authored-by: Julien Robert <julien@rbrt.fr>

db/badgerdb/db.go

@@ -19,9 +19,7 @@ import (
 	"github.com/dgraph-io/ristretto/z"
 )
 
-var (
-	versionsFilename = "versions.csv"
-)
+var versionsFilename = "versions.csv"
 
 var (
 	_ db.DBConnection = (*BadgerDB)(nil)
@@ -74,7 +72,7 @@ type versionManager struct {
 func NewDB(dir string) (*BadgerDB, error) {
 	// Since Badger doesn't support database names, we join both to obtain
 	// the final directory to use for the database.
-	if err := os.MkdirAll(dir, 0755); err != nil {
+	if err := os.MkdirAll(dir, 0o755); err != nil {
 		return nil, err
 	}
 	opts := badger.DefaultOptions(dir)
@@ -102,7 +100,7 @@ func NewDBWithOptions(opts badger.Options) (*BadgerDB, error) {
 
 // Load metadata CSV file containing valid versions
 func readVersionsFile(path string) (*versionManager, error) {
-	file, err := os.OpenFile(path, os.O_RDONLY|os.O_CREATE, 0644)
+	file, err := os.OpenFile(path, os.O_RDONLY|os.O_CREATE, 0o644)
 	if err != nil {
 		return nil, err
 	}
@@ -143,14 +141,14 @@ func readVersionsFile(path string) (*versionManager, error) {
 
 // Write version metadata to CSV file
 func writeVersionsFile(vm *versionManager, path string) error {
-	file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0644)
+	file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0o644)
 	if err != nil {
 		return err
 	}
 	defer file.Close()
 	w := csv.NewWriter(file)
 	rows := [][]string{
-		[]string{"0", strconv.FormatUint(vm.lastTs, 10)},
+		{"0", strconv.FormatUint(vm.lastTs, 10)},
 	}
 	for it := vm.Iterator(); it.Next(); {
 		version := it.Value()

db/internal/util.go

@@ -2,6 +2,7 @@ package util
 
 import (
 	"fmt"
+
 	dbm "github.com/cosmos/cosmos-sdk/db"
 )
 

db/memdb/db.go

@@ -178,7 +178,7 @@ func (dbm *MemDB) Revert() error {
 	if !has {
 		return fmt.Errorf("bad version history: version %v not saved", last)
 	}
-	for ver, _ := range dbm.saved {
+	for ver := range dbm.saved {
 		if ver > last {
 			delete(dbm.saved, ver)
 		}

db/prefix/prefix.go

@@ -24,9 +24,11 @@ type prefixW struct {
 	prefix []byte
 }
 
-var _ db.DBReader = (*prefixR)(nil)
-var _ db.DBReadWriter = (*prefixRW)(nil)
-var _ db.DBWriter = (*prefixW)(nil)
+var (
+	_ db.DBReader     = (*prefixR)(nil)
+	_ db.DBReadWriter = (*prefixRW)(nil)
+	_ db.DBWriter     = (*prefixW)(nil)
+)
 
 // NewPrefixReader returns a DBReader that only has access to the subset of DB keys
 // that contain the given prefix.

db/rocksdb/db.go

@@ -71,7 +71,7 @@ type dbOptions struct {
 // NewDB creates a new RocksDB key-value database with inside the given directory.
 // If dir does not exist, it will be created.
 func NewDB(dir string) (*dbManager, error) {
-	if err := os.MkdirAll(dir, 0755); err != nil {
+	if err := os.MkdirAll(dir, 0o755); err != nil {
 		return nil, err
 	}
 
@@ -100,7 +100,7 @@ func NewDB(dir string) (*dbManager, error) {
 		cpCache: checkpointCache{cache: map[uint64]*cpCacheEntry{}},
 	}
 
-	err := os.MkdirAll(mgr.checkpointsDir(), 0755)
+	err := os.MkdirAll(mgr.checkpointsDir(), 0o755)
 	if err != nil {
 		return nil, err
 	}

db/version_manager.go

@@ -65,7 +65,7 @@ func (vm *VersionManager) Save(target uint64) (uint64, error) {
 }
 
 func findLimit(m map[uint64]struct{}, cmp func(uint64, uint64) bool, init uint64) uint64 {
-	for x, _ := range m {
+	for x := range m {
 		if cmp(x, init) {
 			init = x
 		}
@@ -99,7 +99,7 @@ func (vi *vmIterator) Value() uint64 { return vi.buf }
 func (vm *VersionManager) Iterator() VersionIterator {
 	ch := make(chan uint64)
 	go func() {
-		for ver, _ := range vm.versions {
+		for ver := range vm.versions {
 			ch <- ver
 		}
 		close(ch)
@@ -125,7 +125,7 @@ func (vm *VersionManager) Equal(that VersionSet) bool {
 
 func (vm *VersionManager) Copy() *VersionManager {
 	vmap := make(map[uint64]struct{})
-	for ver, _ := range vm.versions {
+	for ver := range vm.versions {
 		vmap[ver] = struct{}{}
 	}
 	return &VersionManager{versions: vmap, initial: vm.initial, last: vm.last}