Trying to change the tests for ci

Brycewetzel · Jun 14, 2018 · 11fc487 · 11fc487
1 parent 66592b9
commit 11fc487
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -10,7 +10,7 @@ services:
       - 8100:8100
       - 3000:3000
     environment:
-      - DB_HOST=db:27017
+      - DB_HOST=db
       - DB_NAME=bitcore-test
       - BITCORE_CONFIG_PATH=/bitcore/bitcore-test.config.json
     depends_on:
@@ -19,13 +19,8 @@ services:
 
   db:
     image: mongo
-    ports:
-      - 27018:27017
 
   bitcoin:
-    ports:
-      - 8332:8332
-      - 8333:8333
     image: ruimarinho/bitcoin-core:0.16.0-alpine
     command:
       -printtoconsole

diff --git a/packages/bitcore-node/test/integration/services/p2p.unit.ts b/packages/bitcore-node/test/integration/services/p2p.unit.ts
@@ -69,9 +69,11 @@ async function localHeight() {
 }
 
 async function verify(rpc: RPC, tail: number) {
+  const chain = 'BTC';
+  const network = 'regtest';
   const myTip = await BlockModel.getLocalTip({
-    chain: 'BTC',
-    network: 'regtest',
+    chain,
+    network,
   });
   const poolTip = await rpc.bestBlockHashAsync();
 
@@ -86,7 +88,7 @@ async function verify(rpc: RPC, tail: number) {
 
     // check block is correct
     const truth = await rpc.blockAsync(hash);
-    const ours = await BlockModel.find({ hash });
+    const ours = await BlockModel.find({ hash, chain, network });
     expect(ours.length, 'number of blocks').to.equal(1);
     expect(ours[0].previousBlockHash, 'previous block hash').to.equal(truth.previousblockhash);
     expect(ours[0].nextBlockHash, 'next block hash').to.equal(truth.nextblockhash);