chore: iavl-v0.20-alpha1 and cosmos-db (#14411)

Co-authored-by: marbar3778 <marbar3778@yahoo.com>

store/pruning/manager.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"sync"
 
+	dbm "github.com/cosmos/cosmos-db"
 	"github.com/tendermint/tendermint/libs/log"
-	dbm "github.com/tendermint/tm-db"
 
 	"github.com/cosmos/cosmos-sdk/store/pruning/types"
 )

store/pruning/manager_test.go

@@ -6,13 +6,13 @@ import (
 	"fmt"
 	"testing"
 
+	db "github.com/cosmos/cosmos-db"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 	"github.com/tendermint/tendermint/libs/log"
-	db "github.com/tendermint/tm-db"
 
+	"github.com/cosmos/cosmos-sdk/store/mock"
 	"github.com/cosmos/cosmos-sdk/store/pruning"
-	"github.com/cosmos/cosmos-sdk/store/pruning/mock"
 	"github.com/cosmos/cosmos-sdk/store/pruning/types"
 )
 

store/pruning/mock/db_mock.go

@@ -1,420 +0,0 @@
-// Code generated by MockGen. DO NOT EDIT.
-// Source: /home/roman/projects/cosmos-sdk/vendor/github.com/tendermint/tm-db/types.go
-
-// Package mock_db is a generated GoMock package.
-package mock
-
-import (
-	reflect "reflect"
-
-	gomock "github.com/golang/mock/gomock"
-	db "github.com/tendermint/tm-db"
-)
-
-// MockDB is a mock of DB interface.
-type MockDB struct {
-	ctrl     *gomock.Controller
-	recorder *MockDBMockRecorder
-}
-
-// MockDBMockRecorder is the mock recorder for MockDB.
-type MockDBMockRecorder struct {
-	mock *MockDB
-}
-
-// NewMockDB creates a new mock instance.
-func NewMockDB(ctrl *gomock.Controller) *MockDB {
-	mock := &MockDB{ctrl: ctrl}
-	mock.recorder = &MockDBMockRecorder{mock}
-	return mock
-}
-
-// EXPECT returns an object that allows the caller to indicate expected use.
-func (m *MockDB) EXPECT() *MockDBMockRecorder {
-	return m.recorder
-}
-
-// Close mocks base method.
-func (m *MockDB) Close() error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Close")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// Close indicates an expected call of Close.
-func (mr *MockDBMockRecorder) Close() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockDB)(nil).Close))
-}
-
-// Delete mocks base method.
-func (m *MockDB) Delete(arg0 []byte) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Delete", arg0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// Delete indicates an expected call of Delete.
-func (mr *MockDBMockRecorder) Delete(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockDB)(nil).Delete), arg0)
-}
-
-// DeleteSync mocks base method.
-func (m *MockDB) DeleteSync(arg0 []byte) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "DeleteSync", arg0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// DeleteSync indicates an expected call of DeleteSync.
-func (mr *MockDBMockRecorder) DeleteSync(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteSync", reflect.TypeOf((*MockDB)(nil).DeleteSync), arg0)
-}
-
-// Get mocks base method.
-func (m *MockDB) Get(arg0 []byte) ([]byte, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Get", arg0)
-	ret0, _ := ret[0].([]byte)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// Get indicates an expected call of Get.
-func (mr *MockDBMockRecorder) Get(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockDB)(nil).Get), arg0)
-}
-
-// Has mocks base method.
-func (m *MockDB) Has(key []byte) (bool, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Has", key)
-	ret0, _ := ret[0].(bool)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// Has indicates an expected call of Has.
-func (mr *MockDBMockRecorder) Has(key interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Has", reflect.TypeOf((*MockDB)(nil).Has), key)
-}
-
-// Iterator mocks base method.
-func (m *MockDB) Iterator(start, end []byte) (db.Iterator, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Iterator", start, end)
-	ret0, _ := ret[0].(db.Iterator)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// Iterator indicates an expected call of Iterator.
-func (mr *MockDBMockRecorder) Iterator(start, end interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Iterator", reflect.TypeOf((*MockDB)(nil).Iterator), start, end)
-}
-
-// NewBatch mocks base method.
-func (m *MockDB) NewBatch() db.Batch {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "NewBatch")
-	ret0, _ := ret[0].(db.Batch)
-	return ret0
-}
-
-// NewBatch indicates an expected call of NewBatch.
-func (mr *MockDBMockRecorder) NewBatch() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewBatch", reflect.TypeOf((*MockDB)(nil).NewBatch))
-}
-
-// Print mocks base method.
-func (m *MockDB) Print() error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Print")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// Print indicates an expected call of Print.
-func (mr *MockDBMockRecorder) Print() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Print", reflect.TypeOf((*MockDB)(nil).Print))
-}
-
-// ReverseIterator mocks base method.
-func (m *MockDB) ReverseIterator(start, end []byte) (db.Iterator, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ReverseIterator", start, end)
-	ret0, _ := ret[0].(db.Iterator)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// ReverseIterator indicates an expected call of ReverseIterator.
-func (mr *MockDBMockRecorder) ReverseIterator(start, end interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReverseIterator", reflect.TypeOf((*MockDB)(nil).ReverseIterator), start, end)
-}
-
-// Set mocks base method.
-func (m *MockDB) Set(arg0, arg1 []byte) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Set", arg0, arg1)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// Set indicates an expected call of Set.
-func (mr *MockDBMockRecorder) Set(arg0, arg1 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Set", reflect.TypeOf((*MockDB)(nil).Set), arg0, arg1)
-}
-
-// SetSync mocks base method.
-func (m *MockDB) SetSync(arg0, arg1 []byte) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SetSync", arg0, arg1)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// SetSync indicates an expected call of SetSync.
-func (mr *MockDBMockRecorder) SetSync(arg0, arg1 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetSync", reflect.TypeOf((*MockDB)(nil).SetSync), arg0, arg1)
-}
-
-// Stats mocks base method.
-func (m *MockDB) Stats() map[string]string {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Stats")
-	ret0, _ := ret[0].(map[string]string)
-	return ret0
-}
-
-// Stats indicates an expected call of Stats.
-func (mr *MockDBMockRecorder) Stats() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stats", reflect.TypeOf((*MockDB)(nil).Stats))
-}
-
-// MockBatch is a mock of Batch interface.
-type MockBatch struct {
-	ctrl     *gomock.Controller
-	recorder *MockBatchMockRecorder
-}
-
-// MockBatchMockRecorder is the mock recorder for MockBatch.
-type MockBatchMockRecorder struct {
-	mock *MockBatch
-}
-
-// NewMockBatch creates a new mock instance.
-func NewMockBatch(ctrl *gomock.Controller) *MockBatch {
-	mock := &MockBatch{ctrl: ctrl}
-	mock.recorder = &MockBatchMockRecorder{mock}
-	return mock
-}
-
-// EXPECT returns an object that allows the caller to indicate expected use.
-func (m *MockBatch) EXPECT() *MockBatchMockRecorder {
-	return m.recorder
-}
-
-// Close mocks base method.
-func (m *MockBatch) Close() error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Close")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// Close indicates an expected call of Close.
-func (mr *MockBatchMockRecorder) Close() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockBatch)(nil).Close))
-}
-
-// Delete mocks base method.
-func (m *MockBatch) Delete(key []byte) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Delete", key)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// Delete indicates an expected call of Delete.
-func (mr *MockBatchMockRecorder) Delete(key interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockBatch)(nil).Delete), key)
-}
-
-// Set mocks base method.
-func (m *MockBatch) Set(key, value []byte) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Set", key, value)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// Set indicates an expected call of Set.
-func (mr *MockBatchMockRecorder) Set(key, value interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Set", reflect.TypeOf((*MockBatch)(nil).Set), key, value)
-}
-
-// Write mocks base method.
-func (m *MockBatch) Write() error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Write")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// Write indicates an expected call of Write.
-func (mr *MockBatchMockRecorder) Write() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Write", reflect.TypeOf((*MockBatch)(nil).Write))
-}
-
-// WriteSync mocks base method.
-func (m *MockBatch) WriteSync() error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "WriteSync")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// WriteSync indicates an expected call of WriteSync.
-func (mr *MockBatchMockRecorder) WriteSync() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WriteSync", reflect.TypeOf((*MockBatch)(nil).WriteSync))
-}
-
-// MockIterator is a mock of Iterator interface.
-type MockIterator struct {
-	ctrl     *gomock.Controller
-	recorder *MockIteratorMockRecorder
-}
-
-// MockIteratorMockRecorder is the mock recorder for MockIterator.
-type MockIteratorMockRecorder struct {
-	mock *MockIterator
-}
-
-// NewMockIterator creates a new mock instance.
-func NewMockIterator(ctrl *gomock.Controller) *MockIterator {
-	mock := &MockIterator{ctrl: ctrl}
-	mock.recorder = &MockIteratorMockRecorder{mock}
-	return mock
-}
-
-// EXPECT returns an object that allows the caller to indicate expected use.
-func (m *MockIterator) EXPECT() *MockIteratorMockRecorder {
-	return m.recorder
-}
-
-// Close mocks base method.
-func (m *MockIterator) Close() error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Close")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// Close indicates an expected call of Close.
-func (mr *MockIteratorMockRecorder) Close() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockIterator)(nil).Close))
-}
-
-// Domain mocks base method.
-func (m *MockIterator) Domain() ([]byte, []byte) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Domain")
-	ret0, _ := ret[0].([]byte)
-	ret1, _ := ret[1].([]byte)
-	return ret0, ret1
-}
-
-// Domain indicates an expected call of Domain.
-func (mr *MockIteratorMockRecorder) Domain() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Domain", reflect.TypeOf((*MockIterator)(nil).Domain))
-}
-
-// Error mocks base method.
-func (m *MockIterator) Error() error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Error")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// Error indicates an expected call of Error.
-func (mr *MockIteratorMockRecorder) Error() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockIterator)(nil).Error))
-}
-
-// Key mocks base method.
-func (m *MockIterator) Key() []byte {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Key")
-	ret0, _ := ret[0].([]byte)
-	return ret0
-}
-
-// Key indicates an expected call of Key.
-func (mr *MockIteratorMockRecorder) Key() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Key", reflect.TypeOf((*MockIterator)(nil).Key))
-}
-
-// Next mocks base method.
-func (m *MockIterator) Next() {
-	m.ctrl.T.Helper()
-	m.ctrl.Call(m, "Next")
-}
-
-// Next indicates an expected call of Next.
-func (mr *MockIteratorMockRecorder) Next() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Next", reflect.TypeOf((*MockIterator)(nil).Next))
-}
-
-// Valid mocks base method.
-func (m *MockIterator) Valid() bool {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Valid")
-	ret0, _ := ret[0].(bool)
-	return ret0
-}
-
-// Valid indicates an expected call of Valid.
-func (mr *MockIteratorMockRecorder) Valid() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Valid", reflect.TypeOf((*MockIterator)(nil).Valid))
-}
-
-// Value mocks base method.
-func (m *MockIterator) Value() []byte {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Value")
-	ret0, _ := ret[0].([]byte)
-	return ret0
-}
-
-// Value indicates an expected call of Value.
-func (mr *MockIteratorMockRecorder) Value() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Value", reflect.TypeOf((*MockIterator)(nil).Value))
-}