tests: make integration test more stable

gomod2nix.toml

@@ -20,8 +20,8 @@ schema = 3
     version = "v1.0.0-beta.7"
     hash = "sha256-XblGvIx6Wvvq6wggXjp+KbeJGXoe7AZH7hXEdauCezU="
   [mod."cosmossdk.io/math"]
-    version = "v1.0.0-beta.3"
-    hash = "sha256-lTQ27ZlL+kWlc+S//sJmyiOwaf9qS+YLv61I4OXi9XE="
+    version = "v1.0.0-beta.4"
+    hash = "sha256-UYdq/46EubyjxkldGike8FlwJLWGCB576VB7th285ao="
   [mod."filippo.io/edwards25519"]
     version = "v1.0.0-rc.1"
     hash = "sha256-3DboBqby2ejRU33FG96Z8JF5AJ8HP2rC/v++VyoQ2LQ="

tests/integration_tests/configs/cosmovisor.jsonnet

@@ -2,13 +2,14 @@ local config = import 'default.jsonnet';
 
 config {
   'ethermint_9000-1'+: {
+    'app-config'+: {
+      'minimum-gas-prices': '100000000000aphoton',
+    },
     genesis+: {
       app_state+: {
         feemarket+: {
           params+: {
-            no_base_fee: false,
             base_fee:: super.base_fee,
-            initial_base_fee: super.base_fee,
           },
         },
       },

tests/integration_tests/configs/default.jsonnet

@@ -4,13 +4,10 @@
     cmd: 'ethermintd',
     'start-flags': '--trace',
     config: {
-      consensus: {
-        // larger timeout for more stable mempool tests
-        timeout_commit: '2s',
-      },
       mempool: {
         // use v1 mempool to enable tx prioritization
         version: 'v1',
+        recheck: false,
       },
     },
     'app-config': {

tests/integration_tests/configs/enable-indexer.jsonnet

@@ -8,13 +8,18 @@ config {
       },
     },
     'app-config'+: {
-      pruning: 'everything',
-      'state-sync'+: {
-        'snapshot-interval': 0,
-      },
       'json-rpc'+: {
         'enable-indexer': true,
       },
     },
+    genesis+: {
+      app_state+: {
+        feemarket+: {
+          params+: {
+            min_gas_multiplier: '0',
+          },
+        },
+      },
+    },
   },
 }

tests/integration_tests/configs/long_timeout_commit.jsonnet

@@ -0,0 +1,11 @@
+local default = import 'default.jsonnet';
+
+default {
+  'ethermint_9000-1'+: {
+    config+: {
+      consensus+: {
+        timeout_commit: '5s',
+      },
+    },
+  },
+}

tests/integration_tests/configs/pruned_node.jsonnet

@@ -8,5 +8,14 @@ config {
         'snapshot-interval': 0,
       },
     },
+    genesis+: {
+      app_state+: {
+        feemarket+: {
+          params+: {
+            min_gas_multiplier: '0',
+          },
+        },
+      },
+    },
   },
 }

tests/integration_tests/configs/rollback-test.jsonnet

