uniform ICQ module msg request type names

neutron-org · Nov 14, 2024 · ecdff56 · ecdff56
1 parent 2264e95
commit ecdff56
Show file tree

Hide file tree

Showing 14 changed files with 417 additions and 408 deletions.
diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go
@@ -72,7 +72,7 @@ func isSdkMessageWhitelisted(msg sdk.Msg) bool {
 		*ibcclienttypes.MsgRecoverClient,
 		*ibcclienttypes.MsgIBCSoftwareUpgrade,
 		*tokenfactorytypes.MsgUpdateParams,
-		*interchainqueriestypes.MsgUpdateParamsRequest,
+		*interchainqueriestypes.MsgUpdateParams,
 		*interchaintxstypes.MsgUpdateParams,
 		*feeburnertypes.MsgUpdateParams,
 		*feerefundertypes.MsgUpdateParams,

diff --git a/proto/neutron/interchainqueries/tx.proto b/proto/neutron/interchainqueries/tx.proto
@@ -24,23 +24,23 @@ service Msg {
   //
   // Returns an ID assigned to the registered query. Handle this message response via a reply
   // handler in order to make use of the ID.
-  rpc RegisterInterchainQuery(MsgRegisterInterchainQueryRequest) returns (MsgRegisterInterchainQueryResponse);
+  rpc RegisterInterchainQuery(MsgRegisterInterchainQuery) returns (MsgRegisterInterchainQueryResponse);
   // Submits a result of an Interchain Query execution to the chain. This message handling may
   // include passing of the result to the query's owner smart contract for processing which might
   // be a pretty gas-consumable operation.
-  rpc SubmitQueryResult(MsgSubmitQueryResultRequest) returns (MsgSubmitQueryResultResponse);
+  rpc SubmitQueryResult(MsgSubmitQueryResult) returns (MsgSubmitQueryResultResponse);
   // Removes a given Interchain Query and its results from the module. Can be removed only by the
   // owner of the query during the query's submit timeout, and by anyone after the query has been
   // timed out. The query deposit is returned to the caller on a success call.
-  rpc RemoveInterchainQuery(MsgRemoveInterchainQueryRequest) returns (MsgRemoveInterchainQueryResponse);
+  rpc RemoveInterchainQuery(MsgRemoveInterchainQuery) returns (MsgRemoveInterchainQueryResponse);
   // Updates parameters of a registered Interchain Query. Only callable by the owner of the query.
-  rpc UpdateInterchainQuery(MsgUpdateInterchainQueryRequest) returns (MsgUpdateInterchainQueryResponse);
+  rpc UpdateInterchainQuery(MsgUpdateInterchainQuery) returns (MsgUpdateInterchainQueryResponse);
   // Updates params of the interchainqueries module. Only callable by the module's authority.
-  rpc UpdateParams(MsgUpdateParamsRequest) returns (MsgUpdateParamsResponse);
+  rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse);
 }
 
 // Request type for the Msg/RegisterInterchainQuery RPC method.
