diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d2e4e89cc19..f67ba87572eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -110,6 +110,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (x/gov) [#14390](https://github.com/cosmos/cosmos-sdk/pull/14390) Add title, proposer and summary to proposal struct * (baseapp) [#14417](https://github.com/cosmos/cosmos-sdk/pull/14417) `SetStreamingService` accepts appOptions, AppCodec and Storekeys needed to set streamers. * Store pacakge no longer has a dependency on baseapp. +* (store) [#14438](https://github.com/cosmos/cosmos-sdk/pull/14438) Pass logger from baseapp to store. ### State Machine Breaking diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go index 1115954500e0..d03cc8706f25 100644 --- a/baseapp/baseapp.go +++ b/baseapp/baseapp.go @@ -156,7 +156,7 @@ func NewBaseApp( logger: logger, name: name, db: db, - cms: store.NewCommitMultiStore(db), + cms: store.NewCommitMultiStore(db, logger), storeLoader: DefaultStoreLoader, grpcQueryRouter: NewGRPCQueryRouter(), msgServiceRouter: NewMsgServiceRouter(), diff --git a/server/mock/store_test.go b/server/mock/store_test.go index fc5cd12e097e..5f3941bfd9e7 100644 --- a/server/mock/store_test.go +++ b/server/mock/store_test.go @@ -12,6 +12,7 @@ import ( func TestStore(t *testing.T) { db := dbm.NewMemDB() + cms := NewCommitMultiStore() key := sdk.NewKVStoreKey("test") diff --git a/store/cachekv/benchmark_test.go b/store/cachekv/benchmark_test.go index b899068dec6d..3f00c2f01867 100644 --- a/store/cachekv/benchmark_test.go +++ b/store/cachekv/benchmark_test.go @@ -18,7 +18,7 @@ func DoBenchmarkDeepContextStack(b *testing.B, depth int) { key := storetypes.NewKVStoreKey("test") db := dbm.NewMemDB() - cms := store.NewCommitMultiStore(db) + cms := store.NewCommitMultiStore(db, log.NewNopLogger()) cms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, db) cms.LoadLatestVersion() ctx := sdk.NewContext(cms, tmproto.Header{}, false, log.NewNopLogger()) diff --git a/store/store.go b/store/store.go index 492bd4fee1dc..a367e4ee3dfc 100644 --- a/store/store.go +++ b/store/store.go @@ -9,8 +9,8 @@ import ( "github.com/cosmos/cosmos-sdk/store/types" ) -func NewCommitMultiStore(db dbm.DB) types.CommitMultiStore { - return rootmulti.NewStore(db, log.NewNopLogger()) +func NewCommitMultiStore(db dbm.DB, logger log.Logger) types.CommitMultiStore { + return rootmulti.NewStore(db, logger) } func NewCommitKVStoreCacheManager() types.MultiStorePersistentCache { diff --git a/testutil/context.go b/testutil/context.go index d422dd33b642..038ff4e9075d 100644 --- a/testutil/context.go +++ b/testutil/context.go @@ -16,7 +16,7 @@ import ( // DefaultContext creates a sdk.Context with a fresh MemDB that can be used in tests. func DefaultContext(key storetypes.StoreKey, tkey storetypes.StoreKey) sdk.Context { db := dbm.NewMemDB() - cms := store.NewCommitMultiStore(db) + cms := store.NewCommitMultiStore(db, log.NewNopLogger()) cms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, db) cms.MountStoreWithDB(tkey, storetypes.StoreTypeTransient, db) err := cms.LoadLatestVersion() @@ -36,7 +36,7 @@ type TestContext struct { func DefaultContextWithDB(t *testing.T, key storetypes.StoreKey, tkey storetypes.StoreKey) TestContext { db := dbm.NewMemDB() - cms := store.NewCommitMultiStore(db) + cms := store.NewCommitMultiStore(db, log.NewNopLogger()) cms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, db) cms.MountStoreWithDB(tkey, storetypes.StoreTypeTransient, db) err := cms.LoadLatestVersion() diff --git a/x/group/internal/orm/testsupport.go b/x/group/internal/orm/testsupport.go index 1b4a6847898a..b9d0a0c575ff 100644 --- a/x/group/internal/orm/testsupport.go +++ b/x/group/internal/orm/testsupport.go @@ -3,11 +3,13 @@ package orm import ( "fmt" + "github.com/tendermint/tendermint/libs/log" + dbm "github.com/tendermint/tm-db" + "github.com/cosmos/cosmos-sdk/store" "github.com/cosmos/cosmos-sdk/store/gaskv" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - dbm "github.com/tendermint/tm-db" ) type MockContext struct { @@ -19,7 +21,7 @@ func NewMockContext() *MockContext { db := dbm.NewMemDB() return &MockContext{ db: dbm.NewMemDB(), - store: store.NewCommitMultiStore(db), + store: store.NewCommitMultiStore(db, log.NewNopLogger()), } } diff --git a/x/group/keeper/invariants_test.go b/x/group/keeper/invariants_test.go index 013f5e3a651b..c83320d13fa9 100644 --- a/x/group/keeper/invariants_test.go +++ b/x/group/keeper/invariants_test.go @@ -5,7 +5,6 @@ import ( "github.com/stretchr/testify/suite" "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" dbm "github.com/tendermint/tm-db" @@ -39,7 +38,7 @@ func (s *invariantTestSuite) SetupSuite() { cdc := codec.NewProtoCodec(interfaceRegistry) key := sdk.NewKVStoreKey(group.ModuleName) db := dbm.NewMemDB() - cms := store.NewCommitMultiStore(db) + cms := store.NewCommitMultiStore(db, log.NewNopLogger()) cms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, db) _ = cms.LoadLatestVersion() sdkCtx := sdk.NewContext(cms, tmproto.Header{}, false, log.NewNopLogger()) diff --git a/x/params/types/subspace_test.go b/x/params/types/subspace_test.go index d594011f531f..3ac8a7a4800b 100644 --- a/x/params/types/subspace_test.go +++ b/x/params/types/subspace_test.go @@ -32,7 +32,7 @@ type SubspaceTestSuite struct { func (suite *SubspaceTestSuite) SetupTest() { db := dbm.NewMemDB() - ms := store.NewCommitMultiStore(db) + ms := store.NewCommitMultiStore(db, log.NewNopLogger()) ms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, db) ms.MountStoreWithDB(tkey, storetypes.StoreTypeTransient, db) suite.NoError(ms.LoadLatestVersion())