From 84c189fd1b1aed4a32e1ca53545305aa2138b634 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= <stefantalpalaru@yahoo.com>
Date: Fri, 29 Nov 2019 10:17:18 +0100
Subject: [PATCH] Nim 1.0.4 (#604)

* Nim 1.0.4

* Azure: try to fix cache key

* mock_validator_keys.nim: fix index out of bounds

* Travis: make Nim building verbose
---
 .travis.yml                           | 3 ++-
 azure-pipelines.yml                   | 4 ++--
 tests/mocking/mock_validator_keys.nim | 6 ++++--
 vendor/nimbus-build-system            | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d0da61bc6..64e4261ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,7 +53,8 @@ install:
 
 script:
   - set -e # fail fast
-  - make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC}" update # to allow a newer Nim version to be detected
+  # Building Nim-1.0.4 takes up to 10 minutes on Travis - the time limit after which jobs are cancelled for having no output
+  - make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC}" V=1 update # to allow a newer Nim version to be detected
   - make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC}"
   - make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC}" DISABLE_TEST_FIXTURES_SCRIPT=1 test
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f7a7e561a..446fbb740 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -14,13 +14,13 @@ jobs:
       - task: CacheBeta@1
         displayName: 'cache Nim binaries'
         inputs:
-          key: NimBinaries | $(Agent.OS) | $(PLATFORM) | $(Build.SourceBranchName)
+          key: NimBinaries | $(Agent.OS) | $(PLATFORM) | "$(Build.SourceBranchName)"
           path: NimBinaries
 
       - task: CacheBeta@1
         displayName: 'cache p2pd binaries'
         inputs:
-          key: p2pdCache | $(Agent.OS) | $(PLATFORM) | $(Build.SourceBranchName)
+          key: p2pdCache | $(Agent.OS) | $(PLATFORM) | "$(Build.SourceBranchName)"
           path: p2pdCache
 
       - task: CacheBeta@1
diff --git a/tests/mocking/mock_validator_keys.nim b/tests/mocking/mock_validator_keys.nim
index 1a7ab3d31..062987d93 100644
--- a/tests/mocking/mock_validator_keys.nim
+++ b/tests/mocking/mock_validator_keys.nim
@@ -12,14 +12,16 @@ import
   # Specs
   ../../beacon_chain/spec/[datatypes, crypto]
 
+# this is being indexed inside "mock_deposits.nim" by a value up to `validatorCount`
+# which is `num_validators` which is `MIN_GENESIS_ACTIVE_VALIDATOR_COUNT`
 let MockPrivKeys* = block:
-  var privkeys: array[SLOTS_PER_EPOCH * 16, ValidatorPrivKey]
+  var privkeys: array[MIN_GENESIS_ACTIVE_VALIDATOR_COUNT, ValidatorPrivKey]
   for pk in privkeys.mitems():
     pk = newPrivKey()
   privkeys
 
 let MockPubKeys* = block:
-  var pubkeys: array[SLOTS_PER_EPOCH * 16, ValidatorPubKey]
+  var pubkeys: array[MIN_GENESIS_ACTIVE_VALIDATOR_COUNT, ValidatorPubKey]
   for idx, privkey in MockPrivKeys:
     pubkeys[idx] = pubkey(privkey)
   pubkeys
diff --git a/vendor/nimbus-build-system b/vendor/nimbus-build-system
index a13a7efa9..42c5e97a5 160000
--- a/vendor/nimbus-build-system
+++ b/vendor/nimbus-build-system
@@ -1 +1 @@
-Subproject commit a13a7efa9fd3bb2fdd2537821b0f687296f8d461
+Subproject commit 42c5e97a5ba2cf31a573160e7d0a2efd615334c5