chore: move signer as final arg

cosmos · Oct 3, 2024 · c0ddded · c0ddded
1 parent 642a7ce
commit c0ddded
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/modules/core/keeper/msg_server_test.go b/modules/core/keeper/msg_server_test.go
@@ -1250,7 +1250,7 @@ func (suite *KeeperTestSuite) TestProvideCounterparty() {
 
 		signer := path.EndpointA.Chain.SenderAccount.GetAddress().String()
 		merklePrefix := commitmenttypesv2.NewMerklePath([]byte("mock-key"))
-		msg = packetservertypes.NewMsgProvideCounterparty(signer, path.EndpointA.ClientID, path.EndpointB.ClientID, merklePrefix)
+		msg = packetservertypes.NewMsgProvideCounterparty(path.EndpointA.ClientID, path.EndpointB.ClientID, merklePrefix, signer)
 
 		tc.malleate()
 

diff --git a/modules/core/packet-server/types/msgs.go b/modules/core/packet-server/types/msgs.go
@@ -16,7 +16,7 @@ var (
 )
 
 // NewMsgProvideCounterparty creates a new MsgProvideCounterparty instance
-func NewMsgProvideCounterparty(signer, clientID, counterpartyChannelID string, merklePathPrefix commitmenttypes.MerklePath) *MsgProvideCounterparty {
+func NewMsgProvideCounterparty(clientID, counterpartyChannelID string, merklePathPrefix commitmenttypes.MerklePath, signer string) *MsgProvideCounterparty {
 	counterparty := NewCounterparty(clientID, counterpartyChannelID, merklePathPrefix)
 
 	return &MsgProvideCounterparty{
@@ -44,7 +44,7 @@ func (msg *MsgProvideCounterparty) ValidateBasic() error {
 }
 
 // NewMsgCreateChannel creates a new MsgCreateChannel instance
-func NewMsgCreateChannel(signer, clientID string, merklePathPrefix commitmenttypes.MerklePath) *MsgCreateChannel {
+func NewMsgCreateChannel(clientID string, merklePathPrefix commitmenttypes.MerklePath, signer string) *MsgCreateChannel {
 	return &MsgCreateChannel{
 		Signer:           signer,
 		ClientId:         clientID,

diff --git a/modules/core/packet-server/types/msgs_test.go b/modules/core/packet-server/types/msgs_test.go
@@ -56,10 +56,10 @@ func (s *TypesTestSuite) TestMsgProvideCounterpartyValidateBasic() {
 
 	for _, tc := range testCases {
 		msg = types.NewMsgProvideCounterparty(
-			ibctesting.TestAccAddress,
 			ibctesting.FirstClientID,
 			ibctesting.SecondClientID,
 			commitmenttypes.NewMerklePath([]byte("key")),
+			ibctesting.TestAccAddress,
 		)
 
 		tc.malleate()
@@ -113,9 +113,9 @@ func (s *TypesTestSuite) TestMsgCreateChannelValidateBasic() {
 
 	for _, tc := range testCases {
 		msg = types.NewMsgCreateChannel(
-			ibctesting.TestAccAddress,
 			ibctesting.FirstClientID,
 			commitmenttypes.NewMerklePath([]byte("key")),
+			ibctesting.TestAccAddress,
 		)
 
 		tc.malleate()

diff --git a/testing/endpoint.go b/testing/endpoint.go
@@ -180,7 +180,7 @@ func (endpoint *Endpoint) FreezeClient() {
 func (endpoint *Endpoint) ProvideCounterparty() (err error) {
 	merklePath := commitmenttypes.NewMerklePath([]byte("ibc"), []byte(""))
 
-	msg := packetservertypes.NewMsgProvideCounterparty(endpoint.Chain.SenderAccount.GetAddress().String(), endpoint.ClientID, endpoint.Counterparty.ClientID, merklePath)
+	msg := packetservertypes.NewMsgProvideCounterparty(endpoint.ClientID, endpoint.Counterparty.ClientID, merklePath, endpoint.Chain.SenderAccount.GetAddress().String())
 
 	// setup counterparty
 	_, err = endpoint.Chain.SendMsgs(msg)