Merge pull request #2950 from ethereum/mv-merkle-tests

Move `merkle/single_proof` tests to `light_client/single_merkle_proof`

tests/formats/light_client/README.md

@@ -3,5 +3,6 @@
 This series of tests provides reference test vectors for the light client sync protocol spec.
 
 Handlers:
+- `single_merkle_proof`: see [Single leaf merkle proof test format](./single_merkle_proof.md)
 - `sync`: see [Light client sync test format](./sync.md)
 - `update_ranking`: see [`LightClientUpdate` ranking test format](./update_ranking.md)

tests/formats/merkle/README.md

@@ -1,8 +0,0 @@
-# Merkle tests
-
-This series of tests provides reference test vectors for validating correct
-generation and verification of merkle proofs based on static data.
-
-Handlers:
-- `single_proof`: see [Single leaf proof test format](./single_proof.md)
-- Different types of merkle proofs may be supported in the future.

tests/generators/light_client/main.py

@@ -4,6 +4,7 @@ from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators
 
 if __name__ == "__main__":
     altair_mods = {key: 'eth2spec.test.altair.light_client.test_' + key for key in [
+        'single_merkle_proof',
         'sync',
         'update_ranking',
     ]}

tests/generators/merkle/README.md

@@ -1,6 +0,0 @@
-# Merkle
-
-The purpose of this test-generator is to provide test-vectors for validating the 
-correct merkleization of objects and corresponding merkle proofs.
-
-Test-format documentation can be found [here](../../formats/merkle/README.md).

tests/generators/merkle/main.py

@@ -1,16 +0,0 @@
-from eth2spec.test.helpers.constants import ALTAIR, BELLATRIX
-from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators
-
-
-if __name__ == "__main__":
-    altair_mods = {key: 'eth2spec.test.altair.merkle.test_' + key for key in [
-        'single_proof',
-    ]}
-    bellatrix_mods = altair_mods
-
-    all_mods = {
-        ALTAIR: altair_mods,
-        BELLATRIX: bellatrix_mods,
-    }
-
-    run_state_test_generators(runner_name="merkle", all_mods=all_mods)

tests/generators/merkle/requirements.txt

@@ -1,2 +0,0 @@
-pytest>=4.4
-../../../[generator]