feat(log): remove core dependency and update core interface to be dependency free (#21045)
Co-authored-by: marbar3778 <marbar3778@yahoo.com> Co-authored-by: Julien Robert <julien@rbrt.fr>
This commit is contained in:
co-authored by
marbar3778
Julien Robert
parent
9f5ee3a083
commit
5c90246b3f
+7
-7
@@ -8,7 +8,7 @@ import (
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
||||
"cosmossdk.io/core/header"
|
||||
coretesting "cosmossdk.io/core/testing"
|
||||
"cosmossdk.io/log"
|
||||
"cosmossdk.io/store"
|
||||
"cosmossdk.io/store/metrics"
|
||||
storetypes "cosmossdk.io/store/types"
|
||||
@@ -19,14 +19,14 @@ import (
|
||||
// DefaultContext creates a sdk.Context with a fresh MemDB that can be used in tests.
|
||||
func DefaultContext(key, tkey storetypes.StoreKey) sdk.Context {
|
||||
db := dbm.NewMemDB()
|
||||
cms := store.NewCommitMultiStore(db, coretesting.NewNopLogger(), metrics.NewNoOpMetrics())
|
||||
cms := store.NewCommitMultiStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
|
||||
cms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, db)
|
||||
cms.MountStoreWithDB(tkey, storetypes.StoreTypeTransient, db)
|
||||
err := cms.LoadLatestVersion()
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
ctx := sdk.NewContext(cms, false, coretesting.NewNopLogger())
|
||||
ctx := sdk.NewContext(cms, false, log.NewNopLogger())
|
||||
|
||||
return ctx
|
||||
}
|
||||
@@ -39,7 +39,7 @@ func DefaultContextWithKeys(
|
||||
memKeys map[string]*storetypes.MemoryStoreKey,
|
||||
) sdk.Context {
|
||||
db := dbm.NewMemDB()
|
||||
cms := store.NewCommitMultiStore(db, coretesting.NewNopLogger(), metrics.NewNoOpMetrics())
|
||||
cms := store.NewCommitMultiStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
|
||||
|
||||
for _, key := range keys {
|
||||
cms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, db)
|
||||
@@ -58,7 +58,7 @@ func DefaultContextWithKeys(
|
||||
panic(err)
|
||||
}
|
||||
|
||||
return sdk.NewContext(cms, false, coretesting.NewNopLogger())
|
||||
return sdk.NewContext(cms, false, log.NewNopLogger())
|
||||
}
|
||||
|
||||
type TestContext struct {
|
||||
@@ -70,13 +70,13 @@ type TestContext struct {
|
||||
func DefaultContextWithDB(tb testing.TB, key, tkey storetypes.StoreKey) TestContext {
|
||||
tb.Helper()
|
||||
db := dbm.NewMemDB()
|
||||
cms := store.NewCommitMultiStore(db, coretesting.NewNopLogger(), metrics.NewNoOpMetrics())
|
||||
cms := store.NewCommitMultiStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
|
||||
cms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, db)
|
||||
cms.MountStoreWithDB(tkey, storetypes.StoreTypeTransient, db)
|
||||
err := cms.LoadLatestVersion()
|
||||
assert.NoError(tb, err)
|
||||
|
||||
ctx := sdk.NewContext(cms, false, coretesting.NewNopLogger()).WithHeaderInfo(header.Info{Time: time.Now()})
|
||||
ctx := sdk.NewContext(cms, false, log.NewNopLogger()).WithHeaderInfo(header.Info{Time: time.Now()})
|
||||
|
||||
return TestContext{ctx, db, cms}
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ package mock
|
||||
import (
|
||||
reflect "reflect"
|
||||
|
||||
log "cosmossdk.io/core/log"
|
||||
log "cosmossdk.io/log"
|
||||
gomock "github.com/golang/mock/gomock"
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user