From de851acf1bda56f0f618bff5f4015bb0a65a2bee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 15:09:33 +0100 Subject: [PATCH] build(deps): Bump github.com/cosmos/cosmos-db from 0.0.0-20220822060143-23a8145386c0 to 1.0.0-rc.1 (#691) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marko Baricevic --- basic_test.go | 2 +- benchmarks/bench_test.go | 2 +- cmd/iaviewer/main.go | 2 +- go.mod | 5 ++--- go.sum | 10 ++++------ mock/db_mock.go | 29 +++++++++++++++++++++++++++++ tree_random_test.go | 2 +- tree_test.go | 4 ++-- 8 files changed, 41 insertions(+), 15 deletions(-) diff --git a/basic_test.go b/basic_test.go index 840637cdc..e864fb204 100644 --- a/basic_test.go +++ b/basic_test.go @@ -341,7 +341,7 @@ func TestIntegration(t *testing.T) { } for i, x := range records { - if val, removed, err := tree.Remove([]byte(x.key)); err != nil { //nolint:gocritic + if val, removed, err := tree.Remove([]byte(x.key)); err != nil { require.NoError(t, err) } else if !removed { t.Error("Wasn't removed") diff --git a/benchmarks/bench_test.go b/benchmarks/bench_test.go index b6792dcbf..bcc5b5152 100644 --- a/benchmarks/bench_test.go +++ b/benchmarks/bench_test.go @@ -330,7 +330,7 @@ func runBenchmarks(b *testing.B, benchmarks []benchmark) { // prepare a dir for the db and cleanup afterwards dirName := fmt.Sprintf("./%s-db", prefix) - if (bb.dbType == db.RocksDBBackend) || (bb.dbType == db.CLevelDBBackend) { + if bb.dbType == db.RocksDBBackend { _ = os.Mkdir(dirName, 0o755) } diff --git a/cmd/iaviewer/main.go b/cmd/iaviewer/main.go index 0caf3f979..4f3a580bf 100644 --- a/cmd/iaviewer/main.go +++ b/cmd/iaviewer/main.go @@ -84,7 +84,7 @@ func OpenDB(dir string) (dbm.DB, error) { return nil, fmt.Errorf("cannot cut paths on %s", dir) } name := dir[cut+1:] - db, err := dbm.NewGoLevelDB(name, dir[:cut]) + db, err := dbm.NewGoLevelDB(name, dir[:cut], nil) if err != nil { return nil, err } diff --git a/go.mod b/go.mod index 1a8ad9063..0ecaed8f3 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/confio/ics23/go v0.9.0 - github.com/cosmos/cosmos-db v0.0.0-20220822060143-23a8145386c0 + github.com/cosmos/cosmos-db v1.0.0-rc.1 github.com/emicklei/dot v1.3.1 github.com/golang/mock v1.6.0 github.com/golangci/golangci-lint v1.51.2 @@ -94,7 +94,6 @@ require ( github.com/jgautheron/goconst v1.5.1 // indirect github.com/jingyugao/rowserrcheck v1.1.1 // indirect github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect - github.com/jmhodges/levigo v1.0.0 // indirect github.com/julz/importas v0.1.0 // indirect github.com/junk1tm/musttag v0.4.5 // indirect github.com/kisielk/errcheck v1.6.3 // indirect @@ -109,7 +108,7 @@ require ( github.com/ldez/gomoddirectives v0.2.3 // indirect github.com/ldez/tagliatelle v0.4.0 // indirect github.com/leonklingele/grouper v1.1.1 // indirect - github.com/linxGnu/grocksdb v1.7.4 // indirect + github.com/linxGnu/grocksdb v1.7.14 // indirect github.com/lufeee/execinquery v1.2.1 // indirect github.com/magiconair/properties v1.8.6 // indirect github.com/maratori/testableexamples v1.0.0 // indirect diff --git a/go.sum b/go.sum index 65fe39c3c..ef55af04e 100644 --- a/go.sum +++ b/go.sum @@ -135,8 +135,8 @@ github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/cosmos/cosmos-db v0.0.0-20220822060143-23a8145386c0 h1:OMu+dCsWVVsHodR4ykMKEj0VtwkNL+xOtyv0vmCmZVQ= -github.com/cosmos/cosmos-db v0.0.0-20220822060143-23a8145386c0/go.mod h1:n5af5ISKZ7tP0q9hP1TW6MnWh7GrVrNfCLZhg+22gzg= +github.com/cosmos/cosmos-db v1.0.0-rc.1 h1:SjnT8B6WKMW9WEIX32qMhnEEKcI7ZP0+G1Sa9HD3nmY= +github.com/cosmos/cosmos-db v1.0.0-rc.1/go.mod h1:Dnmk3flSf5lkwCqvvjNpoxjpXzhxnCAFzKHlbaForso= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= @@ -385,8 +385,6 @@ github.com/jingyugao/rowserrcheck v1.1.1 h1:zibz55j/MJtLsjP1OF4bSdgXxwL1b+Vn7Tjz github.com/jingyugao/rowserrcheck v1.1.1/go.mod h1:4yvlZSDb3IyDTUZJUmpZfm2Hwok+Dtp+nu2qOq+er9c= github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af h1:KA9BjwUk7KlCh6S9EAGWBt1oExIUv9WyNCiRz5amv48= github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= -github.com/jmhodges/levigo v1.0.0 h1:q5EC36kV79HWeTBWsod3mG11EgStG3qArTKcvlksN1U= -github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -449,8 +447,8 @@ github.com/ldez/tagliatelle v0.4.0 h1:sylp7d9kh6AdXN2DpVGHBRb5guTVAgOxqNGhbqc4b1 github.com/ldez/tagliatelle v0.4.0/go.mod h1:mNtTfrHy2haaBAw+VT7IBV6VXBThS7TCreYWbBcJ87I= github.com/leonklingele/grouper v1.1.1 h1:suWXRU57D4/Enn6pXR0QVqqWWrnJ9Osrz+5rjt8ivzU= github.com/leonklingele/grouper v1.1.1/go.mod h1:uk3I3uDfi9B6PeUjsCKi6ndcf63Uy7snXgR4yDYQVDY= -github.com/linxGnu/grocksdb v1.7.4 h1:RCdeq0Y9jsDkRtFcgWclRrpL/AFEMQhPyOp6OIprOGc= -github.com/linxGnu/grocksdb v1.7.4/go.mod h1:G4zrMNj2CP2aCXF61jbmZH81tu+kU3qU4rYpOU8WOL8= +github.com/linxGnu/grocksdb v1.7.14 h1:8lMZzyWeNP5lI0BIppX05DzmQzXj/Tgu82bgWYtowLY= +github.com/linxGnu/grocksdb v1.7.14/go.mod h1:pY55D0o+r8yUYLq70QmhdudxYvoDb9F+9puf4m3/W+U= github.com/lufeee/execinquery v1.2.1 h1:hf0Ems4SHcUGBxpGN7Jz78z1ppVkP/837ZlETPCEtOM= github.com/lufeee/execinquery v1.2.1/go.mod h1:EC7DrEKView09ocscGHC+apXMIaorh4xqSxS/dy8SbM= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= diff --git a/mock/db_mock.go b/mock/db_mock.go index c80efd44f..30c8358c1 100644 --- a/mock/db_mock.go +++ b/mock/db_mock.go @@ -135,6 +135,20 @@ func (mr *MockDBMockRecorder) NewBatch() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewBatch", reflect.TypeOf((*MockDB)(nil).NewBatch)) } +// NewBatchWithSize mocks base method. +func (m *MockDB) NewBatchWithSize(arg0 int) db.Batch { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "NewBatchWithSize", arg0) + ret0, _ := ret[0].(db.Batch) + return ret0 +} + +// NewBatchWithSize indicates an expected call of NewBatchWithSize. +func (mr *MockDBMockRecorder) NewBatchWithSize(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewBatchWithSize", reflect.TypeOf((*MockDB)(nil).NewBatchWithSize), arg0) +} + // Print mocks base method. func (m *MockDB) Print() error { m.ctrl.T.Helper() @@ -377,6 +391,21 @@ func (mr *MockBatchMockRecorder) Delete(arg0 interface{}) *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockBatch)(nil).Delete), arg0) } +// GetByteSize mocks base method. +func (m *MockBatch) GetByteSize() (int, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetByteSize") + ret0, _ := ret[0].(int) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// GetByteSize indicates an expected call of GetByteSize. +func (mr *MockBatchMockRecorder) GetByteSize() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetByteSize", reflect.TypeOf((*MockBatch)(nil).GetByteSize)) +} + // Set mocks base method. func (m *MockBatch) Set(arg0, arg1 []byte) error { m.ctrl.T.Helper() diff --git a/tree_random_test.go b/tree_random_test.go index bc29b2be7..da3a53510 100644 --- a/tree_random_test.go +++ b/tree_random_test.go @@ -99,7 +99,7 @@ func testRandomOperations(t *testing.T, randSeed int64) { require.NoError(t, err) defer os.RemoveAll(tempdir) - levelDB, err := db.NewGoLevelDB("leveldb", tempdir) + levelDB, err := db.NewGoLevelDB("leveldb", tempdir, nil) require.NoError(t, err) tree, version, _ := loadTree(levelDB) diff --git a/tree_test.go b/tree_test.go index d58547387..ece1479e5 100644 --- a/tree_test.go +++ b/tree_test.go @@ -35,7 +35,7 @@ func SetupTest() { func getTestDB() (db.DB, func()) { if testLevelDB { - d, err := db.NewGoLevelDB("test", ".") + d, err := db.NewGoLevelDB("test", ".", nil) if err != nil { panic(err) } @@ -1495,7 +1495,7 @@ func BenchmarkTreeLoadAndDelete(b *testing.B) { numVersions := 5000 numKeysPerVersion := 10 - d, err := db.NewGoLevelDB("bench", ".") + d, err := db.NewGoLevelDB("bench", ".", nil) if err != nil { panic(err) }