diff --git a/store/v2/db/db.go b/store/v2/db/db.go index a8c741e45424e..3be46d750f399 100644 --- a/store/v2/db/db.go +++ b/store/v2/db/db.go @@ -3,8 +3,8 @@ package db import ( "fmt" + coreserver "cosmossdk.io/core/server" corestore "cosmossdk.io/core/store" - "cosmossdk.io/store/v2" ) type DBType string @@ -18,7 +18,7 @@ const ( DBFileSuffix string = ".db" ) -func NewDB(dbType DBType, name, dataDir string, opts store.DBOptions) (corestore.KVStoreWithBatch, error) { +func NewDB(dbType DBType, name, dataDir string, opts coreserver.DynamicConfig) (corestore.KVStoreWithBatch, error) { switch dbType { case DBTypeGoLevelDB: return NewGoLevelDB(name, dataDir, opts) diff --git a/store/v2/db/goleveldb.go b/store/v2/db/goleveldb.go index 59e2e08ad8e4f..d1c1242e497d0 100644 --- a/store/v2/db/goleveldb.go +++ b/store/v2/db/goleveldb.go @@ -14,8 +14,8 @@ import ( "github.com/syndtr/goleveldb/leveldb/opt" "github.com/syndtr/goleveldb/leveldb/util" + coreserver "cosmossdk.io/core/server" corestore "cosmossdk.io/core/store" - "cosmossdk.io/store/v2" storeerrors "cosmossdk.io/store/v2/errors" ) @@ -28,7 +28,7 @@ type GoLevelDB struct { db *leveldb.DB } -func NewGoLevelDB(name, dir string, opts store.DBOptions) (*GoLevelDB, error) { +func NewGoLevelDB(name, dir string, opts coreserver.DynamicConfig) (*GoLevelDB, error) { defaultOpts := &opt.Options{ Filter: filter.NewBloomFilter(10), // by default, goleveldb doesn't use a bloom filter. } diff --git a/store/v2/db/pebbledb.go b/store/v2/db/pebbledb.go index 382ee70799116..e5265883c3480 100644 --- a/store/v2/db/pebbledb.go +++ b/store/v2/db/pebbledb.go @@ -10,8 +10,8 @@ import ( "github.com/cockroachdb/pebble" "github.com/spf13/cast" + coreserver "cosmossdk.io/core/server" corestore "cosmossdk.io/core/store" - "cosmossdk.io/store/v2" storeerrors "cosmossdk.io/store/v2/errors" ) @@ -28,7 +28,7 @@ func NewPebbleDB(name, dataDir string) (*PebbleDB, error) { return NewPebbleDBWithOpts(name, dataDir, nil) } -func NewPebbleDBWithOpts(name, dataDir string, opts store.DBOptions) (*PebbleDB, error) { +func NewPebbleDBWithOpts(name, dataDir string, opts coreserver.DynamicConfig) (*PebbleDB, error) { do := &pebble.Options{ MaxConcurrentCompactions: func() int { return 3 }, // default 1 } diff --git a/store/v2/db/rocksdb_noflag.go b/store/v2/db/rocksdb_noflag.go index 6e05c9a10a386..ab6ecba70753c 100644 --- a/store/v2/db/rocksdb_noflag.go +++ b/store/v2/db/rocksdb_noflag.go @@ -4,8 +4,8 @@ package db import ( + coreserver "cosmossdk.io/core/server" corestore "cosmossdk.io/core/store" - "cosmossdk.io/store/v2" ) var _ corestore.KVStoreWithBatch = (*RocksDB)(nil) @@ -19,7 +19,7 @@ func NewRocksDB(name, dataDir string) (*RocksDB, error) { panic("rocksdb must be built with -tags rocksdb") } -func NewRocksDBWithOpts(dataDir string, opts store.DBOptions) (*RocksDB, error) { +func NewRocksDBWithOpts(dataDir string, opts coreserver.DynamicConfig) (*RocksDB, error) { panic("rocksdb must be built with -tags rocksdb") } diff --git a/store/v2/options.go b/store/v2/options.go index f87475e4a6d24..a2e64ab2b2698 100644 --- a/store/v2/options.go +++ b/store/v2/options.go @@ -77,8 +77,3 @@ func (opts *PruningOption) ShouldPrune(version uint64) (bool, uint64) { return false, 0 } - -// DBOptions defines the interface of a database options. -type DBOptions interface { - Get(string) interface{} -} diff --git a/store/v2/root/reader.go b/store/v2/root/reader.go index 39737f8122668..b7d8c59fa27a7 100644 --- a/store/v2/root/reader.go +++ b/store/v2/root/reader.go @@ -54,12 +54,7 @@ func (roa *Reader) Has(key []byte) (bool, error) { } func (roa *Reader) Get(key []byte) ([]byte, error) { - result, err := roa.rootStore.GetStateStorage().Get(roa.actor, roa.version, key) - if err != nil { - return nil, err - } - - return result, nil + return roa.rootStore.GetStateStorage().Get(roa.actor, roa.version, key) } func (roa *Reader) Iterator(start, end []byte) (corestore.Iterator, error) {