tests: remove duplicate NewTransferPath from tests, use one in testin…

…g package. (#6075)
cosmos · Apr 2, 2024 · bb739af · bb739af
1 parent c92bf55
commit bb739af
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 25 deletions.
diff --git a/modules/apps/transfer/ibc_module_test.go b/modules/apps/transfer/ibc_module_test.go
@@ -295,7 +295,7 @@ func (suite *TransferTestSuite) TestOnChanUpgradeInit() {
 		suite.Run(tc.name, func() {
 			suite.SetupTest()
 
-			path = NewTransferPath(suite.chainA, suite.chainB)
+			path = ibctesting.NewTransferPath(suite.chainA, suite.chainB)
 			path.Setup()
 
 			// configure the channel upgrade to modify the underlying connection
@@ -359,7 +359,7 @@ func (suite *TransferTestSuite) TestOnChanUpgradeTry() {
 		suite.Run(tc.name, func() {
 			suite.SetupTest()
 
-			path = NewTransferPath(suite.chainA, suite.chainB)
+			path = ibctesting.NewTransferPath(suite.chainA, suite.chainB)
 			path.Setup()
 
 			// configure the channel upgrade to modify the underlying connection
@@ -429,7 +429,7 @@ func (suite *TransferTestSuite) TestOnChanUpgradeAck() {
 		suite.Run(tc.name, func() {
 			suite.SetupTest()
 
-			path = NewTransferPath(suite.chainA, suite.chainB)
+			path = ibctesting.NewTransferPath(suite.chainA, suite.chainB)
 			path.Setup()
 
 			// configure the channel upgrade to modify the underlying connection

diff --git a/modules/apps/transfer/transfer_test.go b/modules/apps/transfer/transfer_test.go
@@ -32,16 +32,6 @@ func (suite *TransferTestSuite) SetupTest() {
 	suite.chainC = suite.coordinator.GetChain(ibctesting.GetChainID(3))
 }
 
-func NewTransferPath(chainA, chainB *ibctesting.TestChain) *ibctesting.Path {
-	path := ibctesting.NewPath(chainA, chainB)
-	path.EndpointA.ChannelConfig.PortID = ibctesting.TransferPort
-	path.EndpointB.ChannelConfig.PortID = ibctesting.TransferPort
-	path.EndpointA.ChannelConfig.Version = types.Version
-	path.EndpointB.ChannelConfig.Version = types.Version
-
-	return path
-}
-
 // Constructs the following sends based on the established channels/connections
 // 1 - from chainA to chainB
 // 2 - from chainB to chainC

diff --git a/modules/apps/transfer/types/transfer_authorization_test.go b/modules/apps/transfer/types/transfer_authorization_test.go
@@ -233,7 +233,7 @@ func (suite *TypesTestSuite) TestTransferAuthorizationAccept() {
 		suite.Run(tc.name, func() {
 			suite.SetupTest()
 
-			path := NewTransferPath(suite.chainA, suite.chainB)
+			path := ibctesting.NewTransferPath(suite.chainA, suite.chainB)
 			path.Setup()
 
 			transferAuthz = types.TransferAuthorization{

diff --git a/modules/apps/transfer/types/types_test.go b/modules/apps/transfer/types/types_test.go
@@ -5,7 +5,6 @@ import (
 
 	testifysuite "github.com/stretchr/testify/suite"
 
-	"github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
 	ibctesting "github.com/cosmos/ibc-go/v8/testing"
 )
 
@@ -25,16 +24,6 @@ func (suite *TypesTestSuite) SetupTest() {
 	suite.chainB = suite.coordinator.GetChain(ibctesting.GetChainID(2))
 }
 
-func NewTransferPath(chainA, chainB *ibctesting.TestChain) *ibctesting.Path {
-	path := ibctesting.NewPath(chainA, chainB)
-	path.EndpointA.ChannelConfig.PortID = types.PortID
-	path.EndpointB.ChannelConfig.PortID = types.PortID
-	path.EndpointA.ChannelConfig.Version = types.Version
-	path.EndpointB.ChannelConfig.Version = types.Version
-
-	return path
-}
-
 func TestTypesTestSuite(t *testing.T) {
 	testifysuite.Run(t, new(TypesTestSuite))
 }