Address Taehoon's comments wrt to message types.

dydxprotocol · Jan 2, 2024 · e6c0d19 · e6c0d19
1 parent 6a2c3b3
commit e6c0d19
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -47,9 +47,7 @@ func IsInternalMsg(msg sdk.Msg) bool {
 		*crisis.MsgUpdateParams,
 
 		// distribution
-		*distribution.MsgCommunityPoolSpend,
 		*distribution.MsgUpdateParams,
-		*distribution.MsgDepositValidatorRewardsPool,
 
 		// gov
 		*gov.MsgExecLegacyContent,