From 53e1e681182107c833a43a08606a9147d41731c2 Mon Sep 17 00:00:00 2001 From: Kevin Heifner Date: Fri, 14 Feb 2025 15:43:18 -0600 Subject: [PATCH 1/3] GH-1151 Test reducing max_transaction_cpu_usage from 475ms to 150ms in integration tests to match eos mainnet value --- tests/TestHarness/launcher.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/TestHarness/launcher.py b/tests/TestHarness/launcher.py index 548c331f65..96b35baea0 100644 --- a/tests/TestHarness/launcher.py +++ b/tests/TestHarness/launcher.py @@ -324,7 +324,7 @@ def generate(self): }.get(self.args.shape, self.make_custom)() if not self.args.nogen: - genesis = self.init_genesis() + genesis = selfinit_genesis() for node_name, node in self.network.nodes.items(): node.config_dir_name.mkdir(parents=True, exist_ok=True) self.write_logging_config_file(node) @@ -367,7 +367,7 @@ def init_genesis(self): 'context_free_discount_net_usage_den': 100, 'max_block_cpu_usage': 500000 if self.args.max_block_cpu_usage is None else self.args.max_block_cpu_usage, 'target_block_cpu_usage_pct': 1000, - 'max_transaction_cpu_usage': 475000 if self.args.max_transaction_cpu_usage is None else self.args.max_transaction_cpu_usage, + 'max_transaction_cpu_usage': 150000 if self.args.max_transaction_cpu_usage is None else self.args.max_transaction_cpu_usage, 'min_transaction_cpu_usage': 100, 'max_transaction_lifetime': 3600, 'deferred_trx_expiration_window': 600, From 4637ee5deeb8393d5f50b533a9c8c49d65740116 Mon Sep 17 00:00:00 2001 From: Kevin Heifner Date: Fri, 14 Feb 2025 16:05:41 -0600 Subject: [PATCH 2/3] GH-1151 Add back accidental delete of character --- tests/TestHarness/launcher.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestHarness/launcher.py b/tests/TestHarness/launcher.py index 96b35baea0..5e5c4cfb8f 100644 --- a/tests/TestHarness/launcher.py +++ b/tests/TestHarness/launcher.py @@ -324,7 +324,7 @@ def generate(self): }.get(self.args.shape, self.make_custom)() if not self.args.nogen: - genesis = selfinit_genesis() + genesis = self.init_genesis() for node_name, node in self.network.nodes.items(): node.config_dir_name.mkdir(parents=True, exist_ok=True) self.write_logging_config_file(node) From 1317de9bef134d3c4c7310927aa1d6f4e77ce609 Mon Sep 17 00:00:00 2001 From: Kevin Heifner Date: Mon, 17 Feb 2025 06:21:32 -0600 Subject: [PATCH 3/3] GH-1151 Use current EOS Mainnet values --- tests/TestHarness/launcher.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/TestHarness/launcher.py b/tests/TestHarness/launcher.py index 5e5c4cfb8f..b94ce813d1 100644 --- a/tests/TestHarness/launcher.py +++ b/tests/TestHarness/launcher.py @@ -359,22 +359,22 @@ def init_genesis(self): 'initial_key': self.network.nodes['bios'].keys[0].pubkey, 'initial_configuration': { 'max_block_net_usage': 1048576, - 'target_block_net_usage_pct': 1000, + 'target_block_net_usage_pct': 10000, 'max_transaction_net_usage': 524288, 'base_per_transaction_net_usage': 12, 'net_usage_leeway': 500, 'context_free_discount_net_usage_num': 20, 'context_free_discount_net_usage_den': 100, - 'max_block_cpu_usage': 500000 if self.args.max_block_cpu_usage is None else self.args.max_block_cpu_usage, - 'target_block_cpu_usage_pct': 1000, + 'max_block_cpu_usage': 200000 if self.args.max_block_cpu_usage is None else self.args.max_block_cpu_usage, + 'target_block_cpu_usage_pct': 10, 'max_transaction_cpu_usage': 150000 if self.args.max_transaction_cpu_usage is None else self.args.max_transaction_cpu_usage, 'min_transaction_cpu_usage': 100, 'max_transaction_lifetime': 3600, 'deferred_trx_expiration_window': 600, 'max_transaction_delay': 3888000, - 'max_inline_action_size': 524288, - 'max_inline_action_depth': 4, - 'max_authority_depth': 6 + 'max_inline_action_size': 524287, + 'max_inline_action_depth': 10, + 'max_authority_depth': 10 } } else: