chore: remove the message types event of governance process.

Signed-off-by: zemyblue <zemyblue@gmail.com>
Finschia · Aug 18, 2022 · 3dfe8f4 · 3dfe8f4
1 parent 23b9059
commit 3dfe8f4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/x/wasm/keeper/msg_server.go b/x/wasm/keeper/msg_server.go
@@ -210,10 +210,6 @@ func (m msgServer) ClearAdmin(goCtx context.Context, msg *types.MsgClearAdmin) (
 		sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName),
 		sdk.NewAttribute(sdk.AttributeKeySender, msg.Sender),
 	))
-	ctx.EventManager().EmitEvent(sdk.NewEvent(
-		types.EventTypeUpdateAdmin,
-		sdk.NewAttribute(types.AttributeKeyContractAddr, msg.Contract),
-	))
 
 	if err := m.keeper.ClearContractAdmin(ctx, contractAddr, senderAddr); err != nil {
 		return nil, err

diff --git a/x/wasm/keeper/proposal_handler.go b/x/wasm/keeper/proposal_handler.go
@@ -192,7 +192,10 @@ func handleClearAdminProposal(ctx sdk.Context, k types.ContractOpsKeeper, p type
 	if err != nil {
 		return sdkerrors.Wrap(err, "contract")
 	}
-	return k.ClearContractAdmin(ctx, contractAddr, nil)
+	if err := k.ClearContractAdmin(ctx, contractAddr, nil); err != nil {
+		return err
+	}
+	return nil
 }
 
 func handlePinCodesProposal(ctx sdk.Context, k types.ContractOpsKeeper, p types.PinCodesProposal) error {

diff --git a/x/wasm/types/events.go b/x/wasm/types/events.go
@@ -10,8 +10,6 @@ const (
 	EventTypeInstantiate          = "instantiate"
 	EventTypeExecute              = "execute"
 	EventTypeMigrate              = "migrate"
-	EventTypeUpdateAdmin          = "update_admin"
-	EventTypeClearAdmin           = "clear_admin"
 	EventTypeUpdateContractStatus = "update_contract_status"
 	EventTypePinCode              = "pin_code"
 	EventTypeUnpinCode            = "unpin_code"