From 117d248def22992333e902dfc2f7a5a929582170 Mon Sep 17 00:00:00 2001 From: Chris Beck Date: Fri, 25 Mar 2022 13:13:35 -0600 Subject: [PATCH] try to fix fog local network test --- .circleci/config.yml | 4 ++-- tools/fog-local-network/fog_local_network.py | 3 ++- tools/local-network/local_network.py | 14 ++++++++++---- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7f1b085405..c16a172607 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -478,14 +478,14 @@ commands: MC_LOG="info,rustls=warn,hyper=warn,tokio_reactor=warn,mio=warn,want=warn,rusoto_core=error,h2=error,reqwest=error,rocket=error,=error" \ LEDGER_BASE=$(pwd)/ledger \ - python3 tools/fog-local-network/fog_local_network.py --network-type dense5 --skip-build & + python3 tools/fog-local-network/fog_local_network.py --network-type dense5 --skip-build --block-version 2 & sleep 20 ./target/release/sample-keys --num 4 --output-dir fog_keys --fog-report-url 'insecure-fog://localhost:6200' --fog-authority-root $FOG_AUTHORITY_ROOT ./target/release/fog-distribution \ - --block-version 3 \ + --block-version 2 \ --sample-data-dir . \ --max-threads 1 \ --peer insecure-mc://localhost:3200/ \ diff --git a/tools/fog-local-network/fog_local_network.py b/tools/fog-local-network/fog_local_network.py index 70639c2c5d..ca7970672b 100644 --- a/tools/fog-local-network/fog_local_network.py +++ b/tools/fog-local-network/fog_local_network.py @@ -150,6 +150,7 @@ def stop(self): parser = argparse.ArgumentParser(description='Local network tester') parser.add_argument('--network-type', help='Type of network to create', required=True) parser.add_argument('--skip-build', help='Skip building binaries', action='store_true') + parser.add_argument('--block-version', help='Set the block version argument', action='store_true') args = parser.parse_args() - FogNetwork().default_entry_point(args.network_type, args.skip_build) + FogNetwork().default_entry_point(args.network_type, args.skip_build, args.block_version) diff --git a/tools/local-network/local_network.py b/tools/local-network/local_network.py index b7745a5c4d..2c2502e4a7 100755 --- a/tools/local-network/local_network.py +++ b/tools/local-network/local_network.py @@ -141,7 +141,7 @@ def __repr__(self): class Node: - def __init__(self, name, node_num, client_port, peer_port, admin_port, admin_http_gateway_port, peers, quorum_set): + def __init__(self, name, node_num, client_port, peer_port, admin_port, admin_http_gateway_port, peers, quorum_set, block_version): assert all(isinstance(peer, Peer) for peer in peers) assert isinstance(quorum_set, QuorumSet) @@ -154,6 +154,7 @@ def __init__(self, name, node_num, client_port, peer_port, admin_port, admin_htt self.peers = peers self.quorum_set = quorum_set self.minimum_fee = 400_000_000 + self.block_verison = block_version or 2 self.consensus_process = None self.ledger_distribution_process = None @@ -249,7 +250,7 @@ def start(self, network): f'--ias-api-key={IAS_API_KEY}', f'--ias-spid={IAS_SPID}', f'--origin-block-path {LEDGER_BASE}', - f'--block-version 3', + f'--block-version {self.block_version}', f'--ledger-path {self.ledger_dir}', f'--admin-listen-uri="insecure-mca://0.0.0.0:{self.admin_port}/"', f'--client-listen-uri="insecure-mc://0.0.0.0:{self.client_port}/"', @@ -434,6 +435,7 @@ def __init__(self): self.nodes = [] self.ledger_distribution = None self.cli = None + self.block_version = None try: shutil.rmtree(WORK_DIR) except FileNotFoundError: @@ -467,6 +469,7 @@ def add_node(self, name, peers, quorum_set): BASE_ADMIN_HTTP_GATEWAY_PORT + node_num, peers, quorum_set, + self.block_version, )) def get_node(self, name): @@ -539,7 +542,9 @@ def stop(self): raise - def default_entry_point(self, network_type, skip_build=False): + def default_entry_point(self, network_type, skip_build=False, block_version=None): + self.block_version = block_version + if network_type == 'dense5': # 5 node interconnected network requiring 4 out of 5 nodes. num_nodes = 5 @@ -589,6 +594,7 @@ def default_entry_point(self, network_type, skip_build=False): parser = argparse.ArgumentParser(description='Local network tester') parser.add_argument('--network-type', help='Type of network to create', required=True) parser.add_argument('--skip-build', help='Skip building binaries', action='store_true') + parser.add_argument('--block-version', help='Set the block version argument', action='store_true') args = parser.parse_args() - Network().default_entry_point(args.network_type, args.skip_build) + Network().default_entry_point(args.network_type, args.skip_build, args.block_version)