From fe9f9d7c47e56d3354488b540b2b4d8658bb36b6 Mon Sep 17 00:00:00 2001
From: yihuang <huang@crypto.com>
Date: Mon, 29 Aug 2022 09:59:45 +0800
Subject: [PATCH] Problem: upgrade test don't reveal some upgrade issues (#678)

* Problem: upgrade test don't reveal some upgrade issues

Solution:
- do some basic operations after upgraded.

* fix upgrade handler
---
 app/app.go                        |  2 --
 integration_tests/test_upgrade.py | 22 +++++++++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/app.go b/app/app.go
index 814f93147f..e568c36d98 100644
--- a/app/app.go
+++ b/app/app.go
@@ -85,7 +85,6 @@ import (
 	upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
 	upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
-	icacontrollertypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/types"
 	ibcfee "github.com/cosmos/ibc-go/v5/modules/apps/29-fee"
 	ibcfeekeeper "github.com/cosmos/ibc-go/v5/modules/apps/29-fee/keeper"
 	ibcfeetypes "github.com/cosmos/ibc-go/v5/modules/apps/29-fee/types"
@@ -326,7 +325,6 @@ func New(
 		feegrant.StoreKey, authzkeeper.StoreKey,
 		// ibc keys
 		ibchost.StoreKey, ibctransfertypes.StoreKey,
-		icacontrollertypes.StoreKey,
 		ibcfeetypes.StoreKey,
 		// ethermint keys
 		evmtypes.StoreKey, feemarkettypes.StoreKey,
diff --git a/integration_tests/test_upgrade.py b/integration_tests/test_upgrade.py
index 4b88973a3c..1abcdc8157 100644
--- a/integration_tests/test_upgrade.py
+++ b/integration_tests/test_upgrade.py
@@ -10,7 +10,14 @@
 from pystarport.cluster import SUPERVISOR_CONFIG_FILE
 
 from .network import Cronos, setup_custom_cronos
-from .utils import parse_events, wait_for_block, wait_for_block_time, wait_for_port
+from .utils import (
+    ADDRS,
+    parse_events,
+    send_transaction,
+    wait_for_block,
+    wait_for_block_time,
+    wait_for_port,
+)
 
 
 def init_cosmovisor(home):
@@ -126,3 +133,16 @@ def test_cosmovisor_upgrade(custom_cronos: Cronos):
 
     # test migrate keystore
     cli.migrate_keystore()
+
+    # check basic tx works
+    wait_for_port(ports.evmrpc_port(custom_cronos.base_port(0)))
+    receipt = send_transaction(
+        custom_cronos.w3,
+        {
+            "to": ADDRS["community"],
+            "value": 1000,
+            "maxFeePerGas": 1000000000000,
+            "maxPriorityFeePerGas": 10000,
+        },
+    )
+    assert receipt.status == 1