linter fixes

gnolang · Jan 30, 2024 · ea39113 · ea39113
1 parent a63e6b0
commit ea39113
Show file tree

Hide file tree

Showing 28 changed files with 160 additions and 149 deletions.
diff --git a/gno.land/pkg/sdk/vm/common_test.go b/gno.land/pkg/sdk/vm/common_test.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 
 	bft "github.com/gnolang/gno/tm2/pkg/bft/types"
-	dbm "github.com/gnolang/gno/tm2/pkg/db"
+	"github.com/gnolang/gno/tm2/pkg/db/memdb"
 	"github.com/gnolang/gno/tm2/pkg/log"
 	"github.com/gnolang/gno/tm2/pkg/sdk"
 	authm "github.com/gnolang/gno/tm2/pkg/sdk/auth"
@@ -25,7 +25,7 @@ type testEnv struct {
 }
 
 func setupTestEnv() testEnv {
-	db := dbm.NewMemDB()
+	db := memdb.NewMemDB()
 
 	baseCapKey := store.NewStoreKey("baseCapKey")
 	iavlCapKey := store.NewStoreKey("iavlCapKey")

diff --git a/gnovm/pkg/gnolang/machine_test.go b/gnovm/pkg/gnolang/machine_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	dbm "github.com/gnolang/gno/tm2/pkg/db"
+	"github.com/gnolang/gno/tm2/pkg/db/memdb"
 	"github.com/gnolang/gno/tm2/pkg/std"
 	"github.com/gnolang/gno/tm2/pkg/store/dbadapter"
 	"github.com/gnolang/gno/tm2/pkg/store/iavl"
@@ -22,7 +22,7 @@ func BenchmarkCreateNewMachine(b *testing.B) {
 func TestRunMemPackageWithOverrides_revertToOld(t *testing.T) {
 	// A test to check revertToOld is correctly putting back an old value,
 	// after preprocessing fails.
-	db := dbm.NewMemDB()
+	db := memdb.NewMemDB()
 	baseStore := dbadapter.StoreConstructor(db, stypes.StoreOptions{})
 	iavlStore := iavl.StoreConstructor(db, stypes.StoreOptions{})
 	store := NewStore(nil, baseStore, iavlStore)

diff --git a/tm2/pkg/bft/blockchain/reactor_test.go b/tm2/pkg/bft/blockchain/reactor_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/gnolang/gno/tm2/pkg/bft/store"
 	"github.com/gnolang/gno/tm2/pkg/bft/types"
 	tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time"
-	dbm "github.com/gnolang/gno/tm2/pkg/db"
+	"github.com/gnolang/gno/tm2/pkg/db/memdb"
 	"github.com/gnolang/gno/tm2/pkg/errors"
 	"github.com/gnolang/gno/tm2/pkg/log"
 	"github.com/gnolang/gno/tm2/pkg/p2p"
@@ -65,8 +65,8 @@ func newBlockchainReactor(logger *slog.Logger, genDoc *types.GenesisDoc, privVal
 		panic(errors.Wrap(err, "error start app"))
 	}
 
-	blockDB := dbm.NewMemDB()
-	stateDB := dbm.NewMemDB()
+	blockDB := memdb.NewMemDB()
+	stateDB := memdb.NewMemDB()
 	blockStore := store.NewBlockStore(blockDB)
 
 	state, err := sm.LoadStateFromDBOrGenesisDoc(stateDB, genDoc)
@@ -78,7 +78,7 @@ func newBlockchainReactor(logger *slog.Logger, genDoc *types.GenesisDoc, privVal
 	// NOTE we have to create and commit the blocks first because
 	// pool.height is determined from the store.
 	fastSync := true
-	db := dbm.NewMemDB()
+	db := memdb.NewMemDB()
 	blockExec := sm.NewBlockExecutor(db, logger, proxyApp.Consensus(), mock.Mempool{})
 	sm.SaveState(db, state)
 

diff --git a/tm2/pkg/bft/consensus/common_test.go b/tm2/pkg/bft/consensus/common_test.go
@@ -27,6 +27,7 @@ import (
 	tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time"
 	"github.com/gnolang/gno/tm2/pkg/crypto"
 	dbm "github.com/gnolang/gno/tm2/pkg/db"
+	"github.com/gnolang/gno/tm2/pkg/db/memdb"
 	"github.com/gnolang/gno/tm2/pkg/events"
 	"github.com/gnolang/gno/tm2/pkg/log"
 	osm "github.com/gnolang/gno/tm2/pkg/os"
@@ -266,7 +267,7 @@ func newConsensusState(state sm.State, pv types.PrivValidator, app abci.Applicat
 }
 
 func newConsensusStateWithConfig(thisConfig *cfg.Config, state sm.State, pv types.PrivValidator, app abci.Application) *ConsensusState {
-	blockDB := dbm.NewMemDB()
+	blockDB := memdb.NewMemDB()
 	return newConsensusStateWithConfigAndBlockStore(thisConfig, state, pv, app, blockDB)
 }
 
@@ -576,7 +577,7 @@ func randConsensusNet(nValidators int, testName string, tickerFunc func() Timeou
 	logger := log.NewNoopLogger()
 	configRootDirs := make([]string, 0, nValidators)
 	for i := 0; i < nValidators; i++ {
-		stateDB := dbm.NewMemDB() // each state needs its own db
+		stateDB := memdb.NewMemDB() // each state needs its own db
 		state, _ := sm.LoadStateFromDBOrGenesisDoc(stateDB, genDoc)
 		thisConfig := ResetConfig(fmt.Sprintf("%s_%d", testName, i))
 		configRootDirs = append(configRootDirs, thisConfig.RootDir)
@@ -616,7 +617,7 @@ func randConsensusNetWithPeers(nValidators, nPeers int, testName string, tickerF
 	var peer0Config *cfg.Config
 	configRootDirs := make([]string, 0, nPeers)
 	for i := 0; i < nPeers; i++ {
-		stateDB := dbm.NewMemDB() // each state needs its own db
+		stateDB := memdb.NewMemDB() // each state needs its own db
 		state, _ := sm.LoadStateFromDBOrGenesisDoc(stateDB, genDoc)
 		thisConfig := ResetConfig(fmt.Sprintf("%s_%d", testName, i))
 		configRootDirs = append(configRootDirs, thisConfig.RootDir)

diff --git a/tm2/pkg/bft/consensus/mempool_test.go b/tm2/pkg/bft/consensus/mempool_test.go
@@ -15,7 +15,7 @@ import (
 	mempl "github.com/gnolang/gno/tm2/pkg/bft/mempool"
 	sm "github.com/gnolang/gno/tm2/pkg/bft/state"
 	"github.com/gnolang/gno/tm2/pkg/bft/types"
-	dbm "github.com/gnolang/gno/tm2/pkg/db"
+	"github.com/gnolang/gno/tm2/pkg/db/memdb"
 )
 
 // for testing
@@ -145,7 +145,7 @@ func TestMempoolTxConcurrentWithCommit(t *testing.T) {
 	t.Parallel()
 
 	state, privVals := randGenesisState(1, false, 10)
-	blockDB := dbm.NewMemDB()
+	blockDB := memdb.NewMemDB()
 	app := NewCounterApplication()
 	cs := newConsensusStateWithConfigAndBlockStore(config, state, privVals[0], app, blockDB)
 	sm.SaveState(blockDB, state)
@@ -179,7 +179,7 @@ func TestMempoolRmBadTx(t *testing.T) {
 
 	state, privVals := randGenesisState(1, false, 10)
 	app := NewCounterApplication()
-	blockDB := dbm.NewMemDB()
+	blockDB := memdb.NewMemDB()
 	cs := newConsensusStateWithConfigAndBlockStore(config, state, privVals[0], app, blockDB)
 	sm.SaveState(blockDB, state)
 

diff --git a/tm2/pkg/bft/consensus/replay_test.go b/tm2/pkg/bft/consensus/replay_test.go
@@ -31,6 +31,7 @@ import (
 	walm "github.com/gnolang/gno/tm2/pkg/bft/wal"
 	"github.com/gnolang/gno/tm2/pkg/crypto"
 	dbm "github.com/gnolang/gno/tm2/pkg/db"
+	"github.com/gnolang/gno/tm2/pkg/db/memdb"
 	"github.com/gnolang/gno/tm2/pkg/events"
 	"github.com/gnolang/gno/tm2/pkg/log"
 	"github.com/gnolang/gno/tm2/pkg/random"
@@ -172,7 +173,7 @@ LOOP:
 
 		// create consensus state from a clean slate
 		logger := log.NewTestingLogger(t)
-		blockDB := dbm.NewMemDB()
+		blockDB := memdb.NewMemDB()
 		stateDB := blockDB
 		state, _ := sm.MakeGenesisStateFromFile(consensusReplayConfig.GenesisFile())
 		privValidator := loadPrivValidator(consensusReplayConfig)
@@ -645,7 +646,7 @@ func testHandshakeReplay(t *testing.T, config *cfg.Config, nBlocks int, mode uin
 	if sim != nil {
 		testConfig := ResetConfig(fmt.Sprintf("%s_%v_m", t.Name(), mode))
 		defer os.RemoveAll(testConfig.RootDir)
-		stateDB = dbm.NewMemDB()
+		stateDB = memdb.NewMemDB()
 		defer stateDB.Close()
 		genesisState = sim.GenesisState
 		config = sim.Config
@@ -691,7 +692,7 @@ func testHandshakeReplay(t *testing.T, config *cfg.Config, nBlocks int, mode uin
 		// run nBlocks against a new client to build up the app state.
 		// use a throwaway tendermint state
 		proxyApp := proxy.NewAppConns(clientCreator2)
-		stateDB1 := dbm.NewMemDB()
+		stateDB1 := memdb.NewMemDB()
 		sm.SaveState(stateDB1, genesisState)
 		buildAppStateFromChain(proxyApp, stateDB1, genesisState, chain, nBlocks, mode)
 	}
@@ -1059,7 +1060,7 @@ func readPieceFromWAL(msg *walm.TimedWALMessage) interface{} {
 
 // fresh state and mock store
 func makeStateAndStore(config *cfg.Config, pubKey crypto.PubKey, appVersion string) (dbm.DB, sm.State, *mockBlockStore) {
-	stateDB := dbm.NewMemDB()
+	stateDB := memdb.NewMemDB()
 	state, _ := sm.MakeGenesisStateFromFile(config.GenesisFile())
 	state.AppVersion = appVersion
 	store := newMockBlockStore(config, state.ConsensusParams)
@@ -1077,7 +1078,7 @@ type mockBlockStore struct {
 	commits []*types.Commit
 }
 
-// TODO: NewBlockStore(db.NewMemDB) ...
+// TODO: NewBlockStore(memdb.NewMemDB) ...
 func newMockBlockStore(config *cfg.Config, params abci.ConsensusParams) *mockBlockStore {
 	return &mockBlockStore{config, params, nil, nil}
 }

diff --git a/tm2/pkg/bft/node/node_test.go b/tm2/pkg/bft/node/node_test.go
@@ -21,6 +21,7 @@ import (
 	tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time"
 	"github.com/gnolang/gno/tm2/pkg/crypto/ed25519"
 	dbm "github.com/gnolang/gno/tm2/pkg/db"
+	"github.com/gnolang/gno/tm2/pkg/db/memdb"
 	"github.com/gnolang/gno/tm2/pkg/events"
 	"github.com/gnolang/gno/tm2/pkg/log"
 	"github.com/gnolang/gno/tm2/pkg/p2p"
@@ -324,7 +325,7 @@ func state(nVals int, height int64) (sm.State, dbm.DB) {
 	})
 
 	// save validators to db for 2 heights
-	stateDB := dbm.NewMemDB()
+	stateDB := memdb.NewMemDB()
 	sm.SaveState(stateDB, s)
 
 	for i := 1; i < int(height); i++ {

diff --git a/tm2/pkg/bft/state/helpers_test.go b/tm2/pkg/bft/state/helpers_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/gnolang/gno/tm2/pkg/crypto"
 	"github.com/gnolang/gno/tm2/pkg/crypto/ed25519"
 	dbm "github.com/gnolang/gno/tm2/pkg/db"
+	"github.com/gnolang/gno/tm2/pkg/db/memdb"
 )
 
 type paramsChangeTestCase struct {
@@ -103,7 +104,7 @@ func makeState(nVals, height int) (sm.State, dbm.DB, map[string]types.PrivValida
 		AppHash:    nil,
 	})
 
-	stateDB := dbm.NewMemDB()
+	stateDB := memdb.NewMemDB()
 	sm.SaveState(stateDB, s)
 
 	for i := 1; i < height; i++ {

diff --git a/tm2/pkg/bft/store/store_test.go b/tm2/pkg/bft/store/store_test.go
@@ -19,6 +19,7 @@ import (
 	"github.com/gnolang/gno/tm2/pkg/bft/types"
 	tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time"
 	dbm "github.com/gnolang/gno/tm2/pkg/db"
+	"github.com/gnolang/gno/tm2/pkg/db/memdb"
 	"github.com/gnolang/gno/tm2/pkg/errors"
 	"github.com/gnolang/gno/tm2/pkg/log"
 )
@@ -47,10 +48,10 @@ func makeBlock(height int64, state sm.State, lastCommit *types.Commit) *types.Bl
 
 func makeStateAndBlockStore(logger *slog.Logger) (sm.State, *BlockStore, cleanupFunc) {
 	config := cfg.ResetTestRoot("blockchain_reactor_test")
-	// blockDB := dbm.NewDebugDB("blockDB", dbm.NewMemDB())
-	// stateDB := dbm.NewDebugDB("stateDB", dbm.NewMemDB())
-	blockDB := dbm.NewMemDB()
-	stateDB := dbm.NewMemDB()
+	// blockDB := dbm.NewDebugDB("blockDB", memdb.NewMemDB())
+	// stateDB := dbm.NewDebugDB("stateDB", memdb.NewMemDB())
+	blockDB := memdb.NewMemDB()
+	stateDB := memdb.NewMemDB()
 	state, err := sm.LoadStateFromDBOrGenesisFile(stateDB, config.GenesisFile())
 	if err != nil {
 		panic(errors.Wrap(err, "error constructing state from genesis file"))
@@ -61,7 +62,7 @@ func makeStateAndBlockStore(logger *slog.Logger) (sm.State, *BlockStore, cleanup
 func TestLoadBlockStoreStateJSON(t *testing.T) {
 	t.Parallel()
 
-	db := dbm.NewMemDB()
+	db := memdb.NewMemDB()
 
 	bsj := &BlockStoreStateJSON{Height: 1000}
 	bsj.Save(db)
@@ -74,7 +75,7 @@ func TestLoadBlockStoreStateJSON(t *testing.T) {
 func TestNewBlockStore(t *testing.T) {
 	t.Parallel()
 
-	db := dbm.NewMemDB()
+	db := memdb.NewMemDB()
 	db.Set(blockStoreKey, []byte(`{"height": "10000"}`))
 	bs := NewBlockStore(db)
 	require.Equal(t, int64(10000), bs.Height(), "failed to properly parse blockstore")
@@ -105,7 +106,7 @@ func TestNewBlockStore(t *testing.T) {
 }
 
 func freshBlockStore() (*BlockStore, dbm.DB) {
-	db := dbm.NewMemDB()
+	db := memdb.NewMemDB()
 	return NewBlockStore(db), db
 }
 

diff --git a/tm2/pkg/db/internal/test_common.go b/tm2/pkg/db/internal/test_common.go
@@ -83,6 +83,7 @@ func BenchmarkRandomReadsWrites(b *testing.B, db db.DB) {
 	for i := 0; i < b.N; i++ {
 		// Write something
 		{
+			//nolint:gosec
 			idx := int64(rand.Int()) % numItems
 			internal[idx]++
 			val := internal[idx]
@@ -94,6 +95,7 @@ func BenchmarkRandomReadsWrites(b *testing.B, db db.DB) {
 
 		// Read something
 		{
+			//nolint:gosec
 			idx := int64(rand.Int()) % numItems
 			valExp := internal[idx]
 			idxBytes := int642Bytes(idx)

diff --git a/tm2/pkg/db/memdb/mem_db.go b/tm2/pkg/db/memdb/mem_db.go
@@ -5,18 +5,18 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/gnolang/gno/tm2/pkg/db"
+	dbm "github.com/gnolang/gno/tm2/pkg/db"
 	"github.com/gnolang/gno/tm2/pkg/db/internal"
 	"github.com/gnolang/gno/tm2/pkg/strings"
 )
 
 func init() {
-	db.InternalRegisterDBCreator(db.MemDBBackend, func(name, dir string) (db.DB, error) {
+	dbm.InternalRegisterDBCreator(dbm.MemDBBackend, func(name, dir string) (dbm.DB, error) {
 		return NewMemDB(), nil
 	}, false)
 }
 
-var _ db.DB = (*MemDB)(nil)
+var _ dbm.DB = (*MemDB)(nil)
 
 type MemDB struct {
 	mtx sync.Mutex
@@ -154,7 +154,7 @@ func (db *MemDB) Stats() map[string]string {
 }
 
 // Implements DB.
-func (db *MemDB) NewBatch() db.Batch {
+func (db *MemDB) NewBatch() dbm.Batch {
 	db.mtx.Lock()
 	defer db.mtx.Unlock()
 
@@ -165,7 +165,7 @@ func (db *MemDB) NewBatch() db.Batch {
 // Iterator
 
 // Implements DB.
-func (db *MemDB) Iterator(start, end []byte) db.Iterator {
+func (db *MemDB) Iterator(start, end []byte) dbm.Iterator {
 	db.mtx.Lock()
 	defer db.mtx.Unlock()
 
@@ -174,7 +174,7 @@ func (db *MemDB) Iterator(start, end []byte) db.Iterator {
 }
 
 // Implements DB.
-func (db *MemDB) ReverseIterator(start, end []byte) db.Iterator {
+func (db *MemDB) ReverseIterator(start, end []byte) dbm.Iterator {
 	db.mtx.Lock()
 	defer db.mtx.Unlock()
 
@@ -185,10 +185,10 @@ func (db *MemDB) ReverseIterator(start, end []byte) db.Iterator {
 // ----------------------------------------
 // Misc.
 
-func (memdb *MemDB) getSortedKeys(start, end []byte, reverse bool) []string {
+func (db *MemDB) getSortedKeys(start, end []byte, reverse bool) []string {
 	keys := []string{}
-	for key := range memdb.db {
-		inDomain := db.IsKeyInDomain([]byte(key), start, end)
+	for key := range db.db {
+		inDomain := dbm.IsKeyInDomain([]byte(key), start, end)
 		if inDomain {
 			keys = append(keys, key)
 		}