From a90bf1c5b8b380d89d70fbb3831fb87b1f265338 Mon Sep 17 00:00:00 2001 From: Peter Zhang Date: Mon, 7 Jul 2025 22:05:20 +0800 Subject: [PATCH] fix test --- tests/test_framework/zgs_node.py | 3 +++ tests/utility/utils.py | 15 +++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/tests/test_framework/zgs_node.py b/tests/test_framework/zgs_node.py index 1decae5..29c06d7 100644 --- a/tests/test_framework/zgs_node.py +++ b/tests/test_framework/zgs_node.py @@ -8,6 +8,7 @@ from utility.utils import ( initialize_toml_config, p2p_port, rpc_port, + grpc_port, blockchain_rpc_port, ) @@ -37,6 +38,7 @@ class ZgsNode(TestNode): libp2p_nodes.append(f"/ip4/127.0.0.1/tcp/{p2p_port(i)}") rpc_listen_address = f"127.0.0.1:{rpc_port(index)}" + grpc_listen_address = f"127.0.0.1:{grpc_port(index)}" indexed_config = { "network_libp2p_port": p2p_port(index), @@ -44,6 +46,7 @@ class ZgsNode(TestNode): "rpc": { "listen_address": rpc_listen_address, "listen_address_admin": rpc_listen_address, + "listen_address_grpc": grpc_listen_address, }, "network_libp2p_nodes": libp2p_nodes, "log_contract_address": log_contract_address, diff --git a/tests/utility/utils.py b/tests/utility/utils.py index a2f0a75..f1d7373 100644 --- a/tests/utility/utils.py +++ b/tests/utility/utils.py @@ -23,30 +23,33 @@ def p2p_port(n): def rpc_port(n): return PortMin.n + MAX_NODES + n +def grpc_port(n): + return PortMin.n + 2 * MAX_NODES + n + def blockchain_p2p_port(n): assert n <= MAX_BLOCKCHAIN_NODES - return PortMin.n + MAX_NODES + MAX_BLOCKCHAIN_NODES + n + return PortMin.n + 3 * MAX_NODES + n def blockchain_rpc_port(n): - return PortMin.n + MAX_NODES + 2 * MAX_BLOCKCHAIN_NODES + n + return PortMin.n + 3 * MAX_NODES + MAX_BLOCKCHAIN_NODES + n def blockchain_rpc_port_core(n): - return PortMin.n + MAX_NODES + 3 * MAX_BLOCKCHAIN_NODES + n + return PortMin.n + 3 * MAX_NODES + 2 * MAX_BLOCKCHAIN_NODES + n def blockchain_ws_port(n): - return PortMin.n + MAX_NODES + 4 * MAX_BLOCKCHAIN_NODES + n + return PortMin.n + 3 * MAX_NODES + 3 * MAX_BLOCKCHAIN_NODES + n def blockchain_rpc_port_tendermint(n): - return PortMin.n + MAX_NODES + 5 * MAX_BLOCKCHAIN_NODES + n + return PortMin.n + 3 * MAX_NODES + 4 * MAX_BLOCKCHAIN_NODES + n def pprof_port(n): - return PortMin.n + MAX_NODES + 6 * MAX_BLOCKCHAIN_NODES + n + return PortMin.n + 3 * MAX_NODES + 5 * MAX_BLOCKCHAIN_NODES + n def wait_until(predicate, *, attempts=float("inf"), timeout=float("inf"), lock=None):