Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: improve events emissions #1295

Merged
merged 14 commits into from
Feb 7, 2024
Merged
9 changes: 9 additions & 0 deletions types/utils/slices.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package utils

func Map[T, U any](ts []T, f func(T) U) []U {
us := make([]U, len(ts))
for i := range ts {
us[i] = f(ts[i])
}
return us
}
6 changes: 4 additions & 2 deletions x/posts/abci.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ package posts
import (
"fmt"

subspacestypes "github.com/desmos-labs/desmos/v6/x/subspaces/types"

sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/desmos-labs/desmos/v6/x/posts/keeper"
Expand All @@ -18,8 +20,8 @@ func EndBlocker(ctx sdk.Context, keeper *keeper.Keeper) {
// Emit an event
ctx.EventManager().EmitEvent(
sdk.NewEvent(
types.EventTypeTallyPoll,
sdk.NewAttribute(types.AttributeKeySubspaceID, fmt.Sprintf("%d", poll.SubspaceID)),
types.EventTypeTalliedPoll,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, fmt.Sprintf("%d", poll.SubspaceID)),
sdk.NewAttribute(types.AttributeKeyPostID, fmt.Sprintf("%d", poll.PostID)),
sdk.NewAttribute(types.AttributeKeyPollID, fmt.Sprintf("%d", poll.ID)),
),
Expand Down
53 changes: 30 additions & 23 deletions x/posts/keeper/msg_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ import (
"context"
"fmt"
"sort"
"strings"
"time"

"github.com/desmos-labs/desmos/v6/types/utils"

"cosmossdk.io/errors"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
Expand Down Expand Up @@ -103,9 +106,9 @@ func (k msgServer) CreatePost(goCtx context.Context, msg *types.MsgCreatePost) (

ctx.EventManager().EmitEvents(sdk.Events{
sdk.NewEvent(
types.EventTypeCreatePost,
sdk.NewAttribute(types.AttributeKeySubspaceID, fmt.Sprintf("%d", msg.SubspaceID)),
sdk.NewAttribute(types.AttributeKeySectionID, fmt.Sprintf("%d", msg.SectionID)),
types.EventTypeCreatedPost,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, fmt.Sprintf("%d", msg.SubspaceID)),
sdk.NewAttribute(subspacestypes.AttributeKeySectionID, fmt.Sprintf("%d", msg.SectionID)),
sdk.NewAttribute(types.AttributeKeyPostID, fmt.Sprintf("%d", post.ID)),
sdk.NewAttribute(types.AttributeKeyAuthor, msg.Author),
sdk.NewAttribute(types.AttributeKeyCreationTime, post.CreationDate.Format(time.RFC3339)),
Expand Down Expand Up @@ -157,8 +160,8 @@ func (k msgServer) EditPost(goCtx context.Context, msg *types.MsgEditPost) (*typ

ctx.EventManager().EmitEvents(sdk.Events{
sdk.NewEvent(
types.EventTypeEditPost,
sdk.NewAttribute(types.AttributeKeySubspaceID, fmt.Sprintf("%d", msg.SubspaceID)),
types.EventTypeEditedPost,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, fmt.Sprintf("%d", msg.SubspaceID)),
sdk.NewAttribute(types.AttributeKeyPostID, fmt.Sprintf("%d", msg.PostID)),
sdk.NewAttribute(types.AttributeKeyLastEditTime, updateTime.Format(time.RFC3339)),
),
Expand Down Expand Up @@ -196,8 +199,8 @@ func (k msgServer) DeletePost(goCtx context.Context, msg *types.MsgDeletePost) (

ctx.EventManager().EmitEvents(sdk.Events{
sdk.NewEvent(
types.EventTypeDeletePost,
sdk.NewAttribute(types.AttributeKeySubspaceID, fmt.Sprintf("%d", msg.SubspaceID)),
types.EventTypeDeletedPost,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, fmt.Sprintf("%d", msg.SubspaceID)),
sdk.NewAttribute(types.AttributeKeyPostID, fmt.Sprintf("%d", msg.PostID)),
),
})
Expand Down Expand Up @@ -296,8 +299,8 @@ func (k msgServer) AddPostAttachment(goCtx context.Context, msg *types.MsgAddPos

ctx.EventManager().EmitEvents(sdk.Events{
sdk.NewEvent(
types.EventTypeAddPostAttachment,
sdk.NewAttribute(types.AttributeKeySubspaceID, fmt.Sprintf("%d", msg.SubspaceID)),
types.EventTypeAddedPostAttachment,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, fmt.Sprintf("%d", msg.SubspaceID)),
sdk.NewAttribute(types.AttributeKeyPostID, fmt.Sprintf("%d", msg.PostID)),
sdk.NewAttribute(types.AttributeKeyAttachmentID, fmt.Sprintf("%d", attachmentID)),
sdk.NewAttribute(types.AttributeKeyLastEditTime, post.LastEditedDate.Format(time.RFC3339)),
Expand Down Expand Up @@ -353,8 +356,8 @@ func (k msgServer) RemovePostAttachment(goCtx context.Context, msg *types.MsgRem

ctx.EventManager().EmitEvents(sdk.Events{
sdk.NewEvent(
types.EventTypeRemovePostAttachment,
sdk.NewAttribute(types.AttributeKeySubspaceID, fmt.Sprintf("%d", msg.SubspaceID)),
types.EventTypeRemovedPostAttachment,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, fmt.Sprintf("%d", msg.SubspaceID)),
sdk.NewAttribute(types.AttributeKeyPostID, fmt.Sprintf("%d", msg.PostID)),
sdk.NewAttribute(types.AttributeKeyAttachmentID, fmt.Sprintf("%d", msg.AttachmentID)),
sdk.NewAttribute(types.AttributeKeyLastEditTime, post.LastEditedDate.Format(time.RFC3339)),
Expand Down Expand Up @@ -432,10 +435,14 @@ func (k msgServer) AnswerPoll(goCtx context.Context, msg *types.MsgAnswerPoll) (

ctx.EventManager().EmitEvents(sdk.Events{
sdk.NewEvent(
types.EventTypeAnswerPoll,
sdk.NewAttribute(types.AttributeKeySubspaceID, fmt.Sprintf("%d", msg.SubspaceID)),
types.EventTypeAnsweredPoll,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, fmt.Sprintf("%d", msg.SubspaceID)),
sdk.NewAttribute(types.AttributeKeyPostID, fmt.Sprintf("%d", msg.PostID)),
sdk.NewAttribute(types.AttributeKeyPollID, fmt.Sprintf("%d", msg.PollID)),
sdk.NewAttribute(types.AttributeKeyAnswersIndexes, strings.Join(utils.Map(msg.AnswersIndexes, func(index uint32) string {
return fmt.Sprintf("%d", index)
}), ",")),
sdk.NewAttribute(types.AttributeKeyAnswerer, msg.Signer),
),
})

Expand Down Expand Up @@ -530,8 +537,8 @@ func (k msgServer) MovePost(goCtx context.Context, msg *types.MsgMovePost) (*typ

ctx.EventManager().EmitEvents(sdk.Events{
sdk.NewEvent(
types.EventTypeMovePost,
sdk.NewAttribute(types.AttributeKeySubspaceID, fmt.Sprintf("%d", msg.SubspaceID)),
types.EventTypeMovedPost,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, fmt.Sprintf("%d", msg.SubspaceID)),
sdk.NewAttribute(types.AttributeKeyPostID, fmt.Sprintf("%d", msg.PostID)),
sdk.NewAttribute(types.AttributeKeyNewSubspaceID, fmt.Sprintf("%d", msg.TargetSubspaceID)),
sdk.NewAttribute(types.AttributeKeyNewPostID, fmt.Sprintf("%d", updatedPost.ID)),
Expand Down Expand Up @@ -586,8 +593,8 @@ func (k msgServer) RequestPostOwnerTransfer(goCtx context.Context, msg *types.Ms

ctx.EventManager().EmitEvents(sdk.Events{
sdk.NewEvent(
types.EventTypeRequestPostOwnerTransfer,
sdk.NewAttribute(types.AttributeKeySubspaceID, fmt.Sprintf("%d", msg.SubspaceID)),
types.EventTypeRequestedPostOwnerTransfer,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, fmt.Sprintf("%d", msg.SubspaceID)),
sdk.NewAttribute(types.AttributeKeyPostID, fmt.Sprintf("%d", msg.PostID)),
sdk.NewAttribute(types.AttributeKeyReceiver, msg.Receiver),
sdk.NewAttribute(types.AttributeKeySender, msg.Sender),
Expand Down Expand Up @@ -617,8 +624,8 @@ func (k msgServer) CancelPostOwnerTransferRequest(goCtx context.Context, msg *ty

ctx.EventManager().EmitEvents(sdk.Events{
sdk.NewEvent(
types.EventTypeCancelPostOwnerTransfer,
sdk.NewAttribute(types.AttributeKeySubspaceID, fmt.Sprintf("%d", msg.SubspaceID)),
types.EventTypeCanceledPostOwnerTransfer,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, fmt.Sprintf("%d", msg.SubspaceID)),
sdk.NewAttribute(types.AttributeKeyPostID, fmt.Sprintf("%d", msg.PostID)),
sdk.NewAttribute(types.AttributeKeySender, msg.Sender),
),
Expand Down Expand Up @@ -673,8 +680,8 @@ func (k msgServer) AcceptPostOwnerTransferRequest(goCtx context.Context, msg *ty

ctx.EventManager().EmitEvents(sdk.Events{
sdk.NewEvent(
types.EventTypeAcceptPostOwnerTransfer,
sdk.NewAttribute(types.AttributeKeySubspaceID, fmt.Sprintf("%d", msg.SubspaceID)),
types.EventTypeAcceptedPostOwnerTransfer,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, fmt.Sprintf("%d", msg.SubspaceID)),
sdk.NewAttribute(types.AttributeKeyPostID, fmt.Sprintf("%d", msg.PostID)),
sdk.NewAttribute(types.AttributeKeyReceiver, msg.Receiver),
),
Expand Down Expand Up @@ -703,8 +710,8 @@ func (k msgServer) RefusePostOwnerTransferRequest(goCtx context.Context, msg *ty

ctx.EventManager().EmitEvents(sdk.Events{
sdk.NewEvent(
types.EventTypeRefusePostOwnerTransfer,
sdk.NewAttribute(types.AttributeKeySubspaceID, fmt.Sprintf("%d", msg.SubspaceID)),
types.EventTypeRefusedPostOwnerTransfer,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, fmt.Sprintf("%d", msg.SubspaceID)),
sdk.NewAttribute(types.AttributeKeyPostID, fmt.Sprintf("%d", msg.PostID)),
sdk.NewAttribute(types.AttributeKeyReceiver, msg.Receiver),
),
Expand Down
68 changes: 36 additions & 32 deletions x/posts/keeper/msg_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -364,9 +364,9 @@ func (suite *KeeperTestSuite) TestMsgServer_CreatePost() {
},
expEvents: sdk.Events{
sdk.NewEvent(
types.EventTypeCreatePost,
sdk.NewAttribute(types.AttributeKeySubspaceID, "1"),
sdk.NewAttribute(types.AttributeKeySectionID, "0"),
types.EventTypeCreatedPost,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, "1"),
sdk.NewAttribute(subspacestypes.AttributeKeySectionID, "0"),
sdk.NewAttribute(types.AttributeKeyPostID, "1"),
sdk.NewAttribute(types.AttributeKeyAuthor, "cosmos13t6y2nnugtshwuy0zkrq287a95lyy8vzleaxmd"),
sdk.NewAttribute(types.AttributeKeyCreationTime, time.Date(2020, 1, 1, 12, 00, 00, 000, time.UTC).Format(time.RFC3339)),
Expand Down Expand Up @@ -480,9 +480,9 @@ func (suite *KeeperTestSuite) TestMsgServer_CreatePost() {
},
expEvents: sdk.Events{
sdk.NewEvent(
types.EventTypeCreatePost,
sdk.NewAttribute(types.AttributeKeySubspaceID, "1"),
sdk.NewAttribute(types.AttributeKeySectionID, "0"),
types.EventTypeCreatedPost,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, "1"),
sdk.NewAttribute(subspacestypes.AttributeKeySectionID, "0"),
sdk.NewAttribute(types.AttributeKeyPostID, "2"),
sdk.NewAttribute(types.AttributeKeyAuthor, "cosmos13t6y2nnugtshwuy0zkrq287a95lyy8vzleaxmd"),
sdk.NewAttribute(types.AttributeKeyCreationTime, time.Date(2020, 1, 1, 12, 00, 00, 000, time.UTC).Format(time.RFC3339)),
Expand Down Expand Up @@ -767,8 +767,8 @@ func (suite *KeeperTestSuite) TestMsgServer_EditPost() {
},
expEvents: sdk.Events{
sdk.NewEvent(
types.EventTypeEditPost,
sdk.NewAttribute(types.AttributeKeySubspaceID, "1"),
types.EventTypeEditedPost,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, "1"),
sdk.NewAttribute(types.AttributeKeyPostID, "1"),
sdk.NewAttribute(types.AttributeKeyLastEditTime, time.Date(2021, 1, 1, 12, 00, 00, 000, time.UTC).Format(time.RFC3339)),
),
Expand Down Expand Up @@ -968,8 +968,8 @@ func (suite *KeeperTestSuite) TestMsgServer_DeletePost() {
shouldErr: false,
expEvents: sdk.Events{
sdk.NewEvent(
types.EventTypeDeletePost,
sdk.NewAttribute(types.AttributeKeySubspaceID, "1"),
types.EventTypeDeletedPost,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, "1"),
sdk.NewAttribute(types.AttributeKeyPostID, "1"),
),
},
Expand Down Expand Up @@ -1019,8 +1019,8 @@ func (suite *KeeperTestSuite) TestMsgServer_DeletePost() {
msg: types.NewMsgDeletePost(1, 1, "cosmos13t6y2nnugtshwuy0zkrq287a95lyy8vzleaxmd"),
expEvents: sdk.Events{
sdk.NewEvent(
types.EventTypeDeletePost,
sdk.NewAttribute(types.AttributeKeySubspaceID, "1"),
types.EventTypeDeletedPost,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, "1"),
sdk.NewAttribute(types.AttributeKeyPostID, "1"),
),
},
Expand Down Expand Up @@ -1260,8 +1260,8 @@ func (suite *KeeperTestSuite) TestMsgServer_AddPostAttachment() {
},
expEvents: sdk.Events{
sdk.NewEvent(
types.EventTypeAddPostAttachment,
sdk.NewAttribute(types.AttributeKeySubspaceID, "1"),
types.EventTypeAddedPostAttachment,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, "1"),
sdk.NewAttribute(types.AttributeKeyPostID, "1"),
sdk.NewAttribute(types.AttributeKeyAttachmentID, "1"),
sdk.NewAttribute(types.AttributeKeyLastEditTime, time.Date(2021, 1, 1, 12, 00, 00, 000, time.UTC).Format(time.RFC3339)),
Expand Down Expand Up @@ -1584,8 +1584,8 @@ func (suite *KeeperTestSuite) TestMsgServer_RemovePostAttachment() {
},
expEvents: sdk.Events{
sdk.NewEvent(
types.EventTypeRemovePostAttachment,
sdk.NewAttribute(types.AttributeKeySubspaceID, "1"),
types.EventTypeRemovedPostAttachment,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, "1"),
sdk.NewAttribute(types.AttributeKeyPostID, "1"),
sdk.NewAttribute(types.AttributeKeyAttachmentID, "1"),
sdk.NewAttribute(types.AttributeKeyLastEditTime, time.Date(2021, 1, 1, 12, 00, 00, 000, time.UTC).Format(time.RFC3339)),
Expand Down Expand Up @@ -1666,8 +1666,8 @@ func (suite *KeeperTestSuite) TestMsgServer_RemovePostAttachment() {
},
expEvents: sdk.Events{
sdk.NewEvent(
types.EventTypeRemovePostAttachment,
sdk.NewAttribute(types.AttributeKeySubspaceID, "1"),
types.EventTypeRemovedPostAttachment,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, "1"),
sdk.NewAttribute(types.AttributeKeyPostID, "1"),
sdk.NewAttribute(types.AttributeKeyAttachmentID, "1"),
sdk.NewAttribute(types.AttributeKeyLastEditTime, time.Date(2021, 1, 1, 12, 00, 00, 000, time.UTC).Format(time.RFC3339)),
Expand Down Expand Up @@ -2188,10 +2188,12 @@ func (suite *KeeperTestSuite) TestMsgServer_AnswerPoll() {
shouldErr: false,
expEvents: sdk.Events{
sdk.NewEvent(
types.EventTypeAnswerPoll,
sdk.NewAttribute(types.AttributeKeySubspaceID, "1"),
types.EventTypeAnsweredPoll,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, "1"),
sdk.NewAttribute(types.AttributeKeyPostID, "1"),
sdk.NewAttribute(types.AttributeKeyPollID, "1"),
sdk.NewAttribute(types.AttributeKeyAnswersIndexes, "0"),
sdk.NewAttribute(types.AttributeKeyAnswerer, "cosmos13t6y2nnugtshwuy0zkrq287a95lyy8vzleaxmd"),
),
},
check: func(ctx sdk.Context) {
Expand Down Expand Up @@ -2269,10 +2271,12 @@ func (suite *KeeperTestSuite) TestMsgServer_AnswerPoll() {
shouldErr: false,
expEvents: sdk.Events{
sdk.NewEvent(
types.EventTypeAnswerPoll,
sdk.NewAttribute(types.AttributeKeySubspaceID, "1"),
types.EventTypeAnsweredPoll,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, "1"),
sdk.NewAttribute(types.AttributeKeyPostID, "1"),
sdk.NewAttribute(types.AttributeKeyPollID, "1"),
sdk.NewAttribute(types.AttributeKeyAnswersIndexes, "0,1"),
sdk.NewAttribute(types.AttributeKeyAnswerer, "cosmos13t6y2nnugtshwuy0zkrq287a95lyy8vzleaxmd"),
),
},
check: func(ctx sdk.Context) {
Expand Down Expand Up @@ -2766,8 +2770,8 @@ func (suite *KeeperTestSuite) TestMsgServer_MovePost() {
shouldErr: false,
expEvents: sdk.Events{
sdk.NewEvent(
types.EventTypeMovePost,
sdk.NewAttribute(types.AttributeKeySubspaceID, "1"),
types.EventTypeMovedPost,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, "1"),
sdk.NewAttribute(types.AttributeKeyPostID, "1"),
sdk.NewAttribute(types.AttributeKeyNewSubspaceID, "2"),
sdk.NewAttribute(types.AttributeKeyNewPostID, "2"),
Expand Down Expand Up @@ -3155,8 +3159,8 @@ func (suite *KeeperTestSuite) TestMsgServer_RequestPostOwnerTransfer() {
expResponse: &types.MsgRequestPostOwnerTransferResponse{},
expEvents: sdk.Events{
sdk.NewEvent(
types.EventTypeRequestPostOwnerTransfer,
sdk.NewAttribute(types.AttributeKeySubspaceID, "1"),
types.EventTypeRequestedPostOwnerTransfer,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, "1"),
sdk.NewAttribute(types.AttributeKeyPostID, "1"),
sdk.NewAttribute(types.AttributeKeyReceiver, "cosmos13t6y2nnugtshwuy0zkrq287a95lyy8vzleaxmd"),
sdk.NewAttribute(types.AttributeKeySender, "cosmos1eqpa6mv2jgevukaqtjmx5535vhc3mm3cf458zg"),
Expand Down Expand Up @@ -3264,8 +3268,8 @@ func (suite *KeeperTestSuite) TestMsgServer_CancelPostOwnerTransfer() {
expResponse: &types.MsgCancelPostOwnerTransferRequestResponse{},
expEvents: sdk.Events{
sdk.NewEvent(
types.EventTypeCancelPostOwnerTransfer,
sdk.NewAttribute(types.AttributeKeySubspaceID, "1"),
types.EventTypeCanceledPostOwnerTransfer,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, "1"),
sdk.NewAttribute(types.AttributeKeyPostID, "1"),
sdk.NewAttribute(types.AttributeKeySender, "cosmos1eqpa6mv2jgevukaqtjmx5535vhc3mm3cf458zg"),
),
Expand Down Expand Up @@ -3504,8 +3508,8 @@ func (suite *KeeperTestSuite) TestMsgServer_AcceptPostOwnerTransfer() {
expResponse: &types.MsgAcceptPostOwnerTransferRequestResponse{},
expEvents: sdk.Events{
sdk.NewEvent(
types.EventTypeAcceptPostOwnerTransfer,
sdk.NewAttribute(types.AttributeKeySubspaceID, "1"),
types.EventTypeAcceptedPostOwnerTransfer,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, "1"),
sdk.NewAttribute(types.AttributeKeyPostID, "1"),
sdk.NewAttribute(types.AttributeKeyReceiver, "cosmos13t6y2nnugtshwuy0zkrq287a95lyy8vzleaxmd"),
),
Expand Down Expand Up @@ -3599,8 +3603,8 @@ func (suite *KeeperTestSuite) TestMsgServer_RefusePostOwnerTransfer() {
expResponse: &types.MsgRefusePostOwnerTransferRequestResponse{},
expEvents: sdk.Events{
sdk.NewEvent(
types.EventTypeRefusePostOwnerTransfer,
sdk.NewAttribute(types.AttributeKeySubspaceID, "1"),
types.EventTypeRefusedPostOwnerTransfer,
sdk.NewAttribute(subspacestypes.AttributeKeySubspaceID, "1"),
sdk.NewAttribute(types.AttributeKeyPostID, "1"),
sdk.NewAttribute(types.AttributeKeyReceiver, "cosmos13t6y2nnugtshwuy0zkrq287a95lyy8vzleaxmd"),
),
Expand Down
Loading
Loading