From 543ec86bb93bc4ddf788fe7016c8b285cbb6cdef Mon Sep 17 00:00:00 2001 From: Alex Vlasov Date: Wed, 3 Jul 2024 07:00:08 +0400 Subject: [PATCH 1/2] Added a line about EF grant --- tests/generators/fork_choice_generated/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/generators/fork_choice_generated/README.md b/tests/generators/fork_choice_generated/README.md index e3a7d7b2f1..39d9637cfc 100644 --- a/tests/generators/fork_choice_generated/README.md +++ b/tests/generators/fork_choice_generated/README.md @@ -8,6 +8,8 @@ Preliminary research has been also performed in this [repo](https://github.com/t To simplfy adoption of the tests, we follow the test format described in the [fork choice test formats documentation](../../formats/fork_choice/README.md), with a minor exception (new check added). +This work was supported by a grant from the Ethereum Foundation. + # Pre-requisites Install requirements (preferrably, in a dedicated Python environment) From 18542666ede19bfd403d0077345955a4617936e0 Mon Sep 17 00:00:00 2001 From: Alex Vlasov Date: Wed, 3 Jul 2024 07:31:59 +0400 Subject: [PATCH 2/2] Changed viable_for_head_roots_and_weights format --- tests/core/pyspec/eth2spec/test/helpers/fork_choice.py | 9 ++++++--- tests/generators/fork_choice_generated/test_run.py | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/core/pyspec/eth2spec/test/helpers/fork_choice.py b/tests/core/pyspec/eth2spec/test/helpers/fork_choice.py index 576db928db..503a8fd88f 100644 --- a/tests/core/pyspec/eth2spec/test/helpers/fork_choice.py +++ b/tests/core/pyspec/eth2spec/test/helpers/fork_choice.py @@ -305,10 +305,13 @@ def output_store_checks(spec, store, test_steps, with_viable_for_head_weights=Fa leaves_viable_for_head = [root for root in filtered_block_roots if not any(c for c in filtered_block_roots if store.blocks[c].parent_root == root)] - viable_for_head_roots_and_weights = { - encode_hex(viable_for_head_root): int(spec.get_weight(store, viable_for_head_root)) + viable_for_head_roots_and_weights = [ + { + 'root': encode_hex(viable_for_head_root), + 'weight': int(spec.get_weight(store, viable_for_head_root)) + } for viable_for_head_root in leaves_viable_for_head - } + ] checks['viable_for_head_roots_and_weights'] = viable_for_head_roots_and_weights test_steps.append({'checks': checks}) diff --git a/tests/generators/fork_choice_generated/test_run.py b/tests/generators/fork_choice_generated/test_run.py index 7ca9a39851..f5b09c1845 100644 --- a/tests/generators/fork_choice_generated/test_run.py +++ b/tests/generators/fork_choice_generated/test_run.py @@ -121,7 +121,8 @@ def run_test(test_info): str(viable_for_head_root): int(spec.get_weight(store, viable_for_head_root)) for viable_for_head_root in leaves_viable_for_head } - assert value == viable_for_head_roots_and_weights + expected = { kv['root']: kv['weight'] for kv in value} + assert expected == viable_for_head_roots_and_weights else: assert False else: