chore: remove ics20-2 (#7951)

* remove ics20-2 * update callbacks for removing ics20-2 * lint * fix test + cleanup * fix upgrade tests * fix more upgrade tests * Update modules/apps/transfer/v2/ibc_module.go --------- Co-authored-by: Aditya <14364734+AdityaSripal@users.noreply.github.com>
cosmos · Feb 11, 2025 · 0177972 · 0177972
1 parent 7ee3cb0
commit 0177972
Show file tree

Hide file tree

Showing 80 changed files with 1,114 additions and 8,029 deletions.
diff --git a/.github/workflows/e2e-compatibility.yaml b/.github/workflows/e2e-compatibility.yaml
@@ -218,15 +218,6 @@ jobs:
       test-file: "e2e/tests/transfer/authz_test.go"
       release-version: "${{ needs.determine-image-tag.outputs.release-version }}"
 
-  transfer-forwarding-test:
-    needs:
-      - build-release-images
-      - determine-image-tag
-    uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
-    with:
-      test-file: "e2e/tests/transfer/forwarding_test.go"
-      release-version: "${{ needs.determine-image-tag.outputs.release-version }}"
-
   transfer-incentivized-test-a:
     needs:
       - build-release-images

diff --git a/.github/workflows/e2e-fork.yml b/.github/workflows/e2e-fork.yml
@@ -32,7 +32,7 @@ jobs:
           output=$(go run cmd/build_test_matrix/main.go)
           echo "matrix=$output" >> $GITHUB_OUTPUT
         env:
-          TEST_EXCLUSIONS: 'TestUpgradeTestSuite,TestIBCWasmUpgradeTestSuite'
+          TEST_EXCLUSIONS: 'TestUpgradeTestSuite'
 
   e2e-fork:
     env:

diff --git a/.github/workflows/e2e-test-workflow-call.yml b/.github/workflows/e2e-test-workflow-call.yml
@@ -257,7 +257,6 @@ jobs:
           - entrypoint: TestConnectionTestSuite
           - entrypoint: TestInterchainAccountsGovTestSuite
           - entrypoint: TestIncentivizedTransferTestSuite
-          - entrypoint: TestTransferForwardingTestSuite
     steps:
       - uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/e2e-upgrade.yaml b/.github/workflows/e2e-upgrade.yaml
@@ -69,17 +69,6 @@ jobs:
       test: "TestV8ToV8_1ChainUpgrade_FeeMiddlewareChannelUpgrade"
       upload-logs: true
 
-  upgrade-ibcwasm-v8:
-    uses: ./.github/workflows/e2e-test-workflow-call.yml
-    with:
-      chain-image: ghcr.io/cosmos/ibc-go-wasm-simd
-      chain-a-tag: v7.3.0-e2e-upgrade
-      chain-b-tag: v7.3.0-e2e-upgrade
-      upgrade-plan-name: "ibcwasm-v8"
-      test-entry-point:  "TestIBCWasmUpgradeTestSuite"
-      test: "TestIBCWasmChainUpgrade"
-      upload-logs: true
-
   upgrade-v9:
     uses: ./.github/workflows/e2e-test-workflow-call.yml
     with:
@@ -102,13 +91,3 @@ jobs:
       test: "TestV8ToV9ChainUpgrade_Localhost"
       upload-logs: true
 
-  upgrade-v9-channel-upgrades:
-    uses: ./.github/workflows/e2e-test-workflow-call.yml
-    with:
-      chain-image: ghcr.io/cosmos/ibc-go-simd
-      chain-a-tag: v8.4.0
-      chain-b-tag: v9.0.0
-      upgrade-plan-name: "v9"
-      test-entry-point:  "TestUpgradeTestSuite"
-      test: "TestV8ToV9ChainUpgrade_ICS20v2ChannelUpgrade"
-      upload-logs: true
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -66,5 +66,5 @@ jobs:
       chain-b-tag: '${{ needs.determine-image-tag.outputs.simd-tag }}'
       # on regular PRs we won't run upgrade tests.
       # NOTE: we are excluding TestTransferTestSuite as we run this full suite instead of each individual test.
-      test-exclusions: 'TestUpgradeTestSuite,TestIBCWasmUpgradeTestSuite,TestTransferTestSuite,TestAuthzTransferTestSuite,TestTransferTestSuiteSendReceive,TestTransferTestSuiteSendEnabled,TestTransferLocalhostTestSuite,TestConnectionTestSuite,TestInterchainAccountsGovTestSuite,TestIncentivizedTransferTestSuite,TestTransferForwardingTestSuite'
+      test-exclusions: 'TestUpgradeTestSuite,TestTransferTestSuite,TestAuthzTransferTestSuite,TestTransferTestSuiteSendReceive,TestTransferTestSuiteSendEnabled,TestTransferLocalhostTestSuite,TestConnectionTestSuite,TestInterchainAccountsGovTestSuite,TestIncentivizedTransferTestSuite'
       temp-run-full-suite: true
diff --git a/e2e/tests/core/03-connection/connection_test.go b/e2e/tests/core/03-connection/connection_test.go
@@ -114,7 +114,7 @@ func (s *ConnectionTestSuite) TestMaxExpectedTimePerBlockParam() {
 
 	t.Run("ensure packets can be received, send from chainB to chainA", func(t *testing.T) {
 		t.Run("send tokens from chainB to chainA", func(t *testing.T) {
-			transferTxResp := s.Transfer(ctx, chainB, chainBWallet, channelA.Counterparty.PortID, channelA.Counterparty.ChannelID, testvalues.DefaultTransferCoins(chainBDenom), chainBAddress, chainAAddress, s.GetTimeoutHeight(ctx, chainA), 0, "", nil)
+			transferTxResp := s.Transfer(ctx, chainB, chainBWallet, channelA.Counterparty.PortID, channelA.Counterparty.ChannelID, testvalues.DefaultTransferAmount(chainBDenom), chainBAddress, chainAAddress, s.GetTimeoutHeight(ctx, chainA), 0, "")
 			s.AssertTxSuccess(transferTxResp)
 		})
 

diff --git a/e2e/tests/transfer/authz_test.go b/e2e/tests/transfer/authz_test.go
@@ -129,13 +129,12 @@ func (suite *AuthzTransferTestSuite) TestAuthz_MsgTransfer_Succeeds() {
 			channelA.PortID,
 			channelA.ChannelID,
 			channelA.Version,
-			testvalues.DefaultTransferCoins(chainADenom),
+			testvalues.DefaultTransferAmount(chainADenom),
 			granterAddress,
 			receiverWalletAddress,
 			suite.GetTimeoutHeight(ctx, chainB),
 			0,
 			"",
-			nil,
 		)
 
 		protoAny, err := codectypes.NewAnyWithValue(transferMsg)
@@ -190,13 +189,12 @@ func (suite *AuthzTransferTestSuite) TestAuthz_MsgTransfer_Succeeds() {
 			channelA.PortID,
 			channelA.ChannelID,
 			channelA.Version,
-			testvalues.DefaultTransferCoins(chainADenom),
+			testvalues.DefaultTransferAmount(chainADenom),
 			granterAddress,
 			receiverWalletAddress,
 			suite.GetTimeoutHeight(ctx, chainB),
 			0,
 			"",
-			nil,
 		)
 
 		protoAny, err := codectypes.NewAnyWithValue(transferMsg)
@@ -276,13 +274,12 @@ func (suite *AuthzTransferTestSuite) TestAuthz_InvalidTransferAuthorizations() {
 				channelA.PortID,
 				channelA.ChannelID,
 				channelA.Version,
-				sdk.NewCoins(sdk.Coin{Denom: chainADenom, Amount: sdkmath.NewInt(invalidSpendAmount)}),
+				sdk.Coin{Denom: chainADenom, Amount: sdkmath.NewInt(invalidSpendAmount)},
 				granterAddress,
 				receiverWalletAddress,
 				suite.GetTimeoutHeight(ctx, chainB),
 				0,
 				"",
-				nil,
 			)
 
 			protoAny, err := codectypes.NewAnyWithValue(transferMsg)
@@ -337,13 +334,12 @@ func (suite *AuthzTransferTestSuite) TestAuthz_InvalidTransferAuthorizations() {
 				channelA.PortID,
 				channelA.ChannelID,
 				channelA.Version,
-				sdk.NewCoins(sdk.Coin{Denom: chainADenom, Amount: sdkmath.NewInt(spendLimit)}),
+				sdk.Coin{Denom: chainADenom, Amount: sdkmath.NewInt(spendLimit)},
 				granterAddress,
 				invalidWalletAddress,
 				suite.GetTimeoutHeight(ctx, chainB),
 				0,
 				"",
-				nil,
 			)
 
 			protoAny, err := codectypes.NewAnyWithValue(transferMsg)