unit tests should work for both geth and loom environments

Author: mlclay

compose/circleci-es.yml

@@ -29,7 +29,7 @@ services:
     command: sh -c 'while sleep 3600; do :; done'
     links:
       - redis_db
-      - geth-poa
+      - loom
       - elasticsearch
       - sftp
       - minio
@@ -47,3 +47,9 @@ services:
       - S3_ENDPOINT=http://minio:9000
       - S3_ACCESSKEY=myMinioAccessKey
       - S3_SECRETKEY=myMinioSecretKey
+      - GETH_NODE=http://loom:46658/eth
+      - LOOM_ENABLED=true
+      - LOOM_CHAIN_ID_STRING=default
+      - LOOM_CHAIN_ID_NUMBER=3657971041736948
+      - LOOM_DEPLOY_KEY=0x0000000000000000000000000000000000000000000000000000000000000001
+

compose/circleci.yml

@@ -32,3 +32,31 @@ services:
       - LOOM_CHAIN_ID_STRING=default
       - LOOM_CHAIN_ID_NUMBER=3657971041736948
       - LOOM_DEPLOY_KEY=0x0000000000000000000000000000000000000000000000000000000000000001
+
+
+  rpc-geth:
+    build:
+      context: ../
+      target: test
+    image: engine-node-test
+    #    command: sleep infinity
+    command: sh -c 'while sleep 3600; do :; done'
+    links:
+      - redis_db
+      - geth-poa
+      - sftp
+      - minio
+      - psql
+    environment:
+      - ENV=test
+      - SFTP_DRIVER_TESTS
+      - SFTP_HOST=sftp
+      - SFTP_PORT=22
+      - SFTP_USER=shipchain_user
+      - SFTP_PASS=shipchain_password
+      - S3_DRIVER_TESTS
+      - S3_BUCKET=my-test-bucket
+      - S3_ENDPOINT=http://minio:9000
+      - S3_ACCESSKEY=myMinioAccessKey
+      - S3_SECRETKEY=myMinioSecretKey
+      - GETH_NODE=http://geth-poa:8545

compose/dev-lite.yml

@@ -18,6 +18,8 @@ services:
       - /data/shipchain/engine/loom.app.db:/app/app.db
       - /data/shipchain/engine/loom.evm.db:/app/evm.db
       - /data/shipchain/engine/loom.receipts_db:/app/receipts_db
+    ports:
+      - 46658:46658
 
 
   psql:

config/custom-environment-variables.ts

@@ -21,6 +21,7 @@ export default {
   "DEPLOY_PRIVATE_KEY": "DEPLOY_PRIVATE_KEY",
   "ELASTICSEARCH_URL": "ELASTICSEARCH_URL",
   "ETHERSCAN_API_KEY": "ETHERSCAN_API_KEY",
+  "ES_TEST_NODE_URL": "ES_TEST_NODE_URL",
   "FORCE_LATEST_LOAD_CONTRACT_VERSION" : "FORCE_LATEST_LOAD_CONTRACT_VERSION",
   "FORCE_LATEST_NOTARY_CONTRACT_VERSION" : "FORCE_LATEST_NOTARY_CONTRACT_VERSION",
   "GETH_NODE": "GETH_NODE",

rpc/__tests__/wallet.ts

@@ -31,6 +31,7 @@ import {
 import { RPCWallet } from '../wallet';
 import { Wallet } from "../../src/entity/Wallet";
 import { EncryptorContainer } from '../../src/entity/encryption/EncryptorContainer';
+import { LoomHooks } from "../../src/eth/LoomHooks";
 
 export const RPCWalletTests = async function() {
 
@@ -165,7 +166,11 @@ export const RPCWalletTests = async function() {
                     wallet: imported.wallet.id,
                 });
                 expect(response.success).toBeTruthy();
-                expect(response.ether).toEqual('0');
+                if (LoomHooks.enabled) {
+                    expect(response.ether).toEqual('0');
+                } else {
+                    expect(response.ether).toEqual('158456325028527356587087900672');
+                }
                 expect(response.ship).toEqual('500000000000000000000');
             } catch (err) {
                 fail(`Should not have thrown [${err}]`);

src/__tests__/contracts.ts

@@ -81,6 +81,6 @@ export const ContractEntityTests = async function() {
 
             expect(new_other_balance).toEqual(ethereumService.unitToWei(100, 'ether'));
         },
-        30000,
+        60000,
     );
 };

src/__tests__/eventsubscriptions.ts

@@ -22,6 +22,7 @@ import { Network, Project } from '../entity/Contract';
 import { EventSubscription, EventSubscriberAttrs } from '../entity/EventSubscription';
 import { EncryptorContainer } from '../entity/encryption/EncryptorContainer';
 import { AbstractEthereumService } from "../eth/AbstractEthereumService";
+import { LoomHooks } from "../eth/LoomHooks";
 
 const request = require('request');
 const config = require('config');
@@ -89,6 +90,7 @@ export const EventSubscriptionEntityTests = async  function() {
 
             const subscriberAttrs = new EventSubscriberAttrs();
             subscriberAttrs.project = 'ShipToken';
+            subscriberAttrs.version = '1.0.0';
             subscriberAttrs.url = ES_NODE;
             subscriberAttrs.receiverType = 'ELASTIC';
 
@@ -98,9 +100,12 @@ export const EventSubscriptionEntityTests = async  function() {
             const ETH = 10 ** 18;
             const TOTAL = 500 * SHIP;
 
-            expect(Number(await local.ShipToken.call_static('balanceOf', [await owner.asyncEvmAddress]))).toEqual(TOTAL);
+            const ownerBalance = await local.ShipToken.call_static('balanceOf', [await owner.asyncEvmAddress]);
+            expect(Number(ownerBalance)).toEqual(TOTAL);
 
-            expect(Number(await ethereumService.getBalance(await owner.asyncEvmAddress))).toEqual(5 * ETH);
+            if (!LoomHooks.enabled) {
+                expect(Number(await ethereumService.getBalance(await owner.asyncEvmAddress))).toEqual(5 * ETH);
+            }
 
             const txParams = await owner.add_tx_params(
                 network,
@@ -148,9 +153,9 @@ export const EventSubscriptionEntityTests = async  function() {
 
             //console.log('ElasticSearch Events:', results)
 
-            expect(results['hits']['total']).toEqual(4);
+            expect(results['hits']['total']['value']).toEqual(4);
 
         },
-        30000, // This one can be a bit slow...
+        60000, // This one can be a bit slow...
     );
 };