Rename Order to Ordering for MsgRegisterInterchainAccount. (#5674)

* nit: Rename Order to Ordering for MsgRegisterInterchainAccount. To align with name used in channel proto types w.r.t order. * update docs --------- Co-authored-by: Carlos Rodriguez <[email protected]>
cosmos · Jan 22, 2024 · 61e3eb5 · 61e3eb5
1 parent 0ad8ab4
commit 61e3eb5
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 61 deletions.
diff --git a/docs/docs/02-apps/02-interchain-accounts/05-messages.md b/docs/docs/02-apps/02-interchain-accounts/05-messages.md
@@ -17,7 +17,7 @@ type MsgRegisterInterchainAccount struct {
  Owner string
  ConnectionID string
  Version string
- Order  channeltypes.Order
+ Ordering channeltypes.Order
 }
 ```
 

diff --git a/modules/apps/27-interchain-accounts/controller/client/cli/tx.go b/modules/apps/27-interchain-accounts/controller/client/cli/tx.go
@@ -50,7 +50,7 @@ the associated capability.`),
  return err
  }
 
- order, err := parseOrder(cmd)
+ order, err := parseOrdering(cmd)
  if err != nil {
  return err
  }
@@ -118,8 +118,8 @@ appropriate relative timeoutTimestamp must be provided with flag {relative-packe
  return cmd
 }
 
-// parseOrder gets the channel ordering from the flags.
-func parseOrder(cmd *cobra.Command) (channeltypes.Order, error) {
+// parseOrdering gets the channel ordering from the flags.
+func parseOrdering(cmd *cobra.Command) (channeltypes.Order, error) {
  orderString, err := cmd.Flags().GetString(flagOrdering)
  if err != nil {
  return channeltypes.NONE, err

diff --git a/modules/apps/27-interchain-accounts/controller/keeper/account.go b/modules/apps/27-interchain-accounts/controller/keeper/account.go
@@ -51,7 +51,7 @@ func (k Keeper) RegisterInterchainAccount(ctx sdk.Context, connectionID, owner,
 
 // registerInterchainAccount registers an interchain account, returning the channel id of the MsgChannelOpenInitResponse
 // and an error if one occurred.
-func (k Keeper) registerInterchainAccount(ctx sdk.Context, connectionID, portID, version string, order channeltypes.Order) (string, error) {
+func (k Keeper) registerInterchainAccount(ctx sdk.Context, connectionID, portID, version string, ordering channeltypes.Order) (string, error) {
  // if there is an active channel for this portID / connectionID return an error
  activeChannelID, found := k.GetOpenActiveChannel(ctx, connectionID, portID)
  if found {
@@ -69,7 +69,7 @@ func (k Keeper) registerInterchainAccount(ctx sdk.Context, connectionID, portID,
  }
  }
 
- msg := channeltypes.NewMsgChannelOpenInit(portID, version, order, []string{connectionID}, icatypes.HostPortID, authtypes.NewModuleAddress(icatypes.ModuleName).String())
+ msg := channeltypes.NewMsgChannelOpenInit(portID, version, ordering, []string{connectionID}, icatypes.HostPortID, authtypes.NewModuleAddress(icatypes.ModuleName).String())
  handler := k.msgRouter.Handler(msg)
  res, err := handler(ctx, msg)
  if err != nil {

diff --git a/modules/apps/27-interchain-accounts/controller/keeper/msg_server.go b/modules/apps/27-interchain-accounts/controller/keeper/msg_server.go
@@ -39,7 +39,7 @@ func (s msgServer) RegisterInterchainAccount(goCtx context.Context, msg *types.M
 
  s.SetMiddlewareDisabled(ctx, portID, msg.ConnectionId)
 
- channelID, err := s.registerInterchainAccount(ctx, msg.ConnectionId, portID, msg.Version, msg.Order)
+ channelID, err := s.registerInterchainAccount(ctx, msg.ConnectionId, portID, msg.Version, msg.Ordering)
  if err != nil {
  s.Logger(ctx).Error("error registering interchain account", "error", err.Error())
  return nil, err

diff --git a/modules/apps/27-interchain-accounts/controller/types/msgs.go b/modules/apps/27-interchain-accounts/controller/types/msgs.go
@@ -26,12 +26,12 @@ var (
 )
 
 // NewMsgRegisterInterchainAccount creates a new instance of MsgRegisterInterchainAccount
-func NewMsgRegisterInterchainAccount(connectionID, owner, version string, order channeltypes.Order) *MsgRegisterInterchainAccount {
+func NewMsgRegisterInterchainAccount(connectionID, owner, version string, ordering channeltypes.Order) *MsgRegisterInterchainAccount {
  return &MsgRegisterInterchainAccount{
  ConnectionId: connectionID,
  Owner: owner,
  Version: version,
- Order:  order,
+ Ordering: ordering,
  }
 }
 

diff --git a/modules/apps/27-interchain-accounts/controller/types/tx.pb.go b/modules/apps/27-interchain-accounts/controller/types/tx.pb.go
diff --git a/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto b/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto
@@ -31,7 +31,7 @@ message MsgRegisterInterchainAccount {
  string owner = 1;
  string connection_id = 2;
  string version = 3;
- ibc.core.channel.v1.Order order  = 4;
+ ibc.core.channel.v1.Order ordering = 4;
 }
 
 // MsgRegisterInterchainAccountResponse defines the response for Msg/RegisterAccount