diff --git a/simapp/app.go b/simapp/app.go index e2d7c8139d26..cda676f0f129 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -289,7 +289,6 @@ func NewSimApp( accountsKeeper, err := accounts.NewKeeper( appCodec, runtime.NewEnvironment(runtime.NewKVStoreService(keys[accounts.StoreKey]), logger), - runtime.EventService{}, addressCodec, appCodec, app.MsgServiceRouter(), diff --git a/x/accounts/keeper.go b/x/accounts/keeper.go index 89aeca045fa1..58afcd2b47df 100644 --- a/x/accounts/keeper.go +++ b/x/accounts/keeper.go @@ -14,7 +14,6 @@ import ( "cosmossdk.io/collections" "cosmossdk.io/core/address" "cosmossdk.io/core/appmodule" - "cosmossdk.io/core/event" "cosmossdk.io/log" "cosmossdk.io/x/accounts/accountstd" "cosmossdk.io/x/accounts/internal/implementation" @@ -65,7 +64,6 @@ type InterfaceRegistry interface { func NewKeeper( cdc codec.BinaryCodec, env appmodule.Environment, - es event.Service, addressCodec address.Codec, signerProvider SignerProvider, execRouter MsgRouter, @@ -76,7 +74,6 @@ func NewKeeper( sb := collections.NewSchemaBuilder(env.KVStoreService) keeper := Keeper{ environment: env, - eventService: es, logger: env.Logger, addressCodec: addressCodec, msgRouter: execRouter, @@ -106,7 +103,6 @@ func NewKeeper( type Keeper struct { // deps coming from the runtime environment appmodule.Environment - eventService event.Service addressCodec address.Codec msgRouter MsgRouter signerProvider SignerProvider diff --git a/x/accounts/msg_server.go b/x/accounts/msg_server.go index 03abc2d85371..62c0776e1982 100644 --- a/x/accounts/msg_server.go +++ b/x/accounts/msg_server.go @@ -42,7 +42,7 @@ func (m msgServer) Init(ctx context.Context, request *v1.MsgInit) (*v1.MsgInitRe return nil, err } - eventManager := m.k.eventService.EventManager(ctx) + eventManager := m.k.environment.EventService.EventManager(ctx) err = eventManager.EmitKV( "account_creation", event.NewAttribute("address", accAddrString), diff --git a/x/accounts/utils_test.go b/x/accounts/utils_test.go index 09301eab2374..1d9de2458280 100644 --- a/x/accounts/utils_test.go +++ b/x/accounts/utils_test.go @@ -11,7 +11,6 @@ import ( "cosmossdk.io/collections/colltest" "cosmossdk.io/core/address" - "cosmossdk.io/core/event" "cosmossdk.io/log" "cosmossdk.io/x/accounts/internal/implementation" @@ -25,20 +24,6 @@ type addressCodec struct{} func (a addressCodec) StringToBytes(text string) ([]byte, error) { return []byte(text), nil } func (a addressCodec) BytesToString(bz []byte) (string, error) { return string(bz), nil } -type eventService struct{} - -func (e eventService) Emit(event protoiface.MessageV1) error { return nil } - -func (e eventService) EmitKV(eventType string, attrs ...event.Attribute) error { - return nil -} - -func (e eventService) EmitNonConsensus(event protoiface.MessageV1) error { - return nil -} - -func (e eventService) EventManager(ctx context.Context) event.Manager { return e } - var _ InterfaceRegistry = (*interfaceRegistry)(nil) type interfaceRegistry struct{} @@ -51,7 +36,7 @@ func newKeeper(t *testing.T, accounts ...implementation.AccountCreatorFunc) (Kee t.Helper() ss, ctx := colltest.MockStore() env := runtime.NewEnvironment(ss, log.NewNopLogger()) - m, err := NewKeeper(nil, env, eventService{}, addressCodec{}, nil, nil, nil, interfaceRegistry{}, accounts...) + m, err := NewKeeper(nil, env, addressCodec{}, nil, nil, nil, interfaceRegistry{}, accounts...) require.NoError(t, err) return m, ctx }