-message MsgRegisterInterchainQueryRequest {
+message MsgRegisterInterchainQuery {
   option (cosmos.msg.v1.signer) = "sender";
   // The query type identifier: `kv` or `tx`.
   string query_type = 1;
@@ -70,7 +70,7 @@ message MsgRegisterInterchainQueryResponse {
 }
 
 // Request type for the Msg/SubmitQueryResult RPC method.
-message MsgSubmitQueryResultRequest {
+message MsgSubmitQueryResult {
   option (cosmos.msg.v1.signer) = "sender";
   // The ID of the Interchain Query.
   uint64 query_id = 1;
@@ -152,7 +152,7 @@ message TxValue {
 message MsgSubmitQueryResultResponse {}
 
 // Request type for the Msg/RemoveInterchainQuery RPC method.
-message MsgRemoveInterchainQueryRequest {
+message MsgRemoveInterchainQuery {
   option (cosmos.msg.v1.signer) = "sender";
   // The ID of the query to remove.
   uint64 query_id = 1;
@@ -164,7 +164,7 @@ message MsgRemoveInterchainQueryRequest {
 message MsgRemoveInterchainQueryResponse {}
 
 // Request type for the Msg/UpdateInterchainQuery RPC method.
-message MsgUpdateInterchainQueryRequest {
+message MsgUpdateInterchainQuery {
   option (cosmos.msg.v1.signer) = "sender";
   // The ID of the query to update.
   uint64 query_id = 1;
@@ -187,7 +187,7 @@ message MsgUpdateInterchainQueryRequest {
 message MsgUpdateInterchainQueryResponse {}
 
 // Request type for the Msg/UpdateParams RPC method.
-message MsgUpdateParamsRequest {
+message MsgUpdateParams {
   option (amino.name) = "interchainqueries/MsgUpdateParams";
   option (cosmos.msg.v1.signer) = "authority";
   // The address of the authority of the module.

diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go
@@ -351,7 +351,7 @@ func (m *CustomMessenger) updateInterchainQuery(ctx sdk.Context, contractAddr sd
 }
 
 func (m *CustomMessenger) performUpdateInterchainQuery(ctx sdk.Context, contractAddr sdk.AccAddress, updateQuery *bindings.UpdateInterchainQuery) (*icqtypes.MsgUpdateInterchainQueryResponse, error) {
-	msg := icqtypes.MsgUpdateInterchainQueryRequest{
+	msg := icqtypes.MsgUpdateInterchainQuery{
 		QueryId:               updateQuery.QueryId,
 		NewKeys:               updateQuery.NewKeys,
 		NewUpdatePeriod:       updateQuery.NewUpdatePeriod,
@@ -402,7 +402,7 @@ func (m *CustomMessenger) removeInterchainQuery(ctx sdk.Context, contractAddr sd
 }
 
 func (m *CustomMessenger) performRemoveInterchainQuery(ctx sdk.Context, contractAddr sdk.AccAddress, updateQuery *bindings.RemoveInterchainQuery) (*icqtypes.MsgRemoveInterchainQueryResponse, error) {
-	msg := icqtypes.MsgRemoveInterchainQueryRequest{
+	msg := icqtypes.MsgRemoveInterchainQuery{
 		QueryId: updateQuery.QueryId,
 		Sender:  contractAddr.String(),
 	}
@@ -945,7 +945,7 @@ func (m *CustomMessenger) registerInterchainQuery(ctx sdk.Context, contractAddr
 }
 
 func (m *CustomMessenger) performRegisterInterchainQuery(ctx sdk.Context, contractAddr sdk.AccAddress, reg *bindings.RegisterInterchainQuery) (*icqtypes.MsgRegisterInterchainQueryResponse, error) {
-	msg := icqtypes.MsgRegisterInterchainQueryRequest{
+	msg := icqtypes.MsgRegisterInterchainQuery{
 		Keys:               reg.Keys,
 		TransactionsFilter: reg.TransactionsFilter,
 		QueryType:          reg.QueryType,

diff --git a/x/interchainqueries/client/cli/tx.go b/x/interchainqueries/client/cli/tx.go
@@ -84,7 +84,7 @@ func SubmitQueryResultCmd() *cobra.Command {
 				return fmt.Errorf("failed to read query result file: %w", err)
 			}
 
-			msg := types.MsgSubmitQueryResultRequest{QueryId: queryID, Sender: string(sender)}
+			msg := types.MsgSubmitQueryResult{QueryId: queryID, Sender: string(sender)}
 			if err := json.Unmarshal(result, &msg.Result); err != nil {
 				return fmt.Errorf("failed to unmarshal query result: %w", err)
 			}

diff --git a/x/interchainqueries/keeper/grpc_query_test.go b/x/interchainqueries/keeper/grpc_query_test.go
@@ -478,7 +478,7 @@ func (suite *KeeperTestSuite) TestQueryResult() {
 	contractOwner := wasmKeeper.RandomAccountAddress(suite.T())
 	codeID := suite.StoreTestCode(ctx, contractOwner, reflectContractPath)
 	contractAddress := suite.InstantiateTestContract(ctx, contractOwner, codeID)
-	registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{
+	registerMsg := iqtypes.MsgRegisterInterchainQuery{
 		ConnectionId: suite.Path.EndpointA.ConnectionID,
 		Keys: []*iqtypes.KVKey{
 			{Path: ibchost.StoreKey, Key: clientKey},
@@ -508,7 +508,7 @@ func (suite *KeeperTestSuite) TestQueryResult() {
 	})
 	suite.Require().NoError(err)
 
-	msg := iqtypes.MsgSubmitQueryResultRequest{
+	msg := iqtypes.MsgSubmitQueryResult{
 		QueryId: regQuery1.Id,
 		Sender:  contractAddress.String(),
 		Result: &iqtypes.QueryResult{