@@ -2,7 +2,7 @@ local config = import 'default.jsonnet';
 
 config {
   'ethermint_9000-1'+: {
-    validators: super.validators + [{
+    validators: super.validators[0:1] + [{
       name: 'fullnode',
     }],
   },

tests/integration_tests/configs/upgrade-test-package.nix

@@ -4,9 +4,9 @@ let
   released = pkgs.buildGo118Module rec {
     name = "ethermintd";
     # the commit before https://github.com/evmos/ethermint/pull/943
-    src = fetchEthermint "f21592ebfe74da7590eb42ed926dae970b2a9a3f";
+    src = fetchEthermint "8866ae0ffd67a104e9d1cf4e50fba8391dda6c45";
     subPackages = [ "cmd/ethermintd" ];
-    vendorSha256 = "sha256-ABm5t6R/u2S6pThGrgdsqe8n3fH5tIWw7a57kxJPbYw=";
+    vendorSha256 = "sha256-oDtMamNlwe/393fZd+RNtRy6ipWpusbco8Xg1ZuKWYw=";
     doCheck = false;
   };
   current = pkgs.callPackage ../../../. { };

tests/integration_tests/conftest.py

@@ -1,8 +1,6 @@
-from pathlib import Path
-
 import pytest
 
-from .network import setup_custom_ethermint, setup_ethermint, setup_geth
+from .network import setup_ethermint, setup_geth
 
 
 @pytest.fixture(scope="session")
@@ -11,42 +9,12 @@ def ethermint(tmp_path_factory):
     yield from setup_ethermint(path, 26650)
 
 
-@pytest.fixture(scope="session")
-def ethermint_indexer(tmp_path_factory):
-    path = tmp_path_factory.mktemp("indexer")
-    yield from setup_custom_ethermint(
-        path, 26660, Path(__file__).parent / "configs/enable-indexer.jsonnet"
-    )
-
-
 @pytest.fixture(scope="session")
 def geth(tmp_path_factory):
     path = tmp_path_factory.mktemp("geth")
     yield from setup_geth(path, 8545)
 
 
-@pytest.fixture(
-    scope="session", params=["ethermint", "geth", "ethermint-ws", "enable-indexer"]
-)
-def cluster(request, ethermint, ethermint_indexer, geth):
-    """
-    run on both ethermint and geth
-    """
-    provider = request.param
-    if provider == "ethermint":
-        yield ethermint
-    elif provider == "geth":
-        yield geth
-    elif provider == "ethermint-ws":
-        ethermint_ws = ethermint.copy()
-        ethermint_ws.use_websocket()
-        yield ethermint_ws
-    elif provider == "enable-indexer":
-        yield ethermint_indexer
-    else:
-        raise NotImplementedError
-
-
 @pytest.fixture(
     scope="session", params=["ethermint", "ethermint-ws"]
 )

tests/integration_tests/cosmoscli.py

@@ -6,6 +6,7 @@
 from pystarport.utils import build_cli_args_safe, interact
 
 DEFAULT_GAS_PRICE = "5000000000000aphoton"
+DEFAULT_GAS = "250000"
 
 
 class ChainCommand:
@@ -636,16 +637,19 @@ def edit_validator(
         )
 
     def gov_propose(self, proposer, kind, proposal, **kwargs):
+        method = "submit-legacy-proposal"
         kwargs.setdefault("gas_prices", DEFAULT_GAS_PRICE)
+        kwargs.setdefault("gas", DEFAULT_GAS)
         if kind == "software-upgrade":
             return json.loads(
                 self.raw(
                     "tx",
                     "gov",
-                    "submit-proposal",
+                    method,
                     kind,
                     proposal["name"],
                     "-y",
+                    "--no-validate",
                     from_=proposer,
                     # content
                     title=proposal.get("title"),
@@ -664,7 +668,7 @@ def gov_propose(self, proposer, kind, proposal, **kwargs):
                 self.raw(
                     "tx",
                     "gov",
-                    "submit-proposal",
+                    method,
                     kind,
                     "-y",
                     from_=proposer,
@@ -685,7 +689,7 @@ def gov_propose(self, proposer, kind, proposal, **kwargs):
                     self.raw(
                         "tx",
                         "gov",
-                        "submit-proposal",
+                        method,
                         kind,
                         fp.name,
                         "-y",

tests/integration_tests/network.py

@@ -68,8 +68,12 @@ def __init__(self, w3):
         self.w3 = w3
 
 
-def setup_ethermint(path, base_port):
-    cfg = Path(__file__).parent / "configs/default.jsonnet"
+def setup_ethermint(path, base_port, long_timeout_commit=False):
+    cfg = Path(__file__).parent / (
+        "configs/default.jsonnet"
+        if long_timeout_commit
+        else "configs/long_timeout_commit.jsonnet"
+    )
     yield from setup_custom_ethermint(path, base_port, cfg)
 
 

tests/integration_tests/test_filters.py

@@ -1,13 +1,58 @@
+from pathlib import Path
+
 import pytest
 from web3 import Web3
 
+from .network import setup_custom_ethermint, setup_ethermint
 from .utils import (
     ADDRS,
     CONTRACTS,
     deploy_contract,
     send_successful_transaction,
     send_transaction,
+    w3_wait_for_new_blocks,
+)
+
+
+@pytest.fixture(scope="module")
+def custom_ethermint(tmp_path_factory):
+    path = tmp_path_factory.mktemp("filters")
+    yield from setup_ethermint(path, 26200, long_timeout_commit=True)
+
+
+@pytest.fixture(scope="module")
+def ethermint_indexer(tmp_path_factory):
+    path = tmp_path_factory.mktemp("indexer")
+    yield from setup_custom_ethermint(
+        path, 26660, Path(__file__).parent / "configs/enable-indexer.jsonnet"
+    )
+
+
+@pytest.fixture(
+    scope="module", params=["ethermint", "geth", "ethermint-ws", "enable-indexer"]
 )
+def cluster(request, custom_ethermint, ethermint_indexer, geth):
+    """
+    run on both ethermint and geth
+    """
+    provider = request.param
+    if provider == "ethermint":
+        yield custom_ethermint
+    elif provider == "geth":
+        yield geth
+    elif provider == "ethermint-ws":
+        ethermint_ws = custom_ethermint.copy()
+        ethermint_ws.use_websocket()
+        yield ethermint_ws
+    elif provider == "enable-indexer":
+        yield ethermint_indexer
+    else:
+        raise NotImplementedError
+
+
+def test_basic(cluster):
+    w3 = cluster.w3
+    assert w3.eth.chain_id == 9000
 
 
 def test_pending_transaction_filter(cluster):
@@ -17,6 +62,7 @@ def test_pending_transaction_filter(cluster):
     # without tx
     assert flt.get_new_entries() == []  # GetFilterChanges
 
+    w3_wait_for_new_blocks(w3, 1, sleep=0.1)
     # with tx
     txhash = send_successful_transaction(w3)
     assert txhash in flt.get_new_entries()

tests/integration_tests/test_grpc_only.py

@@ -1,6 +1,7 @@
 import base64
 import json
 import subprocess
+import time
 from pathlib import Path
 
 import pytest
@@ -13,6 +14,7 @@
     decode_bech32,
     deploy_contract,
     supervisorctl,
+    wait_for_block,
     wait_for_port,
 )
 
@@ -58,33 +60,43 @@ def test_grpc_mode(custom_ethermint):
         "to": contract.address,
         "data": contract.encodeABI(fn_name="currentChainID"),
     }
-    api_port = ports.api_port(custom_ethermint.base_port(2))
+    api_port = ports.api_port(custom_ethermint.base_port(1))
     # in normal mode, grpc query works even if we don't pass chain_id explicitly
-    rsp = grpc_eth_call(api_port, msg)
-    print(rsp)
-    assert "code" not in rsp, str(rsp)
-    assert 9000 == int.from_bytes(base64.b64decode(rsp["ret"].encode()), "big")
-
+    success = False
+    for i in range(3):
+        rsp = grpc_eth_call(api_port, msg)
+        print(i, rsp)
+        assert "code" not in rsp, str(rsp)
+        ret = rsp["ret"]
+        valid = ret is not None
+        if valid and 9000 == int.from_bytes(base64.b64decode(ret.encode()), "big"):
+            success = True
+            break
+        time.sleep(1)
+    assert success
+    # wait 1 block before stop
+    for i in range(2):
+        wait_for_block(custom_ethermint.cosmos_cli(i), 1)
     supervisorctl(
-        custom_ethermint.base_dir / "../tasks.ini", "stop", "ethermint_9000-1-node2"
+        custom_ethermint.base_dir / "../tasks.ini", "stop", "ethermint_9000-1-node1"
     )
 
     # run grpc-only mode directly with existing chain state
-    with (custom_ethermint.base_dir / "node2.log").open("w") as logfile:
+    with (custom_ethermint.base_dir / "node1-new.log").open("w") as logfile:
         proc = subprocess.Popen(
             [
                 "ethermintd",
                 "start",
                 "--grpc-only",
                 "--home",
-                custom_ethermint.base_dir / "node2",
+                custom_ethermint.base_dir / "node1",
             ],
             stdout=logfile,
             stderr=subprocess.STDOUT,
         )
         try:
             # wait for grpc and rest api ports
-            grpc_port = ports.grpc_port(custom_ethermint.base_port(2))
+            grpc_port = ports.grpc_port(custom_ethermint.base_port(1))
             wait_for_port(grpc_port)
             wait_for_port(api_port)
 
@@ -99,9 +111,8 @@ def test_grpc_mode(custom_ethermint):
             assert "validator does not exist" in rsp["message"]
 
             # pass the first validator's consensus address to grpc query
-            cons_addr = decode_bech32(
-                custom_ethermint.cosmos_cli(0).consensus_address()
-            )
+            addr = custom_ethermint.cosmos_cli(0).consensus_address()
+            cons_addr = decode_bech32(addr)
 
             # should work with both chain_id and proposer_address set
             rsp = grpc_eth_call(