diff --git a/.gitignore b/.gitignore index 44c42af..37d0c30 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,5 @@ /.idea tests/**/__pycache__ tests/tmp/** -tests/config/zgs .vscode/*.json /0g-storage-contracts-dev diff --git a/tests/config/zgs/network/enr.dat b/tests/config/zgs/network/enr.dat new file mode 100644 index 0000000..dc87bde --- /dev/null +++ b/tests/config/zgs/network/enr.dat @@ -0,0 +1 @@ +enr:-Ly4QJZwz9htAorBIx_otqoaRFPohX7NQJ31iBB6mcEhBiuPWsOnigc1ABQsg6tLU1OirQdLR6aEvv8SlkkfIbV72T8CgmlkgnY0gmlwhH8AAAGQbmV0d29ya19pZGVudGl0eZ8oIwAAAAAAADPyz8cpvYcPpUtQMmYOBrTPKn-UAAIAiXNlY3AyNTZrMaEDeDdgnDgLPkxNxB39jKb9f1Na30t6R9vVolpTk5zu-hODdGNwgir4g3VkcIIq-A \ No newline at end of file diff --git a/tests/config/zgs/network/key b/tests/config/zgs/network/key new file mode 100644 index 0000000..0fa80bd --- /dev/null +++ b/tests/config/zgs/network/key @@ -0,0 +1 @@ +YҢ- r7jqp} \ No newline at end of file diff --git a/tests/shard_sync_test.py b/tests/shard_sync_test.py index bab9e8c..6f1f7e0 100755 --- a/tests/shard_sync_test.py +++ b/tests/shard_sync_test.py @@ -40,14 +40,18 @@ class PrunerTest(TestFramework): for i in range(len(segments)): client_index = i % 2 self.nodes[client_index].zgs_upload_segment(segments[i]) + wait_until(lambda: self.nodes[0].zgs_get_file_info(data_root) is not None) wait_until(lambda: self.nodes[0].zgs_get_file_info(data_root)["finalized"]) + wait_until(lambda: self.nodes[1].zgs_get_file_info(data_root) is not None) wait_until(lambda: self.nodes[1].zgs_get_file_info(data_root)["finalized"]) self.nodes[2].admin_start_sync_file(0) self.nodes[3].admin_start_sync_file(0) wait_until(lambda: self.nodes[2].sync_status_is_completed_or_unknown(0)) + wait_until(lambda: self.nodes[2].zgs_get_file_info(data_root) is not None) wait_until(lambda: self.nodes[2].zgs_get_file_info(data_root)["finalized"]) wait_until(lambda: self.nodes[3].sync_status_is_completed_or_unknown(0)) + wait_until(lambda: self.nodes[3].zgs_get_file_info(data_root) is not None) wait_until(lambda: self.nodes[3].zgs_get_file_info(data_root)["finalized"]) for i in range(len(segments)): diff --git a/tests/test_framework/blockchain_node.py b/tests/test_framework/blockchain_node.py index 491268c..e25a274 100644 --- a/tests/test_framework/blockchain_node.py +++ b/tests/test_framework/blockchain_node.py @@ -128,10 +128,14 @@ class TestNode: poll_per_s = 4 for _ in range(poll_per_s * self.rpc_timeout): if self.process.poll() is not None: + self.stderr.seek(0) + self.stdout.seek(0) raise FailedToStartError( self._node_msg( - "exited with status {} during initialization".format( - self.process.returncode + "exited with status {} during initialization \n\nstderr: {}\n\nstdout: {}\n\n".format( + self.process.returncode, + self.stderr.read(), + self.stdout.read(), ) ) ) diff --git a/tests/test_framework/zg_node.py b/tests/test_framework/zg_node.py index 458a263..dbb0c75 100644 --- a/tests/test_framework/zg_node.py +++ b/tests/test_framework/zg_node.py @@ -3,14 +3,9 @@ import subprocess import tempfile from test_framework.blockchain_node import BlockChainNodeType, BlockchainNode -from utility.utils import blockchain_rpc_port, arrange_port +from utility.utils import blockchain_p2p_port, blockchain_rpc_port, blockchain_ws_port, blockchain_rpc_port_tendermint, pprof_port from utility.build_binary import build_zg -ZGNODE_PORT_CATEGORY_WS = 0 -ZGNODE_PORT_CATEGORY_P2P = 1 -ZGNODE_PORT_CATEGORY_RPC = 2 -ZGNODE_PORT_CATEGORY_PPROF = 3 - def zg_node_init_genesis(binary: str, root_dir: str, num_nodes: int): assert num_nodes > 0, "Invalid number of blockchain nodes: %s" % num_nodes @@ -26,7 +21,7 @@ def zg_node_init_genesis(binary: str, root_dir: str, num_nodes: int): os.mkdir(zgchaind_dir) log_file = tempfile.NamedTemporaryFile(dir=zgchaind_dir, delete=False, prefix="init_genesis_", suffix=".log") - p2p_port_start = arrange_port(ZGNODE_PORT_CATEGORY_P2P, 0) + p2p_port_start = blockchain_p2p_port(0) ret = subprocess.run( args=["bash", shell_script, zgchaind_dir, str(num_nodes), str(p2p_port_start)], @@ -71,13 +66,13 @@ class ZGNode(BlockchainNode): # overwrite json rpc http port: 8545 "--json-rpc.address", "127.0.0.1:%s" % blockchain_rpc_port(index), # overwrite json rpc ws port: 8546 - "--json-rpc.ws-address", "127.0.0.1:%s" % arrange_port(ZGNODE_PORT_CATEGORY_WS, index), + "--json-rpc.ws-address", "127.0.0.1:%s" % blockchain_ws_port(index), # overwrite p2p port: 26656 - "--p2p.laddr", "tcp://127.0.0.1:%s" % arrange_port(ZGNODE_PORT_CATEGORY_P2P, index), + "--p2p.laddr", "tcp://127.0.0.1:%s" % blockchain_p2p_port(index), # overwrite rpc port: 26657 - "--rpc.laddr", "tcp://127.0.0.1:%s" % arrange_port(ZGNODE_PORT_CATEGORY_RPC, index), + "--rpc.laddr", "tcp://127.0.0.1:%s" % blockchain_rpc_port_tendermint(index), # overwrite pprof port: 6060 - "--rpc.pprof_laddr", "127.0.0.1:%s" % arrange_port(ZGNODE_PORT_CATEGORY_PPROF, index), + "--rpc.pprof_laddr", "127.0.0.1:%s" % pprof_port(index), "--log_level", "debug" ] diff --git a/tests/utility/utils.py b/tests/utility/utils.py index 8165dae..c5e877f 100644 --- a/tests/utility/utils.py +++ b/tests/utility/utils.py @@ -11,6 +11,7 @@ class PortMin: MAX_NODES = 100 +MAX_BLOCKCHAIN_NODES = 50 def p2p_port(n): @@ -23,18 +24,25 @@ def rpc_port(n): def blockchain_p2p_port(n): - return PortMin.n + 2 * MAX_NODES + n + assert n <= MAX_BLOCKCHAIN_NODES + return PortMin.n + MAX_NODES + MAX_BLOCKCHAIN_NODES + n def blockchain_rpc_port(n): - return PortMin.n + 3 * MAX_NODES + n + return PortMin.n + MAX_NODES + 2 * MAX_BLOCKCHAIN_NODES + n def blockchain_rpc_port_core(n): - return PortMin.n + 4 * MAX_NODES + n + return PortMin.n + MAX_NODES + 3 * MAX_BLOCKCHAIN_NODES + n -def arrange_port(category: int, node_index: int) -> int: - return PortMin.n + (100 + category) * MAX_NODES + node_index +def blockchain_ws_port(n): + return PortMin.n + MAX_NODES + 4 * MAX_BLOCKCHAIN_NODES + n + +def blockchain_rpc_port_tendermint(n): + return PortMin.n + MAX_NODES + 5 * MAX_BLOCKCHAIN_NODES + n + +def pprof_port(n): + return PortMin.n + MAX_NODES + 6 * MAX_BLOCKCHAIN_NODES + n def wait_until(predicate, *, attempts=float("inf"), timeout=float("inf"), lock=None): if attempts == float("inf") and timeout == float("inf"):