Client removal fixes
@@ -88,14 +88,10 @@ class TestNetworkSetup:
config.NETWORK_NAME = network
- if _localNodes:
config_helper = config_helper_class(config, chroot=chroot)
os.makedirs(config_helper.genesis_dir, exist_ok=True)
genesis_dir = config_helper.genesis_dir
keys_dir = config_helper.keys_dir
- else:
- genesis_dir = cls.setup_clibase_dir(config, network)
- keys_dir = os.path.join(genesis_dir, "keys")
poolLedger = cls.init_pool_ledger(appendToLedgers, genesis_dir, config)
domainLedger = cls.init_domain_ledger(appendToLedgers, genesis_dir,
@@ -183,13 +179,6 @@ class TestNetworkSetup:
def domain_ledger_file_name(cls, config):
return config.domainTransactionsFile
- @classmethod
- def setup_clibase_dir(cls, config, network_name):
- cli_base_net = os.path.join(os.path.expanduser(config.CLI_NETWORK_DIR), network_name)
- if not os.path.exists(cli_base_net):
- os.makedirs(cli_base_net, exist_ok=True)
- return cli_base_net
-
@classmethod
def bootstrapTestNodes(cls, config, startingPort, nodeParamsFileName, domainTxnFieldOrder,
config_helper_class=PConfigHelper, node_config_helper_class=PNodeConfigHelper,
@@ -256,12 +245,6 @@ class TestNetworkSetup:
steward_defs, node_defs, client_defs, n_num, nodeParamsFileName,
config_helper_class, node_config_helper_class)
- # delete unnecessary key dir in client folder
- key_dir = cls.setup_clibase_dir(config, args.network)
- key_dir = os.path.join(key_dir, "keys")
- if os.path.isdir(key_dir):
- shutil.rmtree(key_dir, ignore_errors=True)
-
@staticmethod
def _bootstrapArgsTypeNodeCount(nodesStrArg):
if not nodesStrArg.isdigit():
