Set celo-blockchain branch to use (undo before converting from draft PR)

celo-org · Jun 16, 2021 · 1517f87 · 1517f87
1 parent 5a0d5c5
commit 1517f87
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -36,7 +36,7 @@ e2e-defaults: &e2e-defaults
   docker:
     - image: celohq/circleci:geth1.9-2
   environment:
-    CELO_BLOCKCHAIN_BRANCH_TO_TEST: master
+    CELO_BLOCKCHAIN_BRANCH_TO_TEST: oneeman/mycelo-tweaks-for-e2e-tests
 general:
   artifacts:
     - 'protocol/coverage'

diff --git a/packages/celotool/src/lib/geth.ts b/packages/celotool/src/lib/geth.ts
@@ -11,6 +11,7 @@ import { merge, range } from 'lodash'
 import fetch from 'node-fetch'
 import path from 'path'
 import sleep from 'sleep-promise'
+import { waitForBlock } from 'src/e2e-tests/utils'
 import Web3 from 'web3'
 import { Admin } from 'web3-eth-admin'
 import { spawnCmd, spawnCmdWithExitOnFailure } from './cmd-utils'
@@ -29,7 +30,6 @@ import { GethInstanceConfig } from './interfaces/geth-instance-config'
 import { GethRunConfig } from './interfaces/geth-run-config'
 import { ensure0x } from './utils'
 import { getTestnetOutputs } from './vm-testnet-utils'
-import { waitForBlock } from 'src/e2e-tests/utils'
 
 export async function unlockAccount(
   web3: Web3,