diff --git a/.changeset/entries/bc776b2301982eaae47a6da9ac287a76dace06b0cb1cab882868d56c021dffdc.yaml b/.changeset/entries/bc776b2301982eaae47a6da9ac287a76dace06b0cb1cab882868d56c021dffdc.yaml new file mode 100644 index 0000000000..abf52d9fbf --- /dev/null +++ b/.changeset/entries/bc776b2301982eaae47a6da9ac287a76dace06b0cb1cab882868d56c021dffdc.yaml @@ -0,0 +1,6 @@ +type: fix +module: other +pull_request: 829 +description: Added missing events and events attributes +backward_compatible: true +date: 2022-04-21T07:31:55.785338327Z diff --git a/x/profiles/keeper/msg_server_app_link.go b/x/profiles/keeper/msg_server_app_link.go index d842b421d6..36b093ab53 100644 --- a/x/profiles/keeper/msg_server_app_link.go +++ b/x/profiles/keeper/msg_server_app_link.go @@ -50,6 +50,7 @@ func (k Keeper) LinkApplication( sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), sdk.NewAttribute(sdk.AttributeKeySender, msg.Sender), ), sdk.NewEvent( @@ -91,6 +92,7 @@ func (k msgServer) UnlinkApplication( sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), sdk.NewAttribute(sdk.AttributeKeySender, msg.Signer), ), sdk.NewEvent( diff --git a/x/profiles/keeper/msg_server_chain_link.go b/x/profiles/keeper/msg_server_chain_link.go index 1b976a2fce..bdb7d288c2 100644 --- a/x/profiles/keeper/msg_server_chain_link.go +++ b/x/profiles/keeper/msg_server_chain_link.go @@ -25,13 +25,21 @@ func (k msgServer) LinkChainAccount(goCtx context.Context, msg *types.MsgLinkCha return nil, err } - ctx.EventManager().EmitEvent(sdk.NewEvent( - types.EventTypeLinkChainAccount, - sdk.NewAttribute(types.AttributeKeyChainLinkSourceAddress, srcAddrData.GetValue()), - sdk.NewAttribute(types.AttributeKeyChainLinkSourceChainName, msg.ChainConfig.Name), - sdk.NewAttribute(types.AttributeKeyChainLinkDestinationAddress, msg.Signer), - sdk.NewAttribute(types.AttributeKeyChainLinkCreationTime, link.CreationTime.Format(time.RFC3339Nano)), - )) + ctx.EventManager().EmitEvents(sdk.Events{ + sdk.NewEvent( + sdk.EventTypeMessage, + sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), + sdk.NewAttribute(sdk.AttributeKeySender, msg.Signer), + ), + sdk.NewEvent( + types.EventTypeLinkChainAccount, + sdk.NewAttribute(types.AttributeKeyChainLinkSourceAddress, srcAddrData.GetValue()), + sdk.NewAttribute(types.AttributeKeyChainLinkSourceChainName, msg.ChainConfig.Name), + sdk.NewAttribute(types.AttributeKeyChainLinkDestinationAddress, msg.Signer), + sdk.NewAttribute(types.AttributeKeyChainLinkCreationTime, link.CreationTime.Format(time.RFC3339Nano)), + ), + }) return &types.MsgLinkChainAccountResponse{}, nil } @@ -48,12 +56,20 @@ func (k msgServer) UnlinkChainAccount(goCtx context.Context, msg *types.MsgUnlin // Delete the link k.DeleteChainLink(ctx, link) - ctx.EventManager().EmitEvent(sdk.NewEvent( - types.EventTypeUnlinkChainAccount, - sdk.NewAttribute(types.AttributeKeyChainLinkSourceAddress, msg.Target), - sdk.NewAttribute(types.AttributeKeyChainLinkSourceChainName, msg.ChainName), - sdk.NewAttribute(types.AttributeKeyChainLinkDestinationAddress, msg.Owner), - )) + ctx.EventManager().EmitEvents(sdk.Events{ + sdk.NewEvent( + sdk.EventTypeMessage, + sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), + sdk.NewAttribute(sdk.AttributeKeySender, msg.Owner), + ), + sdk.NewEvent( + types.EventTypeUnlinkChainAccount, + sdk.NewAttribute(types.AttributeKeyChainLinkSourceAddress, msg.Target), + sdk.NewAttribute(types.AttributeKeyChainLinkSourceChainName, msg.ChainName), + sdk.NewAttribute(types.AttributeKeyChainLinkDestinationAddress, msg.Owner), + ), + }) return &types.MsgUnlinkChainAccountResponse{}, nil } diff --git a/x/profiles/keeper/msg_server_chain_link_test.go b/x/profiles/keeper/msg_server_chain_link_test.go index 5b8205a424..833a1f34c7 100644 --- a/x/profiles/keeper/msg_server_chain_link_test.go +++ b/x/profiles/keeper/msg_server_chain_link_test.go @@ -107,6 +107,12 @@ func (suite *KeeperTestSuite) TestMsgServer_LinkChainAccount() { ), shouldErr: false, expEvents: sdk.Events{ + sdk.NewEvent( + sdk.EventTypeMessage, + sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgLinkChainAccount{})), + sdk.NewAttribute(sdk.AttributeKeySender, destAddr), + ), sdk.NewEvent( types.EventTypeLinkChainAccount, sdk.NewAttribute(types.AttributeKeyChainLinkSourceAddress, srcAddr), @@ -198,6 +204,12 @@ func (suite *KeeperTestSuite) TestMsgServer_UnlinkChainAccount() { ), shouldErr: false, expEvents: sdk.Events{ + sdk.NewEvent( + sdk.EventTypeMessage, + sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgUnlinkChainAccount{})), + sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"), + ), sdk.NewEvent( types.EventTypeUnlinkChainAccount, sdk.NewAttribute(types.AttributeKeyChainLinkSourceAddress, "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns"), diff --git a/x/profiles/keeper/msg_server_dtag_transfers.go b/x/profiles/keeper/msg_server_dtag_transfers.go index 63b5b8f97c..f6b9843e80 100644 --- a/x/profiles/keeper/msg_server_dtag_transfers.go +++ b/x/profiles/keeper/msg_server_dtag_transfers.go @@ -46,6 +46,7 @@ func (k msgServer) RequestDTagTransfer(goCtx context.Context, msg *types.MsgRequ sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), sdk.NewAttribute(sdk.AttributeKeySender, msg.Sender), ), sdk.NewEvent( @@ -74,6 +75,7 @@ func (k msgServer) CancelDTagTransferRequest(goCtx context.Context, msg *types.M sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), sdk.NewAttribute(sdk.AttributeKeySender, msg.Sender), ), sdk.NewEvent( @@ -178,6 +180,7 @@ func (k msgServer) AcceptDTagTransferRequest(goCtx context.Context, msg *types.M sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), sdk.NewAttribute(sdk.AttributeKeySender, msg.Receiver), ), sdk.NewEvent( @@ -207,6 +210,7 @@ func (k msgServer) RefuseDTagTransferRequest(goCtx context.Context, msg *types.M sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), sdk.NewAttribute(sdk.AttributeKeySender, msg.Receiver), ), sdk.NewEvent( diff --git a/x/profiles/keeper/msg_server_dtag_transfers_test.go b/x/profiles/keeper/msg_server_dtag_transfers_test.go index cde8890d1f..3c7d3e40c8 100644 --- a/x/profiles/keeper/msg_server_dtag_transfers_test.go +++ b/x/profiles/keeper/msg_server_dtag_transfers_test.go @@ -80,6 +80,7 @@ func (suite *KeeperTestSuite) TestMsgServer_RequestDTagTransfer() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgRequestDTagTransfer{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"), ), sdk.NewEvent( @@ -148,6 +149,7 @@ func (suite *KeeperTestSuite) TestMsgServer_CancelDTagTransfer() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgCancelDTagTransferRequest{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"), ), sdk.NewEvent( @@ -290,6 +292,7 @@ func (suite *KeeperTestSuite) TestMsgServer_AcceptDTagTransfer() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgAcceptDTagTransferRequest{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns"), ), sdk.NewEvent( @@ -324,6 +327,7 @@ func (suite *KeeperTestSuite) TestMsgServer_AcceptDTagTransfer() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgAcceptDTagTransferRequest{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns"), ), sdk.NewEvent( @@ -360,6 +364,7 @@ func (suite *KeeperTestSuite) TestMsgServer_AcceptDTagTransfer() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgAcceptDTagTransferRequest{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns"), ), sdk.NewEvent( @@ -441,6 +446,7 @@ func (suite *KeeperTestSuite) TestMsgServer_RefuseDTagTransfer() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgRefuseDTagTransferRequest{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns"), ), sdk.NewEvent( diff --git a/x/profiles/keeper/msgs_server_profile.go b/x/profiles/keeper/msgs_server_profile.go index cd02d54140..5b75dd8985 100644 --- a/x/profiles/keeper/msgs_server_profile.go +++ b/x/profiles/keeper/msgs_server_profile.go @@ -70,6 +70,7 @@ func (k msgServer) SaveProfile(goCtx context.Context, msg *types.MsgSaveProfile) sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), sdk.NewAttribute(sdk.AttributeKeySender, msg.Creator), ), sdk.NewEvent( @@ -95,6 +96,7 @@ func (k msgServer) DeleteProfile(goCtx context.Context, msg *types.MsgDeleteProf sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), sdk.NewAttribute(sdk.AttributeKeySender, msg.Creator), ), sdk.NewEvent( diff --git a/x/profiles/keeper/msgs_server_profile_test.go b/x/profiles/keeper/msgs_server_profile_test.go index 6fbdfc89cc..812ccc652a 100644 --- a/x/profiles/keeper/msgs_server_profile_test.go +++ b/x/profiles/keeper/msgs_server_profile_test.go @@ -44,6 +44,7 @@ func (suite *KeeperTestSuite) TestMsgServer_SaveProfile() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgSaveProfile{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos10nsdxxdvy9qka3zv0lzw8z9cnu6kanld8jh773"), ), sdk.NewEvent( @@ -83,6 +84,7 @@ func (suite *KeeperTestSuite) TestMsgServer_SaveProfile() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgSaveProfile{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos10nsdxxdvy9qka3zv0lzw8z9cnu6kanld8jh773"), ), sdk.NewEvent( @@ -128,6 +130,7 @@ func (suite *KeeperTestSuite) TestMsgServer_SaveProfile() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgSaveProfile{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos10nsdxxdvy9qka3zv0lzw8z9cnu6kanld8jh773"), ), sdk.NewEvent( @@ -211,6 +214,7 @@ func (suite *KeeperTestSuite) TestMsgServer_SaveProfile() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgSaveProfile{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns"), ), sdk.NewEvent( @@ -307,6 +311,7 @@ func (suite *KeeperTestSuite) TestMsgServer_DeleteProfile() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgDeleteProfile{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos10nsdxxdvy9qka3zv0lzw8z9cnu6kanld8jh773"), ), sdk.NewEvent( diff --git a/x/profiles/types/events.go b/x/profiles/types/events.go index 598bccf8f7..3c77c25d0b 100644 --- a/x/profiles/types/events.go +++ b/x/profiles/types/events.go @@ -3,20 +3,20 @@ package types // DONTCOVER const ( - EventTypeProfileSaved = "profile_saved" - EventTypeProfileDeleted = "profile_deleted" - EventTypeDTagTransferRequest = "dtag_transfer_request" - EventTypeDTagTransferAccept = "dtag_transfer_accept" - EventTypeDTagTransferRefuse = "dtag_transfer_refuse" - EventTypeDTagTransferCancel = "dtag_transfer_cancel" + EventTypeProfileSaved = "save_profile" + EventTypeProfileDeleted = "delete_profile" + EventTypeDTagTransferRequest = "create_dtag_transfer_request" + EventTypeDTagTransferAccept = "accept_dtag_transfer_request" + EventTypeDTagTransferRefuse = "refuse_dtag_transfer_request" + EventTypeDTagTransferCancel = "cancel_dtag_transfer_request" EventTypeLinkChainAccount = "link_chain_account" EventTypeUnlinkChainAccount = "unlink_chain_account" EventTypeLinkChainAccountPacket = "link_chain_account_packet" - EventTypePacket = "profiles_verification_packet" + EventTypePacket = "receive_profiles_verification_packet" EventTypeTimeout = "timeout" - EventTypesApplicationLinkCreated = "application_link_created" + EventTypesApplicationLinkCreated = "link_application" + EventTypeApplicationLinkDeleted = "unlink_application" EventTypesApplicationLinkSaved = "application_link_saved" - EventTypeApplicationLinkDeleted = "application_link_deleted" AttributeKeyProfileDTag = "profile_dtag" AttributeKeyProfileCreator = "profile_creator" diff --git a/x/relationships/keeper/msg_server.go b/x/relationships/keeper/msg_server.go index 3be3921ceb..faa4c0554c 100644 --- a/x/relationships/keeper/msg_server.go +++ b/x/relationships/keeper/msg_server.go @@ -49,6 +49,7 @@ func (k msgServer) CreateRelationship(goCtx context.Context, msg *types.MsgCreat sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), sdk.NewAttribute(sdk.AttributeKeySender, msg.Signer), ), sdk.NewEvent( @@ -83,10 +84,11 @@ func (k msgServer) DeleteRelationship(goCtx context.Context, msg *types.MsgDelet sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), sdk.NewAttribute(sdk.AttributeKeySender, msg.Signer), ), sdk.NewEvent( - types.EventTypeRelationshipsDeleted, + types.EventTypeRelationshipDeleted, sdk.NewAttribute(types.AttributeRelationshipCreator, msg.Signer), sdk.NewAttribute(types.AttributeRelationshipCounterparty, msg.Counterparty), sdk.NewAttribute(types.AttributeKeySubspace, fmt.Sprintf("%d", msg.SubspaceID)), @@ -117,6 +119,7 @@ func (k msgServer) BlockUser(goCtx context.Context, msg *types.MsgBlockUser) (*t sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), sdk.NewAttribute(sdk.AttributeKeySender, msg.Blocker), ), sdk.NewEvent( @@ -151,6 +154,7 @@ func (k msgServer) UnblockUser(goCtx context.Context, msg *types.MsgUnblockUser) sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), sdk.NewAttribute(sdk.AttributeKeySender, msg.Blocker), ), sdk.NewEvent( diff --git a/x/relationships/keeper/msg_server_test.go b/x/relationships/keeper/msg_server_test.go index 66aa88d25b..300b969d17 100644 --- a/x/relationships/keeper/msg_server_test.go +++ b/x/relationships/keeper/msg_server_test.go @@ -94,6 +94,7 @@ func (suite *KeeperTestSuite) TestMsgServer_CreateRelationship() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgCreateRelationship{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"), ), sdk.NewEvent( @@ -205,10 +206,11 @@ func (suite *KeeperTestSuite) TestMsgServer_DeleteRelationship() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgDeleteRelationship{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"), ), sdk.NewEvent( - types.EventTypeRelationshipsDeleted, + types.EventTypeRelationshipDeleted, sdk.NewAttribute(types.AttributeRelationshipCreator, "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"), sdk.NewAttribute(types.AttributeRelationshipCounterparty, "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns"), sdk.NewAttribute(types.AttributeKeySubspace, "1"), @@ -319,6 +321,7 @@ func (suite *KeeperTestSuite) TestMsgServer_BlockUser() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgBlockUser{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"), ), sdk.NewEvent( @@ -431,6 +434,7 @@ func (suite *KeeperTestSuite) TestMsgServer_UnblockUser() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgUnblockUser{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"), ), sdk.NewEvent( diff --git a/x/relationships/types/events.go b/x/relationships/types/events.go index d697196e64..96dc088901 100644 --- a/x/relationships/types/events.go +++ b/x/relationships/types/events.go @@ -3,10 +3,10 @@ package types // DONTCOVER const ( - EventTypeRelationshipCreated = "relationship_created" - EventTypeRelationshipsDeleted = "relationships_deleted" - EventTypeBlockUser = "block_user" - EventTypeUnblockUser = "unblock_user" + EventTypeRelationshipCreated = "create_relationship" + EventTypeRelationshipDeleted = "delete_relationship" + EventTypeBlockUser = "block_user" + EventTypeUnblockUser = "unblock_user" AttributeValueCategory = ModuleName AttributeRelationshipCreator = "creator" diff --git a/x/subspaces/keeper/msg_server.go b/x/subspaces/keeper/msg_server.go index f22224dc9f..6b88584a2a 100644 --- a/x/subspaces/keeper/msg_server.go +++ b/x/subspaces/keeper/msg_server.go @@ -49,6 +49,7 @@ func (k msgServer) CreateSubspace(goCtx context.Context, msg *types.MsgCreateSub sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), sdk.NewAttribute(sdk.AttributeKeySender, subspace.Creator), ), sdk.NewEvent( @@ -99,6 +100,7 @@ func (k msgServer) EditSubspace(goCtx context.Context, msg *types.MsgEditSubspac sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), sdk.NewAttribute(sdk.AttributeKeySender, msg.Signer), ), sdk.NewEvent( @@ -136,6 +138,7 @@ func (k msgServer) DeleteSubspace(goCtx context.Context, msg *types.MsgDeleteSub sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), sdk.NewAttribute(sdk.AttributeKeySender, msg.Signer), ), sdk.NewEvent( @@ -196,6 +199,7 @@ func (k msgServer) CreateUserGroup(goCtx context.Context, msg *types.MsgCreateUs sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), sdk.NewAttribute(sdk.AttributeKeySender, msg.Creator), ), sdk.NewEvent( @@ -247,6 +251,7 @@ func (k msgServer) EditUserGroup(goCtx context.Context, msg *types.MsgEditUserGr sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), sdk.NewAttribute(sdk.AttributeKeySender, msg.Signer), ), sdk.NewEvent( @@ -303,6 +308,7 @@ func (k msgServer) SetUserGroupPermissions(goCtx context.Context, msg *types.Msg sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), sdk.NewAttribute(sdk.AttributeKeySender, signer.String()), ), sdk.NewEvent( @@ -346,6 +352,7 @@ func (k msgServer) DeleteUserGroup(goCtx context.Context, msg *types.MsgDeleteUs sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), sdk.NewAttribute(sdk.AttributeKeySender, msg.Signer), ), sdk.NewEvent( @@ -402,6 +409,7 @@ func (k msgServer) AddUserToUserGroup(goCtx context.Context, msg *types.MsgAddUs sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), sdk.NewAttribute(sdk.AttributeKeySender, msg.Signer), ), sdk.NewEvent( @@ -456,6 +464,7 @@ func (k msgServer) RemoveUserFromUserGroup(goCtx context.Context, msg *types.Msg sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), sdk.NewAttribute(sdk.AttributeKeySender, msg.Signer), ), sdk.NewEvent( @@ -510,6 +519,7 @@ func (k msgServer) SetUserPermissions(goCtx context.Context, msg *types.MsgSetUs sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(msg)), sdk.NewAttribute(sdk.AttributeKeySender, signer.String()), ), sdk.NewEvent( diff --git a/x/subspaces/keeper/msg_server_test.go b/x/subspaces/keeper/msg_server_test.go index 68096b6633..212b04a351 100644 --- a/x/subspaces/keeper/msg_server_test.go +++ b/x/subspaces/keeper/msg_server_test.go @@ -65,6 +65,7 @@ func (suite *KeeperTestsuite) TestMsgServer_CreateSubspace() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgCreateSubspace{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69"), ), sdk.NewEvent( @@ -119,6 +120,7 @@ func (suite *KeeperTestsuite) TestMsgServer_CreateSubspace() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgCreateSubspace{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos18atyyv6zycryhvnhpr2mjxgusdcah6kdpkffq0"), ), sdk.NewEvent( @@ -179,6 +181,7 @@ func (suite *KeeperTestsuite) TestMsgServer_CreateSubspace() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgCreateSubspace{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1y4emx0mm4ncva9mnv9yvjrm7nrq3psvmwhk9ll"), ), sdk.NewEvent( @@ -371,6 +374,7 @@ func (suite *KeeperTestsuite) TestMsgServer_EditSubspace() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgEditSubspace{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), ), sdk.NewEvent( @@ -492,6 +496,7 @@ func (suite *KeeperTestsuite) TestMsgServer_DeleteSubspace() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgDeleteSubspace{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), ), sdk.NewEvent( @@ -675,6 +680,7 @@ func (suite *KeeperTestsuite) TestMsgServer_CreateUserGroup() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgCreateUserGroup{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53"), ), sdk.NewEvent( @@ -857,6 +863,7 @@ func (suite *KeeperTestsuite) TestMsgServer_EditUserGroup() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgEditUserGroup{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53"), ), sdk.NewEvent( @@ -1077,6 +1084,7 @@ func (suite *KeeperTestsuite) TestMsgServer_SetUserGroupPermissions() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgSetUserGroupPermissions{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), ), sdk.NewEvent( @@ -1127,6 +1135,7 @@ func (suite *KeeperTestsuite) TestMsgServer_SetUserGroupPermissions() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgSetUserGroupPermissions{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53"), ), sdk.NewEvent( @@ -1269,6 +1278,7 @@ func (suite *KeeperTestsuite) TestMsgServer_DeleteUserGroup() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgDeleteUserGroup{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53"), ), sdk.NewEvent( @@ -1447,6 +1457,7 @@ func (suite *KeeperTestsuite) TestMsgServer_AddUserToGroup() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgAddUserToUserGroup{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53"), ), sdk.NewEvent( @@ -1629,6 +1640,7 @@ func (suite *KeeperTestsuite) TestMsgServer_RemoveUserFromGroup() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgRemoveUserFromUserGroup{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53"), ), sdk.NewEvent( @@ -1767,6 +1779,7 @@ func (suite *KeeperTestsuite) TestMsgServer_SetUserPermissions() { sdk.NewEvent( sdk.EventTypeMessage, sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeyAction, sdk.MsgTypeURL(&types.MsgSetUserPermissions{})), sdk.NewAttribute(sdk.AttributeKeySender, "cosmos17ua98rre5j9ce7hfude0y5y3rh4gtqkygm8hru"), ), sdk.NewEvent(