Add whitelist/blacklist tests

.travis.yml

@@ -1,56 +1,24 @@
-services:
-  - xvfb
 language: node_js
-git:
-  depth: false
 matrix:
   fast_finish: true
   include:
-    - node_js: 8
-      env: TEST=unit
     - node_js: 11
-      env: TEST=unit
-    - node_js: 12
-      env: TEST=unit
-    - node_js: 10
-      env: TEST=build_and_lint
-    - node_js: 10
-      env: TEST=unit_and_e2e_clients
-    - node_js: 10
-      env: TEST=e2e_ganache
-    - node_js: 10
-      env: TEST=e2e_mosaic
     - node_js: 10
-      env: TEST=e2e_browsers
-      addons:
-        chrome: stable
-        firefox: latest
-  allow_failures:
-    - node_js: 10
-      env: TEST=e2e_ganache
-    - node_js: 10
-      env: TEST=e2e_mosaic
-
+    - node_js: 9
+    - node_js: 8
 addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
     packages:
-      - gcc-5
-      - g++-5
-
+      - gcc-6
+      - g++-6
 before_install:
   - if [ $TRAVIS_OS_NAME == "linux" ]; then
-    export CC="gcc-5";
-    export CXX="g++-5";
-    export LINK="gcc-5";
-    export LINKXX="g++-5";
-    fi
-  - export DISPLAY=:99.0
-  - export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
-install:
-  - if [[ $TEST != "e2e_ganache" ]] && [[ $TEST != "e2e_mosaic" ]]; then
-    npm install;
+    export CC="gcc-6";
+    export CXX="g++-6";
+    export LINK="gcc-6";
+    export LINKXX="g++-6";
     fi
 script:
   - npm run test

README.md

@@ -51,8 +51,27 @@ sudo apt-get install nodejs
 sudo apt-get install npm
 ```
 
+### Recommended
+
+- [nvm](https://github.com/nvm-sh/nvm)
+
+```bash
+nvm install v8.17.0
+nvm use v8.17.0
+npm install
+npm run test
+```
+
 ### Running Tests
 
 ```bash
 npm test
 ```
+
+### Merging contracts for deployment
+
+```bash
+npm run merge-contracts
+```
+
+Outputs the merged contracts in `./contracts-merged`

build/deployments.json

@@ -1 +1 @@
-{"stage_0_before_allocation":{"name":"stage_0_before_allocation","rico_address":"0x6b4FfCA103EB517BEF1734cbe42A0581255d744e","token_address":"0x9B847956292e355ee7C74106e60E1155B9540056"},"stage_0_at_allocation":{"name":"stage_0_at_allocation","rico_address":"0x1B5377EA425f241D668D99f197E401182C098F3e","token_address":"0x509F12467384734E405D5E6Cc5ED524BA9c715BA"},"stage_0_at_allocation_one_contribution_whitelist_no":{"name":"stage_0_at_allocation_one_contribution_whitelist_no","rico_address":"0xcbbED7CbFd0FB8a9222224fE71FAb46f0C69De15","token_address":"0x198d46E74eF75eCa2b75802a097d049ba40CE97f"},"stage_0_at_allocation_one_contribution_whitelist_yes":{"name":"stage_0_at_allocation_one_contribution_whitelist_yes","rico_address":"0x282Db946EAdF5059D90AeAdA76F66aa112d2e5C5","token_address":"0x05c01caB30416F7D19e8C948cF5169d9050Acf13"}}
+{"before_allocation":{"name":"before_allocation","rico_address":"0x2C1DE44AEd10792665507EBcf8f3C8584B5C23Fd","token_address":"0x509F12467384734E405D5E6Cc5ED524BA9c715BA"},"stage_0_at_allocation":{"name":"stage_0_at_allocation","rico_address":"0x282Db946EAdF5059D90AeAdA76F66aa112d2e5C5","token_address":"0x198d46E74eF75eCa2b75802a097d049ba40CE97f"},"stage_0_at_allocation_one_contribution_whitelist_no":{"name":"stage_0_at_allocation_one_contribution_whitelist_no","rico_address":"0x8345d7C203522B081f77712c55Cf19286AD440aF","token_address":"0x05c01caB30416F7D19e8C948cF5169d9050Acf13"},"stage_0_at_allocation_one_contribution_whitelist_yes":{"name":"stage_0_at_allocation_one_contribution_whitelist_yes","rico_address":"0xA4cF040c80cf036583d331e7259a03BdA0e26Fa7","token_address":"0xA5973312Ca99bAB7FC2EA53bA2d9dAB66C3B4A93"}}