feat!: Provide logger through depinject (#15818)
Co-authored-by: Julien Robert <julien@rbrt.fr>
This commit is contained in:
co-authored by
Julien Robert
parent
8e896f4d31
commit
af3122aa6c
@@ -82,14 +82,18 @@ func TestBaseApp_BlockGas(t *testing.T) {
|
||||
err error
|
||||
)
|
||||
|
||||
err = depinject.Inject(configurator.NewAppConfig(
|
||||
configurator.AuthModule(),
|
||||
configurator.TxModule(),
|
||||
configurator.ParamsModule(),
|
||||
configurator.ConsensusModule(),
|
||||
configurator.BankModule(),
|
||||
configurator.StakingModule(),
|
||||
),
|
||||
err = depinject.Inject(
|
||||
depinject.Configs(
|
||||
configurator.NewAppConfig(
|
||||
configurator.AuthModule(),
|
||||
configurator.TxModule(),
|
||||
configurator.ParamsModule(),
|
||||
configurator.ConsensusModule(),
|
||||
configurator.BankModule(),
|
||||
configurator.StakingModule(),
|
||||
),
|
||||
depinject.Supply(log.NewNopLogger()),
|
||||
),
|
||||
&bankKeeper,
|
||||
&accountKeeper,
|
||||
&interfaceRegistry,
|
||||
@@ -99,7 +103,7 @@ func TestBaseApp_BlockGas(t *testing.T) {
|
||||
&appBuilder)
|
||||
require.NoError(t, err)
|
||||
|
||||
bapp := appBuilder.Build(log.NewNopLogger(), dbm.NewMemDB(), nil)
|
||||
bapp := appBuilder.Build(dbm.NewMemDB(), nil)
|
||||
err = bapp.Load(true)
|
||||
require.NoError(t, err)
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@ import (
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"cosmossdk.io/depinject"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/baseapp"
|
||||
"github.com/cosmos/cosmos-sdk/codec/types"
|
||||
"github.com/cosmos/cosmos-sdk/runtime"
|
||||
@@ -55,10 +56,15 @@ func TestGRPCQueryRouter(t *testing.T) {
|
||||
func TestRegisterQueryServiceTwice(t *testing.T) {
|
||||
// Setup baseapp.
|
||||
var appBuilder *runtime.AppBuilder
|
||||
err := depinject.Inject(makeMinimalConfig(), &appBuilder)
|
||||
err := depinject.Inject(
|
||||
depinject.Configs(
|
||||
makeMinimalConfig(),
|
||||
depinject.Supply(log.NewTestLogger(t)),
|
||||
),
|
||||
&appBuilder)
|
||||
require.NoError(t, err)
|
||||
db := dbm.NewMemDB()
|
||||
app := appBuilder.Build(log.NewTestLogger(t), db, nil)
|
||||
app := appBuilder.Build(db, nil)
|
||||
|
||||
// First time registering service shouldn't panic.
|
||||
require.NotPanics(t, func() {
|
||||
|
||||
@@ -11,6 +11,7 @@ import (
|
||||
|
||||
"cosmossdk.io/depinject"
|
||||
"cosmossdk.io/log"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/client/tx"
|
||||
"github.com/cosmos/cosmos-sdk/codec"
|
||||
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
|
||||
@@ -27,9 +28,13 @@ func TestRegisterMsgService(t *testing.T) {
|
||||
appBuilder *runtime.AppBuilder
|
||||
registry codectypes.InterfaceRegistry
|
||||
)
|
||||
err := depinject.Inject(makeMinimalConfig(), &appBuilder, ®istry)
|
||||
err := depinject.Inject(
|
||||
depinject.Configs(
|
||||
makeMinimalConfig(),
|
||||
depinject.Supply(log.NewTestLogger(t)),
|
||||
), &appBuilder, ®istry)
|
||||
require.NoError(t, err)
|
||||
app := appBuilder.Build(log.NewTestLogger(t), dbm.NewMemDB(), nil)
|
||||
app := appBuilder.Build(dbm.NewMemDB(), nil)
|
||||
|
||||
require.Panics(t, func() {
|
||||
testdata.RegisterMsgServer(
|
||||
@@ -55,10 +60,14 @@ func TestRegisterMsgServiceTwice(t *testing.T) {
|
||||
appBuilder *runtime.AppBuilder
|
||||
registry codectypes.InterfaceRegistry
|
||||
)
|
||||
err := depinject.Inject(makeMinimalConfig(), &appBuilder, ®istry)
|
||||
err := depinject.Inject(
|
||||
depinject.Configs(
|
||||
makeMinimalConfig(),
|
||||
depinject.Supply(log.NewTestLogger(t)),
|
||||
), &appBuilder, ®istry)
|
||||
require.NoError(t, err)
|
||||
db := dbm.NewMemDB()
|
||||
app := appBuilder.Build(log.NewTestLogger(t), db, nil)
|
||||
app := appBuilder.Build(db, nil)
|
||||
testdata.RegisterInterfaces(registry)
|
||||
|
||||
// First time registering service shouldn't panic.
|
||||
@@ -86,9 +95,13 @@ func TestMsgService(t *testing.T) {
|
||||
cdc codec.ProtoCodecMarshaler
|
||||
interfaceRegistry codectypes.InterfaceRegistry
|
||||
)
|
||||
err := depinject.Inject(makeMinimalConfig(), &appBuilder, &cdc, &interfaceRegistry)
|
||||
err := depinject.Inject(
|
||||
depinject.Configs(
|
||||
makeMinimalConfig(),
|
||||
depinject.Supply(log.NewNopLogger()),
|
||||
), &appBuilder, &cdc, &interfaceRegistry)
|
||||
require.NoError(t, err)
|
||||
app := appBuilder.Build(log.NewNopLogger(), dbm.NewMemDB(), nil)
|
||||
app := appBuilder.Build(dbm.NewMemDB(), nil)
|
||||
|
||||
// patch in TxConfig instead of using an output from x/auth/tx
|
||||
txConfig := authtx.NewTxConfig(cdc, authtx.DefaultSignModes)
|
||||
|
||||
Reference in New Issue
Block a user