From e6c0d19c8437562e090debf377f078dac3612d22 Mon Sep 17 00:00:00 2001 From: Lukasz Cwik Date: Tue, 2 Jan 2024 11:39:53 -0800 Subject: [PATCH] Address Taehoon's comments wrt to message types. --- protocol/app/msgs/internal_msgs.go | 8 ++------ protocol/app/msgs/internal_msgs_test.go | 4 ---- protocol/app/msgs/normal_msgs.go | 4 ++++ protocol/app/msgs/normal_msgs_test.go | 4 ++++ protocol/lib/ante/internal_msg.go | 2 -- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/protocol/app/msgs/internal_msgs.go b/protocol/app/msgs/internal_msgs.go index 036e8d52c09..7c733d6e64d 100644 --- a/protocol/app/msgs/internal_msgs.go +++ b/protocol/app/msgs/internal_msgs.go @@ -56,12 +56,8 @@ var ( "/cosmos.crisis.v1beta1.MsgUpdateParamsResponse": nil, // distribution - "/cosmos.distribution.v1beta1.MsgCommunityPoolSpend": &distribution.MsgCommunityPoolSpend{}, - "/cosmos.distribution.v1beta1.MsgCommunityPoolSpendResponse": nil, - "/cosmos.distribution.v1beta1.MsgDepositValidatorRewardsPool": &distribution.MsgDepositValidatorRewardsPool{}, - "/cosmos.distribution.v1beta1.MsgDepositValidatorRewardsPoolResponse": nil, - "/cosmos.distribution.v1beta1.MsgUpdateParams": &distribution.MsgUpdateParams{}, - "/cosmos.distribution.v1beta1.MsgUpdateParamsResponse": nil, + "/cosmos.distribution.v1beta1.MsgUpdateParams": &distribution.MsgUpdateParams{}, + "/cosmos.distribution.v1beta1.MsgUpdateParamsResponse": nil, // gov "/cosmos.gov.v1.MsgExecLegacyContent": &gov.MsgExecLegacyContent{}, diff --git a/protocol/app/msgs/internal_msgs_test.go b/protocol/app/msgs/internal_msgs_test.go index b55603ba26c..f1f0eb38009 100644 --- a/protocol/app/msgs/internal_msgs_test.go +++ b/protocol/app/msgs/internal_msgs_test.go @@ -38,10 +38,6 @@ func TestInternalMsgSamples_Gov_Key(t *testing.T) { "/cosmos.crisis.v1beta1.MsgUpdateParamsResponse", // distribution - "/cosmos.distribution.v1beta1.MsgCommunityPoolSpend", - "/cosmos.distribution.v1beta1.MsgCommunityPoolSpendResponse", - "/cosmos.distribution.v1beta1.MsgDepositValidatorRewardsPool", - "/cosmos.distribution.v1beta1.MsgDepositValidatorRewardsPoolResponse", "/cosmos.distribution.v1beta1.MsgUpdateParams", "/cosmos.distribution.v1beta1.MsgUpdateParamsResponse", diff --git a/protocol/app/msgs/normal_msgs.go b/protocol/app/msgs/normal_msgs.go index 03e5f9ef99e..f3e1c080955 100644 --- a/protocol/app/msgs/normal_msgs.go +++ b/protocol/app/msgs/normal_msgs.go @@ -51,6 +51,10 @@ var ( // distribution "/cosmos.distribution.v1beta1.CommunityPoolSpendProposal": nil, + "/cosmos.distribution.v1beta1.MsgCommunityPoolSpend": &distr.MsgCommunityPoolSpend{}, + "/cosmos.distribution.v1beta1.MsgCommunityPoolSpendResponse": nil, + "/cosmos.distribution.v1beta1.MsgDepositValidatorRewardsPool": &distr.MsgDepositValidatorRewardsPool{}, + "/cosmos.distribution.v1beta1.MsgDepositValidatorRewardsPoolResponse": nil, "/cosmos.distribution.v1beta1.MsgFundCommunityPool": &distr.MsgFundCommunityPool{}, "/cosmos.distribution.v1beta1.MsgFundCommunityPoolResponse": nil, "/cosmos.distribution.v1beta1.MsgSetWithdrawAddress": &distr.MsgSetWithdrawAddress{}, diff --git a/protocol/app/msgs/normal_msgs_test.go b/protocol/app/msgs/normal_msgs_test.go index 0090a599b70..d7561b5b25b 100644 --- a/protocol/app/msgs/normal_msgs_test.go +++ b/protocol/app/msgs/normal_msgs_test.go @@ -40,6 +40,10 @@ func TestNormalMsgs_Key(t *testing.T) { // distribution "/cosmos.distribution.v1beta1.CommunityPoolSpendProposal", + "/cosmos.distribution.v1beta1.MsgCommunityPoolSpend", + "/cosmos.distribution.v1beta1.MsgCommunityPoolSpendResponse", + "/cosmos.distribution.v1beta1.MsgDepositValidatorRewardsPool", + "/cosmos.distribution.v1beta1.MsgDepositValidatorRewardsPoolResponse", "/cosmos.distribution.v1beta1.MsgFundCommunityPool", "/cosmos.distribution.v1beta1.MsgFundCommunityPoolResponse", "/cosmos.distribution.v1beta1.MsgSetWithdrawAddress", diff --git a/protocol/lib/ante/internal_msg.go b/protocol/lib/ante/internal_msg.go index ec0a8336ac3..1300970d6c9 100644 --- a/protocol/lib/ante/internal_msg.go +++ b/protocol/lib/ante/internal_msg.go @@ -47,9 +47,7 @@ func IsInternalMsg(msg sdk.Msg) bool { *crisis.MsgUpdateParams, // distribution - *distribution.MsgCommunityPoolSpend, *distribution.MsgUpdateParams, - *distribution.MsgDepositValidatorRewardsPool, // gov *gov.MsgExecLegacyContent,