diff --git a/gno.land/pkg/sdk/vm/common_test.go b/gno.land/pkg/sdk/vm/common_test.go index 8a75697115f..b65757da403 100644 --- 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 index 4268e3f3332..c9f1f9ba10d 100644 --- 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 index 982c29033fa..e9de000f2d6 100644 --- 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 index 4a0a4eebf03..9f617cd75cb 100644 --- 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 index 85914262903..f425a161e90 100644 --- 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 index 981e72d6ca3..8d5b8c87b89 100644 --- 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 index d182b7fb0d5..4c38695a2fa 100644 --- 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 index ca4175185a9..b8b041635c6 100644 --- 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 index 6b5dd8a96bb..c238f8d7a4d 100644 --- 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 index 417ced25ae4..e048cc4605f 100644 --- 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 index f739a228325..6d1d6a35af9 100644 --- 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) } diff --git a/tm2/pkg/iavl/basic_test.go b/tm2/pkg/iavl/basic_test.go index 93df41696e1..0e1be129de5 100644 --- a/tm2/pkg/iavl/basic_test.go +++ b/tm2/pkg/iavl/basic_test.go @@ -10,13 +10,13 @@ import ( "github.com/stretchr/testify/require" "github.com/gnolang/gno/tm2/pkg/db" - _ "github.com/gnolang/gno/tm2/pkg/db/memdb" + "github.com/gnolang/gno/tm2/pkg/db/memdb" ) func TestBasic(t *testing.T) { t.Parallel() - tree := NewMutableTree(db.NewMemDB(), 0) + tree := NewMutableTree(memdb.NewMemDB(), 0) up := tree.Set([]byte("1"), []byte("one")) if up { t.Error("Did not expect an update (should have been create)") @@ -229,7 +229,7 @@ func TestIntegration(t *testing.T) { } records := make([]*record, 400) - tree := NewMutableTree(db.NewMemDB(), 0) + tree := NewMutableTree(memdb.NewMemDB(), 0) randomRecord := func() *record { return &record{randstr(20), randstr(20)} @@ -313,7 +313,7 @@ func TestIterateRange(t *testing.T) { } sort.Strings(keys) - tree := NewMutableTree(db.NewMemDB(), 0) + tree := NewMutableTree(memdb.NewMemDB(), 0) // insert all the data for _, r := range records { @@ -376,7 +376,7 @@ func TestIterateRange(t *testing.T) { func TestPersistence(t *testing.T) { t.Parallel() - db := db.NewMemDB() + db := memdb.NewMemDB() // Create some random key value pairs records := make(map[string]string) @@ -406,7 +406,7 @@ func TestProof(t *testing.T) { t.Parallel() // Construct some random tree - db := db.NewMemDB() + db := memdb.NewMemDB() tree := NewMutableTree(db, 100) for i := 0; i < 10; i++ { key, value := randstr(20), randstr(20) @@ -437,7 +437,7 @@ func TestProof(t *testing.T) { func TestTreeProof(t *testing.T) { t.Parallel() - db := db.NewMemDB() + db := memdb.NewMemDB() tree := NewMutableTree(db, 100) assert.Equal(t, tree.Hash(), []byte(nil)) diff --git a/tm2/pkg/iavl/doc.go b/tm2/pkg/iavl/doc.go index f58473a5dd5..6787989ff4c 100644 --- a/tm2/pkg/iavl/doc.go +++ b/tm2/pkg/iavl/doc.go @@ -7,7 +7,7 @@ // import "github.com/tendermint/classic/db" // ... // -// tree := iavl.NewMutableTree(db.NewMemDB(), 128) +// tree := iavl.NewMutableTree(memdb.NewMemDB(), 128) // // tree.IsEmpty() // true // diff --git a/tm2/pkg/iavl/proof_forgery_test.go b/tm2/pkg/iavl/proof_forgery_test.go index 028675f7c48..a34f13a247d 100644 --- a/tm2/pkg/iavl/proof_forgery_test.go +++ b/tm2/pkg/iavl/proof_forgery_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" "github.com/gnolang/gno/tm2/pkg/crypto/tmhash" - "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/db/memdb" "github.com/gnolang/gno/tm2/pkg/iavl" ) @@ -19,7 +19,7 @@ func TestProofForgery(t *testing.T) { source := rand.NewSource(0) r := rand.New(source) cacheSize := 0 - tree := iavl.NewMutableTree(db.NewMemDB(), cacheSize) + tree := iavl.NewMutableTree(memdb.NewMemDB(), cacheSize) // two keys only keys := []byte{0x11, 0x32} diff --git a/tm2/pkg/iavl/proof_test.go b/tm2/pkg/iavl/proof_test.go index ad4d85d1cd5..2fa9c4bf1cd 100644 --- a/tm2/pkg/iavl/proof_test.go +++ b/tm2/pkg/iavl/proof_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" "github.com/gnolang/gno/tm2/pkg/amino" - "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/db/memdb" "github.com/gnolang/gno/tm2/pkg/random" "github.com/gnolang/gno/tm2/pkg/testutils" ) @@ -17,7 +17,7 @@ import ( func TestTreeGetWithProof(t *testing.T) { t.Parallel() - tree := NewMutableTree(db.NewMemDB(), 0) + tree := NewMutableTree(memdb.NewMemDB(), 0) require := require.New(t) for _, ikey := range []byte{0x11, 0x32, 0x50, 0x72, 0x99} { key := []byte{ikey} @@ -53,7 +53,7 @@ func TestTreeGetWithProof(t *testing.T) { func TestTreeKeyExistsProof(t *testing.T) { t.Parallel() - tree := NewMutableTree(db.NewMemDB(), 0) + tree := NewMutableTree(memdb.NewMemDB(), 0) root := tree.WorkingHash() // should get false for proof with nil root @@ -121,7 +121,7 @@ func TestTreeKeyExistsProof(t *testing.T) { func TestTreeKeyInRangeProofs(t *testing.T) { t.Parallel() - tree := NewMutableTree(db.NewMemDB(), 0) + tree := NewMutableTree(memdb.NewMemDB(), 0) require := require.New(t) keys := []byte{0x0a, 0x11, 0x2e, 0x32, 0x50, 0x72, 0x99, 0xa1, 0xe4, 0xf7} // 10 total. for _, ikey := range keys { diff --git a/tm2/pkg/iavl/tree_dotgraph_test.go b/tm2/pkg/iavl/tree_dotgraph_test.go index 3c0233f51fa..3485cc1dd95 100644 --- a/tm2/pkg/iavl/tree_dotgraph_test.go +++ b/tm2/pkg/iavl/tree_dotgraph_test.go @@ -4,13 +4,13 @@ import ( "io" "testing" - db "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/db/memdb" ) func TestWriteDOTGraph(t *testing.T) { t.Parallel() - tree := NewMutableTree(db.NewMemDB(), 0) + tree := NewMutableTree(memdb.NewMemDB(), 0) for _, ikey := range []byte{ 0x0a, 0x11, 0x2e, 0x32, 0x50, 0x72, 0x99, 0xa1, 0xe4, 0xf7, } { diff --git a/tm2/pkg/iavl/tree_fuzz_test.go b/tm2/pkg/iavl/tree_fuzz_test.go index 64e20d944a2..08645414fbf 100644 --- a/tm2/pkg/iavl/tree_fuzz_test.go +++ b/tm2/pkg/iavl/tree_fuzz_test.go @@ -5,7 +5,7 @@ import ( "math/rand" "testing" - "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/db/memdb" "github.com/gnolang/gno/tm2/pkg/random" ) @@ -113,7 +113,7 @@ func TestMutableTreeFuzz(t *testing.T) { for size := 5; iterations < maxIterations; size++ { for i := 0; i < progsPerIteration/size; i++ { - tree := NewMutableTree(db.NewMemDB(), 0) + tree := NewMutableTree(memdb.NewMemDB(), 0) program := genRandomProgram(size) err := program.Execute(tree) if err != nil { diff --git a/tm2/pkg/iavl/tree_test.go b/tm2/pkg/iavl/tree_test.go index ba5bbe3e5ef..43c2d6ac36c 100644 --- a/tm2/pkg/iavl/tree_test.go +++ b/tm2/pkg/iavl/tree_test.go @@ -13,6 +13,8 @@ import ( "github.com/stretchr/testify/require" "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/db/goleveldb" + "github.com/gnolang/gno/tm2/pkg/db/memdb" "github.com/gnolang/gno/tm2/pkg/random" ) @@ -38,7 +40,7 @@ func init() { func getTestDB() (db.DB, func()) { if testLevelDB { - d, err := db.NewGoLevelDB("test", ".") + d, err := goleveldb.NewGoLevelDB("test", ".") if err != nil { panic(err) } @@ -47,7 +49,7 @@ func getTestDB() (db.DB, func()) { os.RemoveAll("./test.db") } } - return db.NewMemDB(), func() {} + return memdb.NewMemDB(), func() {} } func TestVersionedRandomTree(t *testing.T) { @@ -114,7 +116,7 @@ func TestVersionedRandomTreeSmallKeys(t *testing.T) { defer closeDB() tree := NewMutableTree(d, 100) - singleVersionTree := NewMutableTree(db.NewMemDB(), 0) + singleVersionTree := NewMutableTree(memdb.NewMemDB(), 0) versions := 20 keysPerVersion := 50 @@ -157,7 +159,7 @@ func TestVersionedRandomTreeSmallKeysRandomDeletes(t *testing.T) { defer closeDB() tree := NewMutableTree(d, 100) - singleVersionTree := NewMutableTree(db.NewMemDB(), 0) + singleVersionTree := NewMutableTree(memdb.NewMemDB(), 0) versions := 30 keysPerVersion := 50 @@ -195,7 +197,7 @@ func TestVersionedRandomTreeSmallKeysRandomDeletes(t *testing.T) { func TestVersionedTreeSpecial1(t *testing.T) { t.Parallel() - tree := NewMutableTree(db.NewMemDB(), 100) + tree := NewMutableTree(memdb.NewMemDB(), 100) tree.Set([]byte("C"), []byte("so43QQFN")) tree.SaveVersion() @@ -220,7 +222,7 @@ func TestVersionedRandomTreeSpecial2(t *testing.T) { t.Parallel() require := require.New(t) - tree := NewMutableTree(db.NewMemDB(), 100) + tree := NewMutableTree(memdb.NewMemDB(), 100) tree.Set([]byte("OFMe2Yvm"), []byte("ez2OtQtE")) tree.Set([]byte("WEN4iN7Y"), []byte("kQNyUalI")) @@ -518,7 +520,7 @@ func TestVersionedTreeVersionDeletingEfficiency(t *testing.T) { require.Len(t, tree.ndb.leafNodes(), 3) - tree2 := NewMutableTree(db.NewMemDB(), 0) + tree2 := NewMutableTree(memdb.NewMemDB(), 0) tree2.Set([]byte("key0"), []byte("val2")) tree2.Set([]byte("key2"), []byte("val2")) tree2.Set([]byte("key3"), []byte("val1")) @@ -530,7 +532,7 @@ func TestVersionedTreeVersionDeletingEfficiency(t *testing.T) { func TestVersionedTreeOrphanDeleting(t *testing.T) { t.Parallel() - mdb := db.NewMemDB() + mdb := memdb.NewMemDB() tree := NewMutableTree(mdb, 0) tree.Set([]byte("key0"), []byte("val0")) @@ -571,7 +573,7 @@ func TestVersionedTreeSpecialCase(t *testing.T) { t.Parallel() require := require.New(t) - tree := NewMutableTree(db.NewMemDB(), 100) + tree := NewMutableTree(memdb.NewMemDB(), 100) tree.Set([]byte("key1"), []byte("val0")) tree.Set([]byte("key2"), []byte("val0")) @@ -594,7 +596,7 @@ func TestVersionedTreeSpecialCase2(t *testing.T) { t.Parallel() require := require.New(t) - d := db.NewMemDB() + d := memdb.NewMemDB() tree := NewMutableTree(d, 100) @@ -623,7 +625,7 @@ func TestVersionedTreeSpecialCase3(t *testing.T) { t.Parallel() require := require.New(t) - tree := NewMutableTree(db.NewMemDB(), 0) + tree := NewMutableTree(memdb.NewMemDB(), 0) tree.Set([]byte("m"), []byte("liWT0U6G")) tree.Set([]byte("G"), []byte("7PxRXwUA")) @@ -653,7 +655,7 @@ func TestVersionedTreeSaveAndLoad(t *testing.T) { t.Parallel() require := require.New(t) - d := db.NewMemDB() + d := memdb.NewMemDB() tree := NewMutableTree(d, 0) // Loading with an empty root is a no-op. @@ -706,7 +708,7 @@ func TestVersionedTreeErrors(t *testing.T) { t.Parallel() require := require.New(t) - tree := NewMutableTree(db.NewMemDB(), 100) + tree := NewMutableTree(memdb.NewMemDB(), 100) // Can't delete non-existent versions. require.Error(tree.DeleteVersion(1)) @@ -795,7 +797,7 @@ func TestVersionedCheckpointsSpecialCase(t *testing.T) { t.Parallel() require := require.New(t) - tree := NewMutableTree(db.NewMemDB(), 0) + tree := NewMutableTree(memdb.NewMemDB(), 0) key := []byte("k") tree.Set(key, []byte("val1")) @@ -822,7 +824,7 @@ func TestVersionedCheckpointsSpecialCase(t *testing.T) { func TestVersionedCheckpointsSpecialCase2(t *testing.T) { t.Parallel() - tree := NewMutableTree(db.NewMemDB(), 0) + tree := NewMutableTree(memdb.NewMemDB(), 0) tree.Set([]byte("U"), []byte("XamDUtiJ")) tree.Set([]byte("A"), []byte("UkZBuYIU")) @@ -844,7 +846,7 @@ func TestVersionedCheckpointsSpecialCase2(t *testing.T) { func TestVersionedCheckpointsSpecialCase3(t *testing.T) { t.Parallel() - tree := NewMutableTree(db.NewMemDB(), 0) + tree := NewMutableTree(memdb.NewMemDB(), 0) tree.Set([]byte("n"), []byte("2wUCUs8q")) tree.Set([]byte("l"), []byte("WQ7mvMbc")) @@ -866,7 +868,7 @@ func TestVersionedCheckpointsSpecialCase3(t *testing.T) { func TestVersionedCheckpointsSpecialCase4(t *testing.T) { t.Parallel() - tree := NewMutableTree(db.NewMemDB(), 0) + tree := NewMutableTree(memdb.NewMemDB(), 0) tree.Set([]byte("U"), []byte("XamDUtiJ")) tree.Set([]byte("A"), []byte("UkZBuYIU")) @@ -900,7 +902,7 @@ func TestVersionedCheckpointsSpecialCase4(t *testing.T) { func TestVersionedCheckpointsSpecialCase5(t *testing.T) { t.Parallel() - tree := NewMutableTree(db.NewMemDB(), 0) + tree := NewMutableTree(memdb.NewMemDB(), 0) tree.Set([]byte("R"), []byte("ygZlIzeW")) tree.SaveVersion() @@ -919,7 +921,7 @@ func TestVersionedCheckpointsSpecialCase5(t *testing.T) { func TestVersionedCheckpointsSpecialCase6(t *testing.T) { t.Parallel() - tree := NewMutableTree(db.NewMemDB(), 0) + tree := NewMutableTree(memdb.NewMemDB(), 0) tree.Set([]byte("Y"), []byte("MW79JQeV")) tree.Set([]byte("7"), []byte("Kp0ToUJB")) @@ -953,7 +955,7 @@ func TestVersionedCheckpointsSpecialCase6(t *testing.T) { func TestVersionedCheckpointsSpecialCase7(t *testing.T) { t.Parallel() - tree := NewMutableTree(db.NewMemDB(), 100) + tree := NewMutableTree(memdb.NewMemDB(), 100) tree.Set([]byte("n"), []byte("OtqD3nyn")) tree.Set([]byte("W"), []byte("kMdhJjF5")) @@ -989,7 +991,7 @@ func TestVersionedTreeEfficiency(t *testing.T) { t.Parallel() require := require.New(t) - tree := NewMutableTree(db.NewMemDB(), 0) + tree := NewMutableTree(memdb.NewMemDB(), 0) versions := 20 keysPerVersion := 100 keysAddedPerVersion := map[int]int{} @@ -1026,7 +1028,7 @@ func TestVersionedTreeProofs(t *testing.T) { t.Parallel() require := require.New(t) - tree := NewMutableTree(db.NewMemDB(), 0) + tree := NewMutableTree(memdb.NewMemDB(), 0) tree.Set([]byte("k1"), []byte("v1")) tree.Set([]byte("k2"), []byte("v1")) @@ -1101,7 +1103,7 @@ func TestOrphans(t *testing.T) { // Then randomly delete versions other than the first and last until only those two remain // Any remaining orphan nodes should be constrained to just the first version require := require.New(t) - tree := NewMutableTree(db.NewMemDB(), 100) + tree := NewMutableTree(memdb.NewMemDB(), 100) NUMVERSIONS := 100 NUMUPDATES := 100 @@ -1132,7 +1134,7 @@ func TestVersionedTreeHash(t *testing.T) { t.Parallel() require := require.New(t) - tree := NewMutableTree(db.NewMemDB(), 0) + tree := NewMutableTree(memdb.NewMemDB(), 0) require.Nil(tree.Hash()) tree.Set([]byte("I"), []byte("D")) @@ -1156,7 +1158,7 @@ func TestNilValueSemantics(t *testing.T) { t.Parallel() require := require.New(t) - tree := NewMutableTree(db.NewMemDB(), 0) + tree := NewMutableTree(memdb.NewMemDB(), 0) require.Panics(func() { tree.Set([]byte("k"), nil) @@ -1168,7 +1170,7 @@ func TestCopyValueSemantics(t *testing.T) { require := require.New(t) - tree := NewMutableTree(db.NewMemDB(), 0) + tree := NewMutableTree(memdb.NewMemDB(), 0) val := []byte("v1") @@ -1187,7 +1189,7 @@ func TestRollback(t *testing.T) { require := require.New(t) - tree := NewMutableTree(db.NewMemDB(), 0) + tree := NewMutableTree(memdb.NewMemDB(), 0) tree.Set([]byte("k"), []byte("v")) tree.SaveVersion() @@ -1216,7 +1218,7 @@ func TestRollback(t *testing.T) { func TestLazyLoadVersion(t *testing.T) { t.Parallel() - mdb := db.NewMemDB() + mdb := memdb.NewMemDB() tree := NewMutableTree(mdb, 0) maxVersions := 10 @@ -1258,7 +1260,7 @@ func TestOverwrite(t *testing.T) { require := require.New(t) - mdb := db.NewMemDB() + mdb := memdb.NewMemDB() tree := NewMutableTree(mdb, 0) // Set one kv pair and save version 1 @@ -1292,7 +1294,7 @@ func TestLoadVersionForOverwriting(t *testing.T) { require := require.New(t) - mdb := db.NewMemDB() + mdb := memdb.NewMemDB() tree := NewMutableTree(mdb, 0) maxLength := 100 @@ -1364,7 +1366,7 @@ func BenchmarkTreeLoadAndDelete(b *testing.B) { numVersions := 5000 numKeysPerVersion := 10 - d, err := db.NewGoLevelDB("bench", ".") + d, err := goleveldb.NewGoLevelDB("bench", ".") if err != nil { panic(err) } diff --git a/tm2/pkg/sdk/bank/common_test.go b/tm2/pkg/sdk/bank/common_test.go index fcbd5d2cb94..95b93157165 100644 --- a/tm2/pkg/sdk/bank/common_test.go +++ b/tm2/pkg/sdk/bank/common_test.go @@ -4,7 +4,7 @@ package bank import ( 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" @@ -21,7 +21,7 @@ type testEnv struct { } func setupTestEnv() testEnv { - db := dbm.NewMemDB() + db := memdb.NewMemDB() authCapKey := store.NewStoreKey("authCapKey") diff --git a/tm2/pkg/sdk/baseapp_test.go b/tm2/pkg/sdk/baseapp_test.go index 1d8e73acc8d..e2b5687d1a4 100644 --- a/tm2/pkg/sdk/baseapp_test.go +++ b/tm2/pkg/sdk/baseapp_test.go @@ -17,6 +17,7 @@ import ( abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" 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/sdk/testutils" "github.com/gnolang/gno/tm2/pkg/std" "github.com/gnolang/gno/tm2/pkg/store/dbadapter" @@ -74,7 +75,7 @@ func newBaseApp(name string, db dbm.DB, options ...func(*BaseApp)) *BaseApp { func setupBaseApp(t *testing.T, options ...func(*BaseApp)) *BaseApp { t.Helper() - db := dbm.NewMemDB() + db := memdb.NewMemDB() app := newBaseApp(t.Name(), db, options...) require.Equal(t, t.Name(), app.Name()) err := app.LoadLatestVersion() @@ -101,7 +102,7 @@ func TestLoadVersion(t *testing.T) { pruningOpt := SetPruningOptions(store.PruneSyncable) name := t.Name() - db := dbm.NewMemDB() + db := memdb.NewMemDB() app := newBaseApp(name, db, pruningOpt) // make a cap key and mount the store @@ -150,7 +151,7 @@ func TestAppVersionSetterGetter(t *testing.T) { pruningOpt := SetPruningOptions(store.PruneSyncable) name := t.Name() - db := dbm.NewMemDB() + db := memdb.NewMemDB() app := newBaseApp(name, db, pruningOpt) require.Equal(t, "", app.AppVersion()) @@ -171,7 +172,7 @@ func TestLoadVersionInvalid(t *testing.T) { pruningOpt := SetPruningOptions(store.PruneSyncable) name := t.Name() - db := dbm.NewMemDB() + db := memdb.NewMemDB() app := newBaseApp(name, db, pruningOpt) err := app.LoadLatestVersion() @@ -211,7 +212,7 @@ func testLoadVersionHelper(t *testing.T, app *BaseApp, expectedHeight int64, exp func TestOptionFunction(t *testing.T) { t.Parallel() - db := dbm.NewMemDB() + db := memdb.NewMemDB() bap := newBaseApp("starting name", db, testChangeNameHelper("new name")) require.Equal(t, bap.name, "new name", "BaseApp should have had name changed via option function") } @@ -226,7 +227,7 @@ func testChangeNameHelper(name string) func(*BaseApp) { func TestInfo(t *testing.T) { t.Parallel() - db := dbm.NewMemDB() + db := memdb.NewMemDB() app := newBaseApp(t.Name(), db) // ----- test an empty response ------- @@ -279,7 +280,7 @@ func TestSetMinGasPrices(t *testing.T) { minGasPrices, err := ParseGasPrices("5000stake/10gas") require.Nil(t, err) - db := dbm.NewMemDB() + db := memdb.NewMemDB() app := newBaseApp(t.Name(), db, SetMinGasPrices("5000stake/10gas")) require.Equal(t, minGasPrices, app.minGasPrices) } @@ -290,7 +291,7 @@ func TestInitChainer(t *testing.T) { name := t.Name() // keep the db and logger ourselves so // we can reload the same app later - db := dbm.NewMemDB() + db := memdb.NewMemDB() app := newBaseApp(name, db) // set a value in the store on init chain diff --git a/tm2/pkg/store/README.md b/tm2/pkg/store/README.md index eac90830cfa..abf5c26bc07 100644 --- a/tm2/pkg/store/README.md +++ b/tm2/pkg/store/README.md @@ -2,7 +2,7 @@ ## CacheKV -`cachekv.Store` is a wrapper `KVStore` which provides buffered writing / cached reading functionalities over the underlying `KVStore`. +`cachekv.Store` is a wrapper `KVStore` which provides buffered writing / cached reading functionalities over the underlying `KVStore`. ```go type Store struct { @@ -50,7 +50,7 @@ type Store struct { ## IAVL -`iavl.Store` is a base-layer self-balancing merkle tree. It is guaranteed that +`iavl.Store` is a base-layer self-balancing merkle tree. It is guaranteed that 1. Get & set operations are `O(log n)`, where `n` is the number of elements in the tree 2. Iteration efficiently returns the sorted elements within the range @@ -112,7 +112,7 @@ type traceOperation struct { Key string Value string Metadata map[string]interface{} -} +} ``` `traceOperation.Metadata` is filled with `Store.context` when it is not nil. `TraceContext` is a `map[string]interface{}`. @@ -127,4 +127,4 @@ type Store struct { } ``` -`Store.Store` is a `dbadapter.Store` with a `dbm.NewMemDB()`. All `KVStore` methods are reused. When `Store.Commit()` is called, new `dbadapter.Store` is assigned, discarding previous reference and making it garbage collected. +`Store.Store` is a `dbadapter.Store` with a `memdb.NewMemDB()`. All `KVStore` methods are reused. When `Store.Commit()` is called, new `dbadapter.Store` is assigned, discarding previous reference and making it garbage collected. diff --git a/tm2/pkg/store/cache/store_bench_test.go b/tm2/pkg/store/cache/store_bench_test.go index 63e6f2ebbdc..6413db9f706 100644 --- a/tm2/pkg/store/cache/store_bench_test.go +++ b/tm2/pkg/store/cache/store_bench_test.go @@ -5,8 +5,7 @@ import ( "sort" "testing" - dbm "github.com/gnolang/gno/tm2/pkg/db" - + "github.com/gnolang/gno/tm2/pkg/db/memdb" "github.com/gnolang/gno/tm2/pkg/store/cache" "github.com/gnolang/gno/tm2/pkg/store/dbadapter" ) @@ -14,7 +13,7 @@ import ( func benchmarkCacheStoreIterator(b *testing.B, numKVs int) { b.Helper() - mem := dbadapter.Store{DB: dbm.NewMemDB()} + mem := dbadapter.Store{DB: memdb.NewMemDB()} cstore := cache.New(mem) keys := make([]string, numKVs, numKVs) diff --git a/tm2/pkg/store/cache/store_test.go b/tm2/pkg/store/cache/store_test.go index adf122fc637..4ac8cc64de9 100644 --- a/tm2/pkg/store/cache/store_test.go +++ b/tm2/pkg/store/cache/store_test.go @@ -7,6 +7,7 @@ import ( "github.com/stretchr/testify/require" dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/db/memdb" "github.com/gnolang/gno/tm2/pkg/random" "github.com/gnolang/gno/tm2/pkg/store/cache" "github.com/gnolang/gno/tm2/pkg/store/dbadapter" @@ -14,7 +15,7 @@ import ( ) func newCacheStore() types.Store { - mem := dbadapter.Store{dbm.NewMemDB()} + mem := dbadapter.Store{memdb.NewMemDB()} return cache.New(mem) } @@ -24,7 +25,7 @@ func valFmt(i int) []byte { return bz(fmt.Sprintf("value%0.8d", i)) } func TestCacheStore(t *testing.T) { t.Parallel() - mem := dbadapter.Store{dbm.NewMemDB()} + mem := dbadapter.Store{memdb.NewMemDB()} st := cache.New(mem) require.Empty(t, st.Get(keyFmt(1)), "Expected `key1` to be empty") @@ -69,7 +70,7 @@ func TestCacheStore(t *testing.T) { func TestCacheStoreNoNilSet(t *testing.T) { t.Parallel() - mem := dbadapter.Store{dbm.NewMemDB()} + mem := dbadapter.Store{memdb.NewMemDB()} st := cache.New(mem) require.Panics(t, func() { st.Set([]byte("key"), nil) }, "setting a nil value should panic") } @@ -77,7 +78,7 @@ func TestCacheStoreNoNilSet(t *testing.T) { func TestCacheStoreNested(t *testing.T) { t.Parallel() - mem := dbadapter.Store{dbm.NewMemDB()} + mem := dbadapter.Store{memdb.NewMemDB()} st := cache.New(mem) // set. check its there on st and not on mem. @@ -286,7 +287,7 @@ func TestCacheKVMergeIteratorDeletes(t *testing.T) { t.Parallel() st := newCacheStore() - truth := dbm.NewMemDB() + truth := memdb.NewMemDB() // set some items and write them nItems := 10 @@ -303,7 +304,7 @@ func TestCacheKVMergeIteratorDeletes(t *testing.T) { // reset st = newCacheStore() - truth = dbm.NewMemDB() + truth = memdb.NewMemDB() // set some items and write them for i := 0; i < nItems; i++ { @@ -324,7 +325,7 @@ func TestCacheKVMergeIteratorChunks(t *testing.T) { st := newCacheStore() // Use the truth to check values on the merge iterator - truth := dbm.NewMemDB() + truth := memdb.NewMemDB() // sets to the parent setRange(st, truth, 0, 20) @@ -355,7 +356,7 @@ func TestCacheKVMergeIteratorRandom(t *testing.T) { t.Parallel() st := newCacheStore() - truth := dbm.NewMemDB() + truth := memdb.NewMemDB() start, end := 25, 975 max := 1000 diff --git a/tm2/pkg/store/gas/store_test.go b/tm2/pkg/store/gas/store_test.go index 54729abf2ed..5b8cc7c656c 100644 --- a/tm2/pkg/store/gas/store_test.go +++ b/tm2/pkg/store/gas/store_test.go @@ -4,8 +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/store/dbadapter" "github.com/gnolang/gno/tm2/pkg/store/gas" "github.com/gnolang/gno/tm2/pkg/store/types" @@ -21,7 +20,7 @@ func valFmt(i int) []byte { return bz(fmt.Sprintf("value%0.8d", i)) } func TestGasKVStoreBasic(t *testing.T) { t.Parallel() - mem := dbadapter.Store{dbm.NewMemDB()} + mem := dbadapter.Store{memdb.NewMemDB()} meter := types.NewGasMeter(10000) st := gas.New(mem, meter, types.DefaultGasConfig()) require.Empty(t, st.Get(keyFmt(1)), "Expected `key1` to be empty") @@ -35,7 +34,7 @@ func TestGasKVStoreBasic(t *testing.T) { func TestGasKVStoreIterator(t *testing.T) { t.Parallel() - mem := dbadapter.Store{dbm.NewMemDB()} + mem := dbadapter.Store{memdb.NewMemDB()} meter := types.NewGasMeter(10000) st := gas.New(mem, meter, types.DefaultGasConfig()) require.Empty(t, st.Get(keyFmt(1)), "Expected `key1` to be empty") @@ -61,7 +60,7 @@ func TestGasKVStoreIterator(t *testing.T) { func TestGasKVStoreOutOfGasSet(t *testing.T) { t.Parallel() - mem := dbadapter.Store{dbm.NewMemDB()} + mem := dbadapter.Store{memdb.NewMemDB()} meter := types.NewGasMeter(0) st := gas.New(mem, meter, types.DefaultGasConfig()) require.Panics(t, func() { st.Set(keyFmt(1), valFmt(1)) }, "Expected out-of-gas") @@ -70,7 +69,7 @@ func TestGasKVStoreOutOfGasSet(t *testing.T) { func TestGasKVStoreOutOfGasIterator(t *testing.T) { t.Parallel() - mem := dbadapter.Store{dbm.NewMemDB()} + mem := dbadapter.Store{memdb.NewMemDB()} meter := types.NewGasMeter(20000) st := gas.New(mem, meter, types.DefaultGasConfig()) st.Set(keyFmt(1), valFmt(1)) diff --git a/tm2/pkg/store/iavl/store_test.go b/tm2/pkg/store/iavl/store_test.go index a29dbab096a..6959e9172dc 100644 --- a/tm2/pkg/store/iavl/store_test.go +++ b/tm2/pkg/store/iavl/store_test.go @@ -9,6 +9,7 @@ import ( "github.com/gnolang/gno/tm2/pkg/amino" abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/db/memdb" "github.com/gnolang/gno/tm2/pkg/iavl" "github.com/gnolang/gno/tm2/pkg/random" @@ -51,7 +52,7 @@ func newAlohaTree(t *testing.T, db dbm.DB) (*iavl.MutableTree, types.CommitID) { func TestGetImmutable(t *testing.T) { t.Parallel() - db := dbm.NewMemDB() + db := memdb.NewMemDB() tree, cID := newAlohaTree(t, db) store := UnsafeNewStore(tree, storeOptions(10, 10)) @@ -83,7 +84,7 @@ func TestGetImmutable(t *testing.T) { func TestTestGetImmutableIterator(t *testing.T) { t.Parallel() - db := dbm.NewMemDB() + db := memdb.NewMemDB() tree, cID := newAlohaTree(t, db) store := UnsafeNewStore(tree, storeOptions(10, 10)) @@ -108,7 +109,7 @@ func TestTestGetImmutableIterator(t *testing.T) { func TestIAVLStoreGetSetHasDelete(t *testing.T) { t.Parallel() - db := dbm.NewMemDB() + db := memdb.NewMemDB() tree, _ := newAlohaTree(t, db) iavlStore := UnsafeNewStore(tree, storeOptions(numRecent, storeEvery)) @@ -135,7 +136,7 @@ func TestIAVLStoreGetSetHasDelete(t *testing.T) { func TestIAVLStoreNoNilSet(t *testing.T) { t.Parallel() - db := dbm.NewMemDB() + db := memdb.NewMemDB() tree, _ := newAlohaTree(t, db) iavlStore := UnsafeNewStore(tree, storeOptions(numRecent, storeEvery)) require.Panics(t, func() { iavlStore.Set([]byte("key"), nil) }, "setting a nil value should panic") @@ -144,7 +145,7 @@ func TestIAVLStoreNoNilSet(t *testing.T) { func TestIAVLIterator(t *testing.T) { t.Parallel() - db := dbm.NewMemDB() + db := memdb.NewMemDB() tree, _ := newAlohaTree(t, db) iavlStore := UnsafeNewStore(tree, storeOptions(numRecent, storeEvery)) iter := iavlStore.Iterator([]byte("aloha"), []byte("hellz")) @@ -219,7 +220,7 @@ func TestIAVLIterator(t *testing.T) { func TestIAVLReverseIterator(t *testing.T) { t.Parallel() - db := dbm.NewMemDB() + db := memdb.NewMemDB() tree := iavl.NewMutableTree(db, cacheSize) iavlStore := UnsafeNewStore(tree, storeOptions(numRecent, storeEvery)) @@ -254,7 +255,7 @@ func TestIAVLReverseIterator(t *testing.T) { func TestIAVLPrefixIterator(t *testing.T) { t.Parallel() - db := dbm.NewMemDB() + db := memdb.NewMemDB() tree := iavl.NewMutableTree(db, cacheSize) iavlStore := UnsafeNewStore(tree, storeOptions(numRecent, storeEvery)) @@ -318,7 +319,7 @@ func TestIAVLPrefixIterator(t *testing.T) { func TestIAVLReversePrefixIterator(t *testing.T) { t.Parallel() - db := dbm.NewMemDB() + db := memdb.NewMemDB() tree := iavl.NewMutableTree(db, cacheSize) iavlStore := UnsafeNewStore(tree, storeOptions(numRecent, storeEvery)) @@ -443,7 +444,7 @@ type pruneState struct { func testPruning(t *testing.T, numRecent int64, storeEvery int64, states []pruneState) { t.Helper() - db := dbm.NewMemDB() + db := memdb.NewMemDB() tree := iavl.NewMutableTree(db, cacheSize) iavlStore := UnsafeNewStore(tree, storeOptions(numRecent, storeEvery)) for step, state := range states { @@ -464,7 +465,7 @@ func testPruning(t *testing.T, numRecent int64, storeEvery int64, states []prune func TestIAVLNoPrune(t *testing.T) { t.Parallel() - db := dbm.NewMemDB() + db := memdb.NewMemDB() tree := iavl.NewMutableTree(db, cacheSize) iavlStore := UnsafeNewStore(tree, storeOptions(numRecent, int64(1))) nextVersion(iavlStore) @@ -481,7 +482,7 @@ func TestIAVLNoPrune(t *testing.T) { func TestIAVLPruneEverything(t *testing.T) { t.Parallel() - db := dbm.NewMemDB() + db := memdb.NewMemDB() tree := iavl.NewMutableTree(db, cacheSize) iavlStore := UnsafeNewStore(tree, storeOptions(int64(0), int64(0))) nextVersion(iavlStore) @@ -501,7 +502,7 @@ func TestIAVLPruneEverything(t *testing.T) { func TestIAVLStoreQuery(t *testing.T) { t.Parallel() - db := dbm.NewMemDB() + db := memdb.NewMemDB() tree := iavl.NewMutableTree(db, cacheSize) iavlStore := UnsafeNewStore(tree, storeOptions(numRecent, storeEvery)) @@ -591,7 +592,7 @@ func TestIAVLStoreQuery(t *testing.T) { } func BenchmarkIAVLIteratorNext(b *testing.B) { - db := dbm.NewMemDB() + db := memdb.NewMemDB() treeSize := 1000 tree := iavl.NewMutableTree(db, cacheSize) for i := 0; i < treeSize; i++ { diff --git a/tm2/pkg/store/prefix/store_test.go b/tm2/pkg/store/prefix/store_test.go index 6f70c5bd16f..701ceda17d5 100644 --- a/tm2/pkg/store/prefix/store_test.go +++ b/tm2/pkg/store/prefix/store_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/db/memdb" tiavl "github.com/gnolang/gno/tm2/pkg/iavl" "github.com/gnolang/gno/tm2/pkg/store/dbadapter" @@ -90,7 +90,7 @@ func testPrefixStore(t *testing.T, baseStore types.Store, prefix []byte) { func TestIAVLStorePrefix(t *testing.T) { t.Parallel() - db := dbm.NewMemDB() + db := memdb.NewMemDB() tree := tiavl.NewMutableTree(db, cacheSize) iavlStore := iavl.UnsafeNewStore(tree, types.StoreOptions{ PruningOptions: types.PruningOptions{ @@ -106,7 +106,7 @@ func TestPrefixStoreNoNilSet(t *testing.T) { t.Parallel() meter := types.NewGasMeter(100000000) - mem := dbadapter.Store{dbm.NewMemDB()} + mem := dbadapter.Store{memdb.NewMemDB()} gasStore := gas.New(mem, meter, types.DefaultGasConfig()) require.Panics(t, func() { gasStore.Set([]byte("key"), nil) }, "setting a nil value should panic") } @@ -114,7 +114,7 @@ func TestPrefixStoreNoNilSet(t *testing.T) { func TestPrefixStoreIterate(t *testing.T) { t.Parallel() - db := dbm.NewMemDB() + db := memdb.NewMemDB() baseStore := dbadapter.Store{db} prefix := []byte("test") prefixStore := New(baseStore, prefix) @@ -164,7 +164,7 @@ func TestCloneAppend(t *testing.T) { func TestPrefixStoreIteratorEdgeCase(t *testing.T) { t.Parallel() - db := dbm.NewMemDB() + db := memdb.NewMemDB() baseStore := dbadapter.Store{db} // overflow in cpIncr @@ -196,7 +196,7 @@ func TestPrefixStoreIteratorEdgeCase(t *testing.T) { func TestPrefixStoreReverseIteratorEdgeCase(t *testing.T) { t.Parallel() - db := dbm.NewMemDB() + db := memdb.NewMemDB() baseStore := dbadapter.Store{db} // overflow in cpIncr @@ -224,7 +224,7 @@ func TestPrefixStoreReverseIteratorEdgeCase(t *testing.T) { iter.Close() - db = dbm.NewMemDB() + db = memdb.NewMemDB() baseStore = dbadapter.Store{db} // underflow in cpDecr @@ -255,7 +255,7 @@ func TestPrefixStoreReverseIteratorEdgeCase(t *testing.T) { // Tests below are ported from https://github.com/tendermint/classic/blob/master/libs/db/prefix_db_test.go func mockStoreWithStuff() types.Store { - db := dbm.NewMemDB() + db := memdb.NewMemDB() store := dbadapter.Store{db} // Under "key" prefix store.Set(bz("key"), bz("value")) diff --git a/tm2/pkg/store/rootmulti/proof_test.go b/tm2/pkg/store/rootmulti/proof_test.go index c79cbb07bd5..fa904563c79 100644 --- a/tm2/pkg/store/rootmulti/proof_test.go +++ b/tm2/pkg/store/rootmulti/proof_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" - dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/db/memdb" "github.com/gnolang/gno/tm2/pkg/store/iavl" "github.com/gnolang/gno/tm2/pkg/store/types" @@ -16,7 +16,7 @@ func TestVerifyIAVLStoreQueryProof(t *testing.T) { t.Parallel() // Create main tree for testing. - db := dbm.NewMemDB() + db := memdb.NewMemDB() opts := types.StoreOptions{ PruningOptions: types.PruneNothing, } @@ -63,7 +63,7 @@ func TestVerifyMultiStoreQueryProof(t *testing.T) { t.Parallel() // Create main tree for testing. - db := dbm.NewMemDB() + db := memdb.NewMemDB() store := NewMultiStore(db) iavlStoreKey := types.NewStoreKey("iavlStoreKey") @@ -120,7 +120,7 @@ func TestVerifyMultiStoreQueryProofEmptyStore(t *testing.T) { t.Parallel() // Create main tree for testing. - db := dbm.NewMemDB() + db := memdb.NewMemDB() store := NewMultiStore(db) iavlStoreKey := types.NewStoreKey("iavlStoreKey") @@ -151,7 +151,7 @@ func TestVerifyMultiStoreQueryProofAbsence(t *testing.T) { t.Parallel() // Create main tree for testing. - db := dbm.NewMemDB() + db := memdb.NewMemDB() store := NewMultiStore(db) iavlStoreKey := types.NewStoreKey("iavlStoreKey") diff --git a/tm2/pkg/store/rootmulti/store_test.go b/tm2/pkg/store/rootmulti/store_test.go index e6a04ee5ded..731daa8171b 100644 --- a/tm2/pkg/store/rootmulti/store_test.go +++ b/tm2/pkg/store/rootmulti/store_test.go @@ -9,6 +9,7 @@ import ( abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" "github.com/gnolang/gno/tm2/pkg/crypto/merkle" dbm "github.com/gnolang/gno/tm2/pkg/db" + "github.com/gnolang/gno/tm2/pkg/db/memdb" "github.com/gnolang/gno/tm2/pkg/store/iavl" "github.com/gnolang/gno/tm2/pkg/store/types" @@ -17,7 +18,7 @@ import ( func TestStoreType(t *testing.T) { t.Parallel() - db := dbm.NewMemDB() + db := memdb.NewMemDB() store := NewMultiStore(db) store.MountStoreWithDB( types.NewStoreKey("store1"), iavl.StoreConstructor, db) @@ -26,7 +27,7 @@ func TestStoreType(t *testing.T) { func TestStoreMount(t *testing.T) { t.Parallel() - db := dbm.NewMemDB() + db := memdb.NewMemDB() store := NewMultiStore(db) key1 := types.NewStoreKey("store1") @@ -43,7 +44,7 @@ func TestStoreMount(t *testing.T) { func TestCacheMultiStoreWithVersion(t *testing.T) { t.Parallel() - var db dbm.DB = dbm.NewMemDB() + var db dbm.DB = memdb.NewMemDB() ms := newMultiStoreWithMounts(db) err := ms.LoadLatestVersion() require.Nil(t, err) @@ -82,7 +83,7 @@ func TestCacheMultiStoreWithVersion(t *testing.T) { func TestHashStableWithEmptyCommit(t *testing.T) { t.Parallel() - var db dbm.DB = dbm.NewMemDB() + var db dbm.DB = memdb.NewMemDB() ms := newMultiStoreWithMounts(db) err := ms.LoadLatestVersion() require.Nil(t, err) @@ -108,7 +109,7 @@ func TestHashStableWithEmptyCommit(t *testing.T) { func TestMultistoreCommitLoad(t *testing.T) { t.Parallel() - var db dbm.DB = dbm.NewMemDB() + var db dbm.DB = memdb.NewMemDB() store := newMultiStoreWithMounts(db) err := store.LoadLatestVersion() require.Nil(t, err) @@ -192,7 +193,7 @@ func TestParsePath(t *testing.T) { func TestMultiStoreQuery(t *testing.T) { t.Parallel() - db := dbm.NewMemDB() + db := memdb.NewMemDB() multi := newMultiStoreWithMounts(db) err := multi.LoadLatestVersion() require.Nil(t, err)