From 165e34715050a6e1211cf7a8201504312ea6695d Mon Sep 17 00:00:00 2001 From: Alex Peters Date: Wed, 15 Jul 2020 10:17:34 +0200 Subject: [PATCH] Cleanup event attribute keys --- x/wasm/handler.go | 33 +++++++++------------- x/wasm/internal/keeper/proposal_handler.go | 24 ++++------------ x/wasm/internal/types/keys.go | 6 ++++ 3 files changed, 26 insertions(+), 37 deletions(-) diff --git a/x/wasm/handler.go b/x/wasm/handler.go index 220184b28d6..9af9624f965 100644 --- a/x/wasm/handler.go +++ b/x/wasm/handler.go @@ -3,16 +3,11 @@ package wasm import ( "fmt" + "github.com/CosmWasm/wasmd/x/wasm/internal/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) -const ( - AttributeKeyContract = "contract_address" - AttributeKeyCodeID = "code_id" - AttributeSigner = "signer" -) - // NewHandler returns a handler for "bank" type messages. func NewHandler(k Keeper) sdk.Handler { return func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) { @@ -84,8 +79,8 @@ func handleStoreCode(ctx sdk.Context, k Keeper, msg *MsgStoreCode) (*sdk.Result, ourEvent := sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, ModuleName), - sdk.NewAttribute(AttributeSigner, msg.Sender.String()), - sdk.NewAttribute(AttributeKeyCodeID, fmt.Sprintf("%d", codeID)), + sdk.NewAttribute(types.AttributeKeySigner, msg.Sender.String()), + sdk.NewAttribute(types.AttributeKeyCodeID, fmt.Sprintf("%d", codeID)), ) return &sdk.Result{ @@ -104,9 +99,9 @@ func handleInstantiate(ctx sdk.Context, k Keeper, msg *MsgInstantiateContract) ( ourEvent := sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, ModuleName), - sdk.NewAttribute(AttributeSigner, msg.Sender.String()), - sdk.NewAttribute(AttributeKeyCodeID, fmt.Sprintf("%d", msg.Code)), - sdk.NewAttribute(AttributeKeyContract, contractAddr.String()), + sdk.NewAttribute(types.AttributeKeySigner, msg.Sender.String()), + sdk.NewAttribute(types.AttributeKeyCodeID, fmt.Sprintf("%d", msg.Code)), + sdk.NewAttribute(types.AttributeKeyContract, contractAddr.String()), ) return &sdk.Result{ @@ -125,8 +120,8 @@ func handleExecute(ctx sdk.Context, k Keeper, msg *MsgExecuteContract) (*sdk.Res ourEvent := sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, ModuleName), - sdk.NewAttribute(AttributeSigner, msg.Sender.String()), - sdk.NewAttribute(AttributeKeyContract, msg.Contract.String()), + sdk.NewAttribute(types.AttributeKeySigner, msg.Sender.String()), + sdk.NewAttribute(types.AttributeKeyContract, msg.Contract.String()), ) res.Events = append(events, ourEvent) @@ -143,8 +138,8 @@ func handleMigration(ctx sdk.Context, k Keeper, msg *MsgMigrateContract) (*sdk.R ourEvent := sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, ModuleName), - sdk.NewAttribute(AttributeSigner, msg.Sender.String()), - sdk.NewAttribute(AttributeKeyContract, msg.Contract.String()), + sdk.NewAttribute(types.AttributeKeySigner, msg.Sender.String()), + sdk.NewAttribute(types.AttributeKeyContract, msg.Contract.String()), ) res.Events = append(events, ourEvent) return res, nil @@ -158,8 +153,8 @@ func handleUpdateContractAdmin(ctx sdk.Context, k Keeper, msg *MsgUpdateAdmin) ( ourEvent := sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, ModuleName), - sdk.NewAttribute(AttributeSigner, msg.Sender.String()), - sdk.NewAttribute(AttributeKeyContract, msg.Contract.String()), + sdk.NewAttribute(types.AttributeKeySigner, msg.Sender.String()), + sdk.NewAttribute(types.AttributeKeyContract, msg.Contract.String()), ) return &sdk.Result{ Events: append(events, ourEvent), @@ -174,8 +169,8 @@ func handleClearContractAdmin(ctx sdk.Context, k Keeper, msg *MsgClearAdmin) (*s ourEvent := sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, ModuleName), - sdk.NewAttribute(AttributeSigner, msg.Sender.String()), - sdk.NewAttribute(AttributeKeyContract, msg.Contract.String()), + sdk.NewAttribute(types.AttributeKeySigner, msg.Sender.String()), + sdk.NewAttribute(types.AttributeKeyContract, msg.Contract.String()), ) return &sdk.Result{ Events: append(events, ourEvent), diff --git a/x/wasm/internal/keeper/proposal_handler.go b/x/wasm/internal/keeper/proposal_handler.go index 83991a2f01c..b64742c650d 100644 --- a/x/wasm/internal/keeper/proposal_handler.go +++ b/x/wasm/internal/keeper/proposal_handler.go @@ -9,13 +9,6 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" ) -const ( // TODO: same as in handler - - AttributeKeyContract = "contract_address" - AttributeKeyCodeID = "code_id" - AttributeSigner = "signer" -) - // NewWasmProposalHandler creates a new governance Handler for wasm proposals func NewWasmProposalHandler(k Keeper, enabledTypes map[string]struct{}) govtypes.Handler { return func(ctx sdk.Context, content govtypes.Content) error { @@ -55,8 +48,7 @@ func handleStoreCodeProposal(ctx sdk.Context, k Keeper, p types.StoreCodeProposa ourEvent := sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName), - //sdk.NewAttribute(AttributeSigner, p.RunAs.String()), // todo: creator is not signer. rename attribute? - sdk.NewAttribute(AttributeKeyCodeID, fmt.Sprintf("%d", codeID)), + sdk.NewAttribute(types.AttributeKeyCodeID, fmt.Sprintf("%d", codeID)), ) ctx.EventManager().EmitEvent(ourEvent) return nil @@ -75,9 +67,8 @@ func handleInstantiateProposal(ctx sdk.Context, k Keeper, p types.InstantiateCon ourEvent := sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName), - //sdk.NewAttribute(AttributeSigner, p.RunAs.String()), - sdk.NewAttribute(AttributeKeyCodeID, fmt.Sprintf("%d", p.Code)), - sdk.NewAttribute(AttributeKeyContract, contractAddr.String()), + sdk.NewAttribute(types.AttributeKeyCodeID, fmt.Sprintf("%d", p.Code)), + sdk.NewAttribute(types.AttributeKeyContract, contractAddr.String()), ) ctx.EventManager().EmitEvent(ourEvent) return nil @@ -96,8 +87,7 @@ func handleMigrateProposal(ctx sdk.Context, k Keeper, p types.MigrateContractPro ourEvent := sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName), - //sdk.NewAttribute(AttributeSigner, p.RunAs.String()), - sdk.NewAttribute(AttributeKeyContract, p.Contract.String()), + sdk.NewAttribute(types.AttributeKeyContract, p.Contract.String()), ) ctx.EventManager().EmitEvents(append(res.Events, ourEvent)) return nil @@ -115,8 +105,7 @@ func handleUpdateAdminProposal(ctx sdk.Context, k Keeper, p types.UpdateAdminPro ourEvent := sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName), - //sdk.NewAttribute(AttributeSigner, p.RunAs.String()), - sdk.NewAttribute(AttributeKeyContract, p.Contract.String()), + sdk.NewAttribute(types.AttributeKeyContract, p.Contract.String()), ) ctx.EventManager().EmitEvent(ourEvent) return nil @@ -133,8 +122,7 @@ func handleClearAdminProposal(ctx sdk.Context, k Keeper, p types.ClearAdminPropo ourEvent := sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName), - //sdk.NewAttribute(AttributeSigner, p.RunAs.String()), - sdk.NewAttribute(AttributeKeyContract, p.Contract.String()), + sdk.NewAttribute(types.AttributeKeyContract, p.Contract.String()), ) ctx.EventManager().EmitEvent(ourEvent) return nil diff --git a/x/wasm/internal/types/keys.go b/x/wasm/internal/types/keys.go index 68a175eaa34..52b3265924b 100644 --- a/x/wasm/internal/types/keys.go +++ b/x/wasm/internal/types/keys.go @@ -23,6 +23,12 @@ const ( RouterKey = ModuleName ) +const ( // event attributes + AttributeKeyContract = "contract_address" + AttributeKeyCodeID = "code_id" + AttributeKeySigner = "signer" +) + // nolint var ( KeyLastCodeID = []byte("lastCodeId")