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

Merge branch 'nim-1.2' into devel

This commit is contained in:
Ștefan Talpalaru 2020-04-08 21:32:10 +02:00
parent 64e6713fde 5dde7e0e73
commit eec49191d4
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -136,6 +136,8 @@
[submodule "vendor/nim-sqlite3-abi"] [submodule "vendor/nim-sqlite3-abi"]
path = vendor/nim-sqlite3-abi path = vendor/nim-sqlite3-abi
url = https://github.com/arnetheduck/nim-sqlite3-abi.git url = https://github.com/arnetheduck/nim-sqlite3-abi.git
ignore = dirty
branch = master
[submodule "vendor/nim-testutils"] [submodule "vendor/nim-testutils"]
path = vendor/nim-testutils path = vendor/nim-testutils
url = https://github.com/status-im/nim-testutils.git url = https://github.com/status-im/nim-testutils.git

4
azure-pipelines.yml
View File

@ -14,7 +14,7 @@ jobs:
- task: CacheBeta@1 - task: CacheBeta@1
displayName: 'cache Nim binaries' displayName: 'cache Nim binaries'
inputs: inputs:
key: NimBinaries | $(Agent.OS) | $(PLATFORM) | "$(Build.SourceBranchName)" | "v2" key: NimBinaries | $(Agent.OS) | $(PLATFORM) | "$(Build.SourceBranchName)" | "v4"
path: NimBinaries path: NimBinaries
- task: CacheBeta@1 - task: CacheBeta@1
@ -68,5 +68,7 @@ jobs:
mingw32-make -j2 ARCH_OVERRIDE=${PLATFORM} LOG_LEVEL=TRACE mingw32-make -j2 ARCH_OVERRIDE=${PLATFORM} LOG_LEVEL=TRACE
mingw32-make -j2 ARCH_OVERRIDE=${PLATFORM} LOG_LEVEL=TRACE NIMFLAGS="-d:testnet_servers_image" mingw32-make -j2 ARCH_OVERRIDE=${PLATFORM} LOG_LEVEL=TRACE NIMFLAGS="-d:testnet_servers_image"
file build/beacon_node file build/beacon_node
# fail fast
export NIMTEST_ABORT_ON_ERROR=1
mingw32-make -j2 ARCH_OVERRIDE=${PLATFORM} DISABLE_TEST_FIXTURES_SCRIPT=1 test mingw32-make -j2 ARCH_OVERRIDE=${PLATFORM} DISABLE_TEST_FIXTURES_SCRIPT=1 test
displayName: 'build and test' displayName: 'build and test'

7
tests/official/test_fixture_state_transition_epoch.nim
View File

@ -38,11 +38,8 @@ template runSuite(suiteDir, testName: string, transitionProc: untyped{ident}, us
let unitTestName = testDir.rsplit(DirSep, 1)[1] let unitTestName = testDir.rsplit(DirSep, 1)[1]
timedTest testName & " - " & unitTestName & preset(): timedTest testName & " - " & unitTestName & preset():
var stateRef, postRef: ref BeaconState let stateRef = parseTest(testDir/"pre.ssz", SSZ, ref BeaconState)
new stateRef let postRef = parseTest(testDir/"post.ssz", SSZ, ref BeaconState)
new postRef
stateRef[] = parseTest(testDir/"pre.ssz", SSZ, BeaconState)
postRef[] = parseTest(testDir/"post.ssz", SSZ, BeaconState)
when useCache: when useCache:
var cache = get_empty_per_epoch_cache() var cache = get_empty_per_epoch_cache()

2
vendor/nimbus-build-system vendored

@ -1 +1 @@
Subproject commit 088d3b7f6843fd61c829a5a0c0c29912945963ae Subproject commit 0cce46e1260b053349d0d6f337f5d67a7bc14462