diff --git a/tests/Cluster.py b/tests/Cluster.py index 35db607f4..ddc0f1b82 100644 --- a/tests/Cluster.py +++ b/tests/Cluster.py @@ -248,7 +248,9 @@ def launch(self, pnodes=1, unstartedNodes=0, totalNodes=1, prodCount=1, topo="me nodeosArgs += " --contracts-console" if PFSetupPolicy.hasPreactivateFeature(pfSetupPolicy): nodeosArgs += " --plugin eosio::producer_api_plugin" - + nodeosArgs += " --plugin eosio::trace_api_plugin " + if extraNodeosArgs.find("--trace-rpc-abi") == -1: + nodeosArgs += " --trace-no-abis " httpMaxResponseTimeSet = False if specificExtraNodeosArgs is not None: assert(isinstance(specificExtraNodeosArgs, dict)) diff --git a/tests/block_log_retain_blocks_test.py b/tests/block_log_retain_blocks_test.py index 0dff258fc..67a4dd716 100755 --- a/tests/block_log_retain_blocks_test.py +++ b/tests/block_log_retain_blocks_test.py @@ -56,10 +56,9 @@ specificExtraNodeosArgs={} specificExtraNodeosArgs[0]=f' --block-log-retain-blocks 0 ' specificExtraNodeosArgs[1]=f' --block-log-retain-blocks 10 ' - extraNodeosArgs=" --plugin eosio::trace_api_plugin --trace-no-abis " Print("Stand up cluster") - if cluster.launch(pnodes=pnodes, totalNodes=total_nodes, extraNodeosArgs=extraNodeosArgs, specificExtraNodeosArgs=specificExtraNodeosArgs) is False: + if cluster.launch(pnodes=pnodes, totalNodes=total_nodes, specificExtraNodeosArgs=specificExtraNodeosArgs) is False: errorExit("Failed to stand up eos cluster.") Print ("Wait for Cluster stabilization") diff --git a/tests/block_log_util_test.py b/tests/block_log_util_test.py index f68eb64cb..155ff4ed8 100755 --- a/tests/block_log_util_test.py +++ b/tests/block_log_util_test.py @@ -60,8 +60,7 @@ def verifyBlockLog(expected_block_num, trimmedBlockLog): cluster.killall(allInstances=killAll) cluster.cleanup() Print("Stand up cluster") - traceNodeosArgs=" --plugin eosio::trace_api_plugin --trace-no-abis " - if cluster.launch(prodCount=prodCount, onlyBios=False, pnodes=pnodes, totalNodes=totalNodes, totalProducers=pnodes*prodCount, useBiosBootFile=False, extraNodeosArgs=traceNodeosArgs) is False: + if cluster.launch(prodCount=prodCount, onlyBios=False, pnodes=pnodes, totalNodes=totalNodes, totalProducers=pnodes*prodCount, useBiosBootFile=False) is False: Utils.errorExit("Failed to stand up eos cluster.") Print("Validating system accounts after bootstrap") diff --git a/tests/compute_transaction_test.py b/tests/compute_transaction_test.py index baf805080..55153044f 100755 --- a/tests/compute_transaction_test.py +++ b/tests/compute_transaction_test.py @@ -73,7 +73,7 @@ Print ("producing nodes: %s, non-producing nodes: %d, topology: %s, delay between nodes launch(seconds): %d" % (pnodes, total_nodes-pnodes, topo, delay)) Print("Stand up cluster") - extraNodeosArgs=" --http-max-response-time-ms 990000 --disable-subjective-api-billing false --plugin eosio::trace_api_plugin --trace-no-abis " + extraNodeosArgs=" --http-max-response-time-ms 990000 --disable-subjective-api-billing false " if cluster.launch(pnodes=pnodes, totalNodes=total_nodes, topo=topo, delay=delay,extraNodeosArgs=extraNodeosArgs ) is False: errorExit("Failed to stand up eos cluster.") diff --git a/tests/distributed-transactions-test.py b/tests/distributed-transactions-test.py index a37d2aca2..6451813eb 100755 --- a/tests/distributed-transactions-test.py +++ b/tests/distributed-transactions-test.py @@ -74,8 +74,7 @@ (pnodes, total_nodes-pnodes, topo, delay)) Print("Stand up cluster") - traceNodeosArgs=" --plugin eosio::trace_api_plugin --trace-no-abis " - if cluster.launch(pnodes=pnodes, totalNodes=total_nodes, topo=topo, delay=delay, extraNodeosArgs=traceNodeosArgs) is False: + if cluster.launch(pnodes=pnodes, totalNodes=total_nodes, topo=topo, delay=delay) is False: errorExit("Failed to stand up eos cluster.") Print ("Wait for Cluster stabilization") diff --git a/tests/get_account_test.py b/tests/get_account_test.py index 3252297d8..764686332 100755 --- a/tests/get_account_test.py +++ b/tests/get_account_test.py @@ -73,7 +73,7 @@ Print ("producing nodes: %s, non-producing nodes: %d, topology: %s, delay between nodes launch(seconds): %d" % (pnodes, total_nodes-pnodes, topo, delay)) Print("Stand up cluster") - extraNodeosArgs=" --http-max-response-time-ms 990000 --disable-subjective-api-billing false --plugin eosio::trace_api_plugin --trace-no-abis " + extraNodeosArgs=" --http-max-response-time-ms 990000 --disable-subjective-api-billing false " if cluster.launch(pnodes=pnodes, totalNodes=total_nodes, topo=topo, delay=delay,extraNodeosArgs=extraNodeosArgs ) is False: errorExit("Failed to stand up eos cluster.") diff --git a/tests/large-lib-test.py b/tests/large-lib-test.py index 8045250f9..bc9b872ff 100755 --- a/tests/large-lib-test.py +++ b/tests/large-lib-test.py @@ -68,15 +68,13 @@ def relaunchNode(node: Node, chainArg="", skipGenesis=True, relaunchAssertMessag specificExtraNodeosArgs[2]="--read-mode speculative " Print("Stand up cluster") - traceNodeosArgs=" --plugin eosio::trace_api_plugin --trace-no-abis " if cluster.launch( pnodes=pnodes, totalNodes=total_nodes, totalProducers=1, useBiosBootFile=False, topo="mesh", - specificExtraNodeosArgs=specificExtraNodeosArgs, - extraNodeosArgs=traceNodeosArgs) is False: + specificExtraNodeosArgs=specificExtraNodeosArgs) is False: errorExit("Failed to stand up eos cluster.") producingNode=cluster.getNode(0) diff --git a/tests/launcher_test.py b/tests/launcher_test.py index a52c80a77..2e6f602b6 100755 --- a/tests/launcher_test.py +++ b/tests/launcher_test.py @@ -55,7 +55,7 @@ Print("Stand up cluster") pnodes=4 abs_path = os.path.abspath(os.getcwd() + '/unittests/contracts/eosio.token/eosio.token.abi') - traceNodeosArgs=" --plugin eosio::trace_api_plugin --trace-rpc-abi eosio.token=" + abs_path + traceNodeosArgs=" --trace-rpc-abi eosio.token=" + abs_path if cluster.launch(pnodes=pnodes, totalNodes=pnodes, extraNodeosArgs=traceNodeosArgs) is False: cmdError("launcher") errorExit("Failed to stand up eos cluster.") diff --git a/tests/light_validation_sync_test.py b/tests/light_validation_sync_test.py index d6c6f1088..45624e782 100755 --- a/tests/light_validation_sync_test.py +++ b/tests/light_validation_sync_test.py @@ -41,7 +41,6 @@ TestHelper.printSystemInfo("BEGIN") cluster.killall(allInstances=killAll) cluster.cleanup() - traceNodeosArgs = " --plugin eosio::trace_api_plugin --trace-no-abis " assert cluster.launch( pnodes=1, prodCount=1, @@ -49,7 +48,6 @@ totalNodes=2, useBiosBootFile=False, loadSystemContract=False, - extraNodeosArgs=traceNodeosArgs, specificExtraNodeosArgs={ 1:"--validation-mode light"}) diff --git a/tests/nested_container_multi_index_test.py b/tests/nested_container_multi_index_test.py index 0b86718a8..638098577 100755 --- a/tests/nested_container_multi_index_test.py +++ b/tests/nested_container_multi_index_test.py @@ -84,7 +84,7 @@ def create_action(action, data, contract_account, usr): (pnodes, total_nodes-pnodes, topo, delay)) Print("Stand up cluster") - if cluster.launch(pnodes=1, totalNodes=1, extraNodeosArgs=" --plugin eosio::trace_api_plugin --trace-no-abis ") is False: + if cluster.launch(pnodes=1, totalNodes=1) is False: errorExit("Failed to stand up eos cluster.") Print ("Wait for Cluster stabilization") diff --git a/tests/nodeos_chainbase_allocation_test.py b/tests/nodeos_chainbase_allocation_test.py index 4cc46922f..c5f2bbe2d 100755 --- a/tests/nodeos_chainbase_allocation_test.py +++ b/tests/nodeos_chainbase_allocation_test.py @@ -50,7 +50,6 @@ # The bootstrap process has created account_object and code_object (by uploading the bios contract), # key_value_object (token creation), protocol_state_object (preactivation feature), and permission_object # (automatically taken care by the automatically generated eosio account) - traceNodeosArgs = " --plugin eosio::trace_api_plugin --trace-no-abis " assert cluster.launch( pnodes=1, prodCount=1, @@ -58,7 +57,6 @@ totalNodes=2, useBiosBootFile=False, loadSystemContract=False, - extraNodeosArgs=traceNodeosArgs, specificExtraNodeosArgs={ 1:"--read-mode irreversible --plugin eosio::producer_api_plugin"}) diff --git a/tests/nodeos_contrl_c_test.py b/tests/nodeos_contrl_c_test.py index 7a873fafe..3fe9cb190 100755 --- a/tests/nodeos_contrl_c_test.py +++ b/tests/nodeos_contrl_c_test.py @@ -52,8 +52,7 @@ # producer nodes will be mapped to 0 through totalProducerNodes-1, so the number totalProducerNodes will be the non-producing node specificExtraNodeosArgs[totalProducerNodes] = "--plugin eosio::producer_plugin --plugin eosio::chain_api_plugin --plugin eosio::http_plugin " "--plugin eosio::txn_test_gen_plugin --plugin eosio::producer_api_plugin " - extraNodeosArgs = " --plugin eosio::trace_api_plugin --trace-no-abis " - extraNodeosArgs+= " --http-max-response-time-ms 990000" + extraNodeosArgs = " --http-max-response-time-ms 990000 " # *** setup topogrophy *** diff --git a/tests/nodeos_extra_packed_data_test.py b/tests/nodeos_extra_packed_data_test.py index 9a0349a9e..d11659fb5 100755 --- a/tests/nodeos_extra_packed_data_test.py +++ b/tests/nodeos_extra_packed_data_test.py @@ -81,14 +81,12 @@ if pnodes > 3: specificExtraNodeosArgs[pnodes - 2] = "" - traceNodeosArgs = " --plugin eosio::trace_api_plugin --trace-no-abis " if cluster.launch(totalNodes=pnodes, pnodes=pnodes, dontBootstrap=dontBootstrap, pfSetupPolicy=PFSetupPolicy.PREACTIVATE_FEATURE_ONLY, specificExtraNodeosArgs=specificExtraNodeosArgs, - associatedNodeLabels=associatedNodeLabels, - extraNodeosArgs=traceNodeosArgs,) is False: + associatedNodeLabels=associatedNodeLabels) is False: cmdError("launcher") errorExit("Failed to stand up eos cluster.") else: diff --git a/tests/nodeos_forked_chain_test.py b/tests/nodeos_forked_chain_test.py index 2f7a332cb..77e9954ff 100755 --- a/tests/nodeos_forked_chain_test.py +++ b/tests/nodeos_forked_chain_test.py @@ -162,7 +162,6 @@ def getMinHeadAndLib(prodNodes): specificExtraNodeosArgs={} # producer nodes will be mapped to 0 through totalProducerNodes-1, so the number totalProducerNodes will be the non-producing node specificExtraNodeosArgs[totalProducerNodes]="--plugin eosio::test_control_api_plugin" - traceNodeosArgs = " --plugin eosio::trace_api_plugin --trace-no-abis " # *** setup topogrophy *** @@ -172,7 +171,7 @@ def getMinHeadAndLib(prodNodes): if cluster.launch(prodCount=prodCount, topo="bridge", pnodes=totalProducerNodes, totalNodes=totalNodes, totalProducers=totalProducers, - useBiosBootFile=False, specificExtraNodeosArgs=specificExtraNodeosArgs, extraNodeosArgs=traceNodeosArgs) is False: + useBiosBootFile=False, specificExtraNodeosArgs=specificExtraNodeosArgs) is False: Utils.cmdError("launcher") Utils.errorExit("Failed to stand up eos cluster.") Print("Validating system accounts after bootstrap") diff --git a/tests/nodeos_high_transaction_test.py b/tests/nodeos_high_transaction_test.py index d40379431..c196b37ff 100755 --- a/tests/nodeos_high_transaction_test.py +++ b/tests/nodeos_high_transaction_test.py @@ -80,11 +80,9 @@ cluster.cleanup() Print("Stand up cluster") - traceNodeosArgs = " --plugin eosio::trace_api_plugin --trace-no-abis " if cluster.launch(pnodes=totalProducerNodes, totalNodes=totalNodes, totalProducers=totalProducers, - useBiosBootFile=False, - extraNodeosArgs=traceNodeosArgs, topo="ring") is False: + useBiosBootFile=False, topo="ring") is False: Utils.cmdError("launcher") Utils.errorExit("Failed to stand up eos cluster.") diff --git a/tests/nodeos_irreversible_mode_test.py b/tests/nodeos_irreversible_mode_test.py index cd71720e6..3e355f379 100755 --- a/tests/nodeos_irreversible_mode_test.py +++ b/tests/nodeos_irreversible_mode_test.py @@ -170,7 +170,6 @@ def relaunchNode(node: Node, chainArg="", addSwapFlags=None, relaunchAssertMessa TestHelper.printSystemInfo("BEGIN") cluster.killall(allInstances=killAll) cluster.cleanup() - traceNodeosArgs = " --plugin eosio::trace_api_plugin --trace-no-abis " cluster.launch( prodCount=numOfProducers, totalProducers=numOfProducers, @@ -178,7 +177,6 @@ def relaunchNode(node: Node, chainArg="", addSwapFlags=None, relaunchAssertMessa pnodes=1, useBiosBootFile=False, topo="mesh", - extraNodeosArgs=traceNodeosArgs, specificExtraNodeosArgs={ 0:"--enable-stale-production", 4:"--read-mode irreversible", diff --git a/tests/nodeos_multiple_version_protocol_feature_test.py b/tests/nodeos_multiple_version_protocol_feature_test.py index bf1c4a2d0..cfee676fc 100755 --- a/tests/nodeos_multiple_version_protocol_feature_test.py +++ b/tests/nodeos_multiple_version_protocol_feature_test.py @@ -94,7 +94,7 @@ def hasBlockBecomeIrr(): # version 1.7 did not provide a default value for "--last-block-time-offset-us" so this is needed to # avoid dropping late blocks assert cluster.launch(pnodes=4, totalNodes=4, prodCount=1, totalProducers=4, - extraNodeosArgs=" --plugin eosio::producer_api_plugin --plugin eosio::trace_api_plugin --trace-no-abis", + extraNodeosArgs=" --plugin eosio::producer_api_plugin ", useBiosBootFile=False, specificExtraNodeosArgs={ 0:"--http-max-response-time-ms 990000", diff --git a/tests/nodeos_producer_watermark_test.py b/tests/nodeos_producer_watermark_test.py index 0df2a292a..f1eb9db80 100755 --- a/tests/nodeos_producer_watermark_test.py +++ b/tests/nodeos_producer_watermark_test.py @@ -181,8 +181,7 @@ def verifyProductionRounds(trans, node, prodsActive, rounds): cluster.killall(allInstances=killAll) cluster.cleanup() Print("Stand up cluster") - traceNodeosArgs = " --plugin eosio::trace_api_plugin --trace-no-abis " - if cluster.launch(prodCount=prodCount, onlyBios=False, pnodes=totalNodes, totalNodes=totalNodes, totalProducers=totalNodes, useBiosBootFile=False, onlySetProds=True, sharedProducers=1, extraNodeosArgs=traceNodeosArgs) is False: + if cluster.launch(prodCount=prodCount, onlyBios=False, pnodes=totalNodes, totalNodes=totalNodes, totalProducers=totalNodes, useBiosBootFile=False, onlySetProds=True, sharedProducers=1) is False: Utils.cmdError("launcher") Utils.errorExit("Failed to stand up eos cluster.") diff --git a/tests/nodeos_read_terminate_at_block_test.py b/tests/nodeos_read_terminate_at_block_test.py index 05988bbe7..29bee42e9 100755 --- a/tests/nodeos_read_terminate_at_block_test.py +++ b/tests/nodeos_read_terminate_at_block_test.py @@ -219,7 +219,6 @@ def checkHeadOrSpeculative(head, lib): 2 : "--read-mode speculative --terminate-at-block=550", 3 : "--read-mode head --terminate-at-block=850", } - traceNodeosArgs = " --plugin eosio::trace_api_plugin --trace-no-abis " # Kill any existing instances and launch cluster TestHelper.printSystemInfo("BEGIN") @@ -234,7 +233,6 @@ def checkHeadOrSpeculative(head, lib): useBiosBootFile=False, topo="mesh", specificExtraNodeosArgs=specificNodeosArgs, - extraNodeosArgs=traceNodeosArgs ) producingNodeId = 0 diff --git a/tests/nodeos_retry_transaction_test.py b/tests/nodeos_retry_transaction_test.py index 2764ae51b..ce71beadf 100755 --- a/tests/nodeos_retry_transaction_test.py +++ b/tests/nodeos_retry_transaction_test.py @@ -88,11 +88,9 @@ } # topo=ring all nodes are connected in a ring but also to the bios node - traceNodeosArgs=' --plugin eosio::trace_api_plugin --trace-no-abis ' if cluster.launch(pnodes=totalProducerNodes, totalNodes=totalNodes, totalProducers=totalProducers, topo="ring", specificExtraNodeosArgs=specificExtraNodeosArgs, - extraNodeosArgs=traceNodeosArgs, useBiosBootFile=False) is False: Utils.cmdError("launcher") Utils.errorExit("Failed to stand up eos cluster.") diff --git a/tests/nodeos_run_remote_test.py b/tests/nodeos_run_remote_test.py index d971c93de..1c984df0f 100755 --- a/tests/nodeos_run_remote_test.py +++ b/tests/nodeos_run_remote_test.py @@ -47,7 +47,7 @@ Print("Stand up cluster") abs_path = os.path.abspath(os.getcwd() + '/unittests/contracts/eosio.token/eosio.token.abi') - traceNodeosArgs = " --plugin eosio::trace_api_plugin --trace-rpc-abi eosio.token=" + abs_path + traceNodeosArgs = " --trace-rpc-abi eosio.token=" + abs_path if cluster.launch(pnodes=pnodes, totalNodes=total_nodes, prodCount=prodCount, topo=topo, delay=delay, onlyBios=onlyBios, extraNodeosArgs=traceNodeosArgs) is False: errorExit("Failed to stand up eos cluster.") diff --git a/tests/nodeos_run_test.py b/tests/nodeos_run_test.py index 58ab1ee29..65245db87 100755 --- a/tests/nodeos_run_test.py +++ b/tests/nodeos_run_test.py @@ -69,7 +69,7 @@ Print("Stand up cluster") abs_path = os.path.abspath(os.getcwd() + '/unittests/contracts/eosio.token/eosio.token.abi') - traceNodeosArgs=" --http-max-response-time-ms 990000 --plugin eosio::trace_api_plugin --trace-rpc-abi eosio.token=" + abs_path + traceNodeosArgs=" --http-max-response-time-ms 990000 --trace-rpc-abi eosio.token=" + abs_path if cluster.launch(prodCount=prodCount, onlyBios=onlyBios, dontBootstrap=dontBootstrap, extraNodeosArgs=traceNodeosArgs) is False: cmdError("launcher") errorExit("Failed to stand up eos cluster.") diff --git a/tests/nodeos_short_fork_take_over_test.py b/tests/nodeos_short_fork_take_over_test.py index 382deecc5..1c3968710 100755 --- a/tests/nodeos_short_fork_take_over_test.py +++ b/tests/nodeos_short_fork_take_over_test.py @@ -149,7 +149,6 @@ def getMinHeadAndLib(prodNodes): specificExtraNodeosArgs={} # producer nodes will be mapped to 0 through totalProducerNodes-1, so the number totalProducerNodes will be the non-producing node specificExtraNodeosArgs[totalProducerNodes]="--plugin eosio::test_control_api_plugin" - traceNodeosArgs = " --plugin eosio::trace_api_plugin --trace-no-abis " # *** setup topogrophy *** @@ -157,7 +156,7 @@ def getMinHeadAndLib(prodNodes): # "bridge" shape connects defprocera through defproducerk (in node0) to each other and defproducerl through defproduceru (in node01) # and the only connection between those 2 groups is through the bridge node if cluster.launch(prodCount=2, topo="bridge", pnodes=totalProducerNodes, - totalNodes=totalNodes, totalProducers=totalProducers, extraNodeosArgs=traceNodeosArgs, + totalNodes=totalNodes, totalProducers=totalProducers, useBiosBootFile=False, specificExtraNodeosArgs=specificExtraNodeosArgs, onlySetProds=True) is False: Utils.cmdError("launcher") Utils.errorExit("Failed to stand up eos cluster.") diff --git a/tests/nodeos_startup_catchup.py b/tests/nodeos_startup_catchup.py index 08d1b47a9..9419869d3 100755 --- a/tests/nodeos_startup_catchup.py +++ b/tests/nodeos_startup_catchup.py @@ -71,10 +71,9 @@ txnGenNodeNum=pnodes # next node after producer nodes for nodeNum in range(txnGenNodeNum, txnGenNodeNum+startedNonProdNodes): specificExtraNodeosArgs[nodeNum]="--plugin eosio::txn_test_gen_plugin --txn-test-gen-account-prefix txntestacct" - traceNodeosArgs = " --plugin eosio::trace_api_plugin --trace-no-abis " Print("Stand up cluster") if cluster.launch(prodCount=prodCount, onlyBios=False, pnodes=pnodes, totalNodes=totalNodes, totalProducers=pnodes*prodCount, - useBiosBootFile=False, specificExtraNodeosArgs=specificExtraNodeosArgs, unstartedNodes=catchupCount, loadSystemContract=False, extraNodeosArgs=traceNodeosArgs) is False: + useBiosBootFile=False, specificExtraNodeosArgs=specificExtraNodeosArgs, unstartedNodes=catchupCount, loadSystemContract=False) is False: Utils.errorExit("Failed to stand up eos cluster.") Print("Validating system accounts after bootstrap") diff --git a/tests/nodeos_under_min_avail_ram.py b/tests/nodeos_under_min_avail_ram.py index 42603e25a..533dfe6cb 100755 --- a/tests/nodeos_under_min_avail_ram.py +++ b/tests/nodeos_under_min_avail_ram.py @@ -56,7 +56,7 @@ minRAMValue=1002 maxRAMFlag="--chain-state-db-size-mb" maxRAMValue=1010 - extraNodeosArgs=" %s %d %s %d --http-max-response-time-ms 990000 --plugin eosio::trace_api_plugin --trace-no-abis " % (minRAMFlag, minRAMValue, maxRAMFlag, maxRAMValue) + extraNodeosArgs=" %s %d %s %d --http-max-response-time-ms 990000 " % (minRAMFlag, minRAMValue, maxRAMFlag, maxRAMValue) if cluster.launch(onlyBios=False, pnodes=totalNodes, totalNodes=totalNodes, totalProducers=totalNodes, extraNodeosArgs=extraNodeosArgs, useBiosBootFile=False) is False: Utils.cmdError("launcher") errorExit("Failed to stand up eos cluster.") diff --git a/tests/nodeos_voting_test.py b/tests/nodeos_voting_test.py index cd734bfa9..a84dfdced 100755 --- a/tests/nodeos_voting_test.py +++ b/tests/nodeos_voting_test.py @@ -174,8 +174,7 @@ def verifyProductionRounds(trans, node, prodsActive, rounds): cluster.killall(allInstances=killAll) cluster.cleanup() Print("Stand up cluster") - traceNodeosArgs = " --plugin eosio::trace_api_plugin --trace-no-abis " - if cluster.launch(prodCount=prodCount, onlyBios=False, pnodes=totalNodes, totalNodes=totalNodes, totalProducers=totalNodes*21, useBiosBootFile=False, extraNodeosArgs=traceNodeosArgs) is False: + if cluster.launch(prodCount=prodCount, onlyBios=False, pnodes=totalNodes, totalNodes=totalNodes, totalProducers=totalNodes*21, useBiosBootFile=False) is False: Utils.cmdError("launcher") Utils.errorExit("Failed to stand up eos cluster.") diff --git a/tests/p2p_high_latency_test.py b/tests/p2p_high_latency_test.py index 4b2cad473..14b7f2e34 100644 --- a/tests/p2p_high_latency_test.py +++ b/tests/p2p_high_latency_test.py @@ -72,7 +72,7 @@ def exec(cmd): TestHelper.printSystemInfo("BEGIN") cluster.killall(allInstances=killAll) cluster.cleanup() - traceNodeosArgs=" --plugin eosio::trace_api_plugin --trace-no-abis --plugin eosio::producer_plugin --produce-time-offset-us 0 --last-block-time-offset-us 0 --cpu-effort-percent 100 \ + traceNodeosArgs=" --plugin eosio::producer_plugin --produce-time-offset-us 0 --last-block-time-offset-us 0 --cpu-effort-percent 100 \ --last-block-cpu-effort-percent 100 --producer-threads 1 --plugin eosio::net_plugin --net-threads 1" if cluster.launch(pnodes=1, totalNodes=totalNodes, totalProducers=1, useBiosBootFile=False, specificExtraNodeosArgs=specificExtraNodeosArgs, extraNodeosArgs=traceNodeosArgs) is False: Utils.cmdError("launcher") diff --git a/tests/prod_preactivation_test.py b/tests/prod_preactivation_test.py index 2fb906935..6f61f35b2 100755 --- a/tests/prod_preactivation_test.py +++ b/tests/prod_preactivation_test.py @@ -62,10 +62,9 @@ cluster.killall(allInstances=killAll) cluster.cleanup() Print("Stand up cluster") - traceNodeosArgs=" --plugin eosio::trace_api_plugin --trace-no-abis " if cluster.launch(pnodes=prodCount, totalNodes=prodCount, prodCount=1, onlyBios=onlyBios, dontBootstrap=dontBootstrap, useBiosBootFile=False, - pfSetupPolicy=PFSetupPolicy.NONE, extraNodeosArgs=" --plugin eosio::producer_api_plugin --http-max-response-time-ms 990000 " + traceNodeosArgs) is False: + pfSetupPolicy=PFSetupPolicy.NONE, extraNodeosArgs=" --plugin eosio::producer_api_plugin --http-max-response-time-ms 990000 ") is False: cmdError("launcher") errorExit("Failed to stand up eos cluster.") diff --git a/tests/restart-scenarios-test.py b/tests/restart-scenarios-test.py index b48a53cff..b7d1ccc58 100755 --- a/tests/restart-scenarios-test.py +++ b/tests/restart-scenarios-test.py @@ -59,8 +59,7 @@ pnodes, topo, delay, chainSyncStrategyStr)) Print("Stand up cluster") - traceNodeosArgs=" --plugin eosio::trace_api_plugin --trace-no-abis " - if cluster.launch(pnodes=pnodes, totalNodes=total_nodes, topo=topo, delay=delay, extraNodeosArgs=traceNodeosArgs) is False: + if cluster.launch(pnodes=pnodes, totalNodes=total_nodes, topo=topo, delay=delay) is False: errorExit("Failed to stand up eos cluster.") Print ("Wait for Cluster stabilization") diff --git a/tests/ship_streamer_test.py b/tests/ship_streamer_test.py index c6611190c..0fbb2fcb2 100755 --- a/tests/ship_streamer_test.py +++ b/tests/ship_streamer_test.py @@ -64,11 +64,10 @@ # non-producing nodes are at the end of the cluster's nodes, so reserving the last one for state_history_plugin shipNodeNum = totalNodes - 1 specificExtraNodeosArgs[shipNodeNum]="--plugin eosio::state_history_plugin --disable-replay-opts --trace-history --sync-fetch-span 200 --plugin eosio::net_api_plugin " - traceNodeosArgs=" --plugin eosio::trace_api_plugin --trace-no-abis " if cluster.launch(pnodes=totalProducerNodes, totalNodes=totalNodes, totalProducers=totalProducers, - useBiosBootFile=False, specificExtraNodeosArgs=specificExtraNodeosArgs, extraNodeosArgs=traceNodeosArgs) is False: + useBiosBootFile=False, specificExtraNodeosArgs=specificExtraNodeosArgs) is False: Utils.cmdError("launcher") Utils.errorExit("Failed to stand up eos cluster.") diff --git a/tests/ship_test.py b/tests/ship_test.py index fbeb4c855..15d335dd4 100755 --- a/tests/ship_test.py +++ b/tests/ship_test.py @@ -68,14 +68,13 @@ # non-producing nodes are at the end of the cluster's nodes, so reserving the last one for state_history_plugin shipNodeNum = totalNodes - 1 specificExtraNodeosArgs[shipNodeNum]="--plugin eosio::state_history_plugin --disable-replay-opts --sync-fetch-span 200 --plugin eosio::net_api_plugin " - traceNodeosArgs=" --plugin eosio::trace_api_plugin --trace-no-abis " if args.unix_socket: specificExtraNodeosArgs[shipNodeNum] += "--state-history-unix-socket-path ship.sock" if cluster.launch(pnodes=totalProducerNodes, totalNodes=totalNodes, totalProducers=totalProducers, - useBiosBootFile=False, specificExtraNodeosArgs=specificExtraNodeosArgs, extraNodeosArgs=traceNodeosArgs) is False: + useBiosBootFile=False, specificExtraNodeosArgs=specificExtraNodeosArgs) is False: Utils.cmdError("launcher") Utils.errorExit("Failed to stand up eos cluster.") diff --git a/tests/subjective_billing_test.py b/tests/subjective_billing_test.py index 342869f93..0afffa522 100755 --- a/tests/subjective_billing_test.py +++ b/tests/subjective_billing_test.py @@ -77,7 +77,7 @@ Print("Stand up cluster") if cluster.launch(pnodes=pnodes, totalNodes=total_nodes, topo=topo, delay=delay, - extraNodeosArgs=" --http-max-response-time-ms 990000 --disable-subjective-api-billing false --plugin eosio::trace_api_plugin --trace-no-abis ", + extraNodeosArgs=" --http-max-response-time-ms 990000 --disable-subjective-api-billing false ", specificExtraNodeosArgs=specificArgs ) is False: errorExit("Failed to stand up eos cluster.") diff --git a/tests/terminate-scenarios-test.py b/tests/terminate-scenarios-test.py index d7e4adede..0e3fe5aa1 100755 --- a/tests/terminate-scenarios-test.py +++ b/tests/terminate-scenarios-test.py @@ -61,8 +61,7 @@ pnodes, topo, delay, chainSyncStrategyStr)) Print("Stand up cluster") - traceNodeosArgs=" --plugin eosio::trace_api_plugin --trace-no-abis " - if cluster.launch(pnodes=pnodes, totalNodes=total_nodes, topo=topo, delay=delay, extraNodeosArgs=traceNodeosArgs) is False: + if cluster.launch(pnodes=pnodes, totalNodes=total_nodes, topo=topo, delay=delay) is False: errorExit("Failed to stand up eos cluster.") Print ("Wait for Cluster stabilization") diff --git a/tests/trace_plugin_test.py b/tests/trace_plugin_test.py index c084fc18f..873424862 100755 --- a/tests/trace_plugin_test.py +++ b/tests/trace_plugin_test.py @@ -32,7 +32,7 @@ def cleanEnv(self, shouldCleanup: bool) : def startEnv(self) : account_names = ["alice", "bob", "charlie"] abs_path = os.path.abspath(os.getcwd() + '/unittests/contracts/eosio.token/eosio.token.abi') - traceNodeosArgs = " --plugin eosio::trace_api_plugin --trace-rpc-abi eosio.token=" + abs_path + traceNodeosArgs = " --trace-rpc-abi eosio.token=" + abs_path self.cluster.launch(totalNodes=1, extraNodeosArgs=traceNodeosArgs) self.walletMgr.launch() testWalletName="testwallet" diff --git a/tests/trx_finality_status_forked_test.py b/tests/trx_finality_status_forked_test.py index 4063539d4..768b5b1b7 100755 --- a/tests/trx_finality_status_forked_test.py +++ b/tests/trx_finality_status_forked_test.py @@ -71,7 +71,6 @@ failure_duration = 360 extraNodeosArgs=" --transaction-finality-status-max-storage-size-gb 1 " + \ f"--transaction-finality-status-success-duration-sec {successDuration} --transaction-finality-status-failure-duration-sec {failure_duration}" - extraNodeosArgs+=" --plugin eosio::trace_api_plugin --trace-no-abis" extraNodeosArgs+=" --http-max-response-time-ms 990000" diff --git a/tests/trx_finality_status_test.py b/tests/trx_finality_status_test.py index b8811ca5a..4980161e8 100755 --- a/tests/trx_finality_status_test.py +++ b/tests/trx_finality_status_test.py @@ -70,7 +70,6 @@ failure_duration = 40 extraNodeosArgs=" --transaction-finality-status-max-storage-size-gb 1 " + \ f"--transaction-finality-status-success-duration-sec {successDuration} --transaction-finality-status-failure-duration-sec {failure_duration}" - extraNodeosArgs+=" --plugin eosio::trace_api_plugin --trace-no-abis" extraNodeosArgs+=" --http-max-response-time-ms 990000" if cluster.launch(prodCount=prodCount, onlyBios=False, pnodes=pnodes, totalNodes=totalNodes, totalProducers=pnodes*prodCount, useBiosBootFile=False, topo="line", extraNodeosArgs=extraNodeosArgs) is False: