status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use the new nim-eth2-scenarios path for the test vectors

This commit is contained in:
Mamy André-Ratsimbazafy 2020-02-14 11:29:45 +01:00 committed by tersec
parent 59bfc1c7b5
commit 37446302b2
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/setup_official_tests.sh
View File

@ -9,7 +9,7 @@
set -e set -e
SUBREPO_DIR="tests/official/fixtures" SUBREPO_DIR="vendor/nim-eth2-scenarios"
# verbosity level # verbosity level
[[ -z "$V" ]] && V=0 [[ -z "$V" ]] && V=0
[[ -z "$BUILD_MSG" ]] && BUILD_MSG="Downloading official test vectors" [[ -z "$BUILD_MSG" ]] && BUILD_MSG="Downloading official test vectors"

2
tests/official/fixtures_utils.nim
View File

@ -35,7 +35,7 @@ proc readValue*(r: var JsonReader, a: var seq[byte]) {.inline.} =
# Test helpers # Test helpers
const const
FixturesDir* = currentSourcePath.rsplit(DirSep, 1)[0] / "fixtures" FixturesDir* = currentSourcePath.rsplit(DirSep, 1)[0] / ".." / ".." / "vendor" / "nim-eth2-scenarios"
SszTestsDir* = FixturesDir/"tests-v0.10.1" SszTestsDir* = FixturesDir/"tests-v0.10.1"
proc parseTest*(path: string, Format: typedesc[Json or SSZ], T: typedesc): T = proc parseTest*(path: string, Format: typedesc[Json or SSZ], T: typedesc): T =

3
tests/official/test_fixture_const_sanity_check.nim
View File

@ -14,12 +14,11 @@ import
# Internals # Internals
../../beacon_chain/spec/[datatypes, digest], ../../beacon_chain/spec/[datatypes, digest],
# Test utilities # Test utilities
../testutil ../testutil, ./fixtures_utils
const const
SpecDir = currentSourcePath.rsplit(DirSep, 1)[0] / SpecDir = currentSourcePath.rsplit(DirSep, 1)[0] /
".."/".."/"beacon_chain"/"spec" ".."/".."/"beacon_chain"/"spec"
FixturesDir = currentSourcePath.rsplit(DirSep, 1)[0] / "fixtures"
Config = FixturesDir/"tests-v0.10.1"/const_preset/"config.yaml" Config = FixturesDir/"tests-v0.10.1"/const_preset/"config.yaml"
type type

3
tests/official/test_fixture_ssz_consensus_objects.nim
View File

@ -17,7 +17,7 @@ import
../../beacon_chain/spec/[crypto, datatypes, digest], ../../beacon_chain/spec/[crypto, datatypes, digest],
../../beacon_chain/ssz, ../../beacon_chain/ssz,
# Test utilities # Test utilities
../testutil ../testutil, ./fixtures_utils
# SSZ tests of consensus objects (minimal/mainnet preset specific) # SSZ tests of consensus objects (minimal/mainnet preset specific)
@ -25,7 +25,6 @@ import
# ---------------------------------------------------------------- # ----------------------------------------------------------------
const const
FixturesDir = currentSourcePath.rsplit(DirSep, 1)[0] / "fixtures"
SSZDir = FixturesDir/"tests-v0.10.1"/const_preset/"phase0"/"ssz_static" SSZDir = FixturesDir/"tests-v0.10.1"/const_preset/"phase0"/"ssz_static"
type type

4
tests/official/test_fixture_ssz_generic_types.nim
View File

@ -15,14 +15,14 @@ import
yaml, yaml,
# Beacon chain internals # Beacon chain internals
../../beacon_chain/spec/[datatypes, digest], ../../beacon_chain/spec/[datatypes, digest],
../../beacon_chain/ssz ../../beacon_chain/ssz,
# Test utilities # Test utilities
./fixtures_utils
# Parsing definitions # Parsing definitions
# ------------------------------------------------------------------------ # ------------------------------------------------------------------------
const const
FixturesDir = currentSourcePath.rsplit(DirSep, 1)[0] / "fixtures"
SSZDir = FixturesDir/"tests-v0.10.1"/"general"/"phase0"/"ssz_generic" SSZDir = FixturesDir/"tests-v0.10.1"/"general"/"phase0"/"ssz_generic"
type type