From a010ef206146535a9e1b7e2ed37e4ff86b915c8c Mon Sep 17 00:00:00 2001 From: tersec Date: Mon, 9 Nov 2020 17:44:18 +0000 Subject: [PATCH] update tests from v1.0.0-rc.0 to v1.0.0 (#1976) --- README.md | 2 +- beacon_chain.nimble | 4 ++-- beacon_chain/spec/datatypes.nim | 2 +- beacon_chain/spec/presets.nim | 4 ++-- beacon_chain/spec/presets/{v1_0_0-rc_0 => v1_0_0}/mainnet.nim | 0 beacon_chain/spec/presets/{v1_0_0-rc_0 => v1_0_0}/minimal.nim | 0 docs/the_nimbus_book/src/intro.md | 2 +- scripts/run_ssz_fuzzing_test.nims | 2 +- tests/official/test_fixture_rewards.nim | 2 +- vendor/nim-eth2-scenarios | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename beacon_chain/spec/presets/{v1_0_0-rc_0 => v1_0_0}/mainnet.nim (100%) rename beacon_chain/spec/presets/{v1_0_0-rc_0 => v1_0_0}/minimal.nim (100%) diff --git a/README.md b/README.md index e0157f7d8..03ba3a723 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ See [this page](https://status-im.github.io/nimbus-eth2/medalla.html) for how to ## Related projects * [status-im/nimbus-eth1](https://github.com/status-im/nimbus-eth1/): Nimbus for Ethereum 1 -* [ethereum/eth2.0-specs](https://github.com/ethereum/eth2.0-specs/tree/v1.0.0-rc.0#phase-0): Serenity specification that this project implements +* [ethereum/eth2.0-specs](https://github.com/ethereum/eth2.0-specs/tree/v1.0.0#phase-0): Serenity specification that this project implements You can check where the beacon chain fits in the Ethereum ecosystem our Two-Point-Oh series: https://our.status.im/tag/two-point-oh/ diff --git a/beacon_chain.nimble b/beacon_chain.nimble index 7690258b8..29483f62e 100644 --- a/beacon_chain.nimble +++ b/beacon_chain.nimble @@ -65,7 +65,7 @@ task test, "Run all tests": buildAndRunBinary "test_fixture_const_sanity_check", "tests/official/", """-d:const_preset=mainnet -d:ETH2_SPEC="v1.0.0" -d:chronicles_sinks="json[file]"""" # Generic SSZ test, doesn't use consensus objects minimal/mainnet presets - buildAndRunBinary "test_fixture_ssz_generic_types", "tests/official/", """-d:chronicles_log_level=TRACE -d:chronicles_sinks="json[file]"""" + buildAndRunBinary "test_fixture_ssz_generic_types", "tests/official/", """-d:ETH2_SPEC="v1.0.0" -d:chronicles_log_level=TRACE -d:chronicles_sinks="json[file]"""" # Consensus object SSZ tests # v0.12.3 is reasonably covered by rest of SSZ fixture tests and lack of @@ -73,7 +73,7 @@ task test, "Run all tests": buildAndRunBinary "test_fixture_ssz_consensus_objects", "tests/official/", """-d:chronicles_log_level=TRACE -d:const_preset=mainnet -d:ETH2_SPEC="v1.0.0" -d:chronicles_sinks="json[file]"""" # EF tests - buildAndRunBinary "all_fixtures_require_ssz", "tests/official/", """-d:chronicles_log_level=TRACE -d:const_preset=mainnet -d:ETH2_SPEC="v0.12.3" -d:chronicles_sinks="json[file]"""" + buildAndRunBinary "all_fixtures_require_ssz", "tests/official/", """-d:chronicles_log_level=TRACE -d:const_preset=mainnet -d:ETH2_SPEC="v1.0.0" -d:chronicles_sinks="json[file]"""" # Mainnet config buildAndRunBinary "proto_array", "beacon_chain/fork_choice/", """-d:const_preset=mainnet -d:ETH2_SPEC="v0.12.3" -d:chronicles_sinks="json[file]"""" diff --git a/beacon_chain/spec/datatypes.nim b/beacon_chain/spec/datatypes.nim index 86aed5acc..22d0a408d 100644 --- a/beacon_chain/spec/datatypes.nim +++ b/beacon_chain/spec/datatypes.nim @@ -51,7 +51,7 @@ export when ETH2_SPEC == "v0.12.3": const SPEC_VERSION* = "0.12.3" else: - const SPEC_VERSION* = "1.0.0-rc.0" + const SPEC_VERSION* = "1.0.0" ## Spec version we're aiming to be compatible with, right now const diff --git a/beacon_chain/spec/presets.nim b/beacon_chain/spec/presets.nim index 010c3b9e9..15cefe53a 100644 --- a/beacon_chain/spec/presets.nim +++ b/beacon_chain/spec/presets.nim @@ -153,7 +153,7 @@ when const_preset == "mainnet": when ETH2_SPEC == "v0.12.3": import ./presets/v0_12_3/mainnet else: - import ./presets/v1_0_0-rc_0/mainnet + import ./presets/v1_0_0/mainnet export mainnet elif const_preset == "minimal": @@ -161,7 +161,7 @@ elif const_preset == "minimal": when ETH2_SPEC == "v0.12.3": import ./presets/v0_12_3/minimal else: - import ./presets/v1_0_0-rc_0/minimal + import ./presets/v1_0_0/minimal export minimal else: diff --git a/beacon_chain/spec/presets/v1_0_0-rc_0/mainnet.nim b/beacon_chain/spec/presets/v1_0_0/mainnet.nim similarity index 100% rename from beacon_chain/spec/presets/v1_0_0-rc_0/mainnet.nim rename to beacon_chain/spec/presets/v1_0_0/mainnet.nim diff --git a/beacon_chain/spec/presets/v1_0_0-rc_0/minimal.nim b/beacon_chain/spec/presets/v1_0_0/minimal.nim similarity index 100% rename from beacon_chain/spec/presets/v1_0_0-rc_0/minimal.nim rename to beacon_chain/spec/presets/v1_0_0/minimal.nim diff --git a/docs/the_nimbus_book/src/intro.md b/docs/the_nimbus_book/src/intro.md index d3a70f468..0dd9eb3ff 100644 --- a/docs/the_nimbus_book/src/intro.md +++ b/docs/the_nimbus_book/src/intro.md @@ -11,7 +11,7 @@ This book explains all the ways in which you can use Nimbus to either monitor th ### Helpful resources - [nimbus-eth2 repository](github.com/status-im/nimbus-eth2) -- [eth2 specification](https://github.com/ethereum/eth2.0-specs/tree/v1.0.0-rc.0#phase-0) +- [eth2 specification](https://github.com/ethereum/eth2.0-specs/tree/v1.0.0#phase-0) - [Ben Edgington's annotated spec](https://benjaminion.xyz/eth2-annotated-spec/phase0/beacon-chain/) - [Vitalik's annotated spec](https://github.com/ethereum/annotated-spec/blob/master/phase0/beacon-chain.md) diff --git a/scripts/run_ssz_fuzzing_test.nims b/scripts/run_ssz_fuzzing_test.nims index 1a3a74fa8..c82a32fd4 100644 --- a/scripts/run_ssz_fuzzing_test.nims +++ b/scripts/run_ssz_fuzzing_test.nims @@ -4,7 +4,7 @@ import testutils/fuzzing_engines const gitRoot = thisDir() / ".." - fixturesDir = gitRoot / "vendor" / "nim-eth2-scenarios" / "tests-v1.0.0-rc.0" / "mainnet" / "phase0" / "ssz_static" + fixturesDir = gitRoot / "vendor" / "nim-eth2-scenarios" / "tests-v1.0.0" / "mainnet" / "phase0" / "ssz_static" fuzzingTestsDir = gitRoot / "tests" / "fuzzing" fuzzingCorpusesDir = fuzzingTestsDir / "corpus" diff --git a/tests/official/test_fixture_rewards.nim b/tests/official/test_fixture_rewards.nim index ef6d8e5c8..21deaa30d 100644 --- a/tests/official/test_fixture_rewards.nim +++ b/tests/official/test_fixture_rewards.nim @@ -25,7 +25,7 @@ const RewardsDirLeak = RewardsDirBase/"leak"/"pyspec_tests" RewardsDirRandom = RewardsDirBase/"random"/"pyspec_tests" -# https://github.com/ethereum/eth2.0-specs/tree/v1.0.0-rc.0/tests/formats/rewards#rewards-tests +# https://github.com/ethereum/eth2.0-specs/tree/v1.0.0/tests/formats/rewards#rewards-tests type Deltas = object rewards: List[uint64, Limit VALIDATOR_REGISTRY_LIMIT] penalties: List[uint64, Limit VALIDATOR_REGISTRY_LIMIT] diff --git a/vendor/nim-eth2-scenarios b/vendor/nim-eth2-scenarios index 851651972..0055e3343 160000 --- a/vendor/nim-eth2-scenarios +++ b/vendor/nim-eth2-scenarios @@ -1 +1 @@ -Subproject commit 8516519728cfae4b44d0a9faea956352a4a417e7 +Subproject commit 0055e33435a26fddbfbbf467a0290ee839f868b2