test.sh && various fixes

Author: tiero

.gitignore

@@ -1,7 +1,7 @@
 build
 node_modules
 yarn-error.log
-/.DS_Store
+.DS_Store
 npm-debug.log
 addresses.json
 package-lock.json

Dockerfile

@@ -1,7 +1,3 @@
-FROM node:6
+FROM node:8
 
-WORKDIR /code
-
-ADD . /code
-
-RUN npm install -g truffle
+RUN npm install

README.md

@@ -13,18 +13,14 @@ Includes contracts, migrations, tests, user interface and webpack build pipeline
 
 ## Install
 
-### Truffle
+### Dependencies
 ```bash
-npm i -g truffle
+npm install
 ```
 
-### Ethereum  
-You can choose between Parity or local testrpc
+### Test 
+
 
-### testRPC
-```bash
-npm install -g ethereumjs-testrpc
-```
 
 ### Parity
   **Parity requires Rust version 1.19.0 to build**
@@ -70,14 +66,6 @@ npm install -g ethereumjs-testrpc
     cp /target/release/parity /usr/local/bin 
   ```
 
-
-## Build 
-1.  First `cd dao && npm i`
-2.  `truffle compile` and run on separated tab `parity` or `testrpc`
-3.  `truffle migrate` to deploy the contracts onto your network of choice (default "development").
-5. `truffle test`
-
-
 ## Usage
 
 You can choose of using web3 with Python and Javascript

test.sh

@@ -1,26 +1,4 @@
 #!/usr/bin/env bash
 
-trap cleanup EXIT
-
-cleanup() {
-  if [ -n "$testrpc_pid" ] && ps -p $testrpc_pid > /dev/null; then
-    kill -9 $testrpc_pid
-  fi
-}
-
-testrpc_running() {
-  nc -z localhost 8545
-}
-
-if testrpc_running; then
-  echo "Using existing testrpc"
-else
-  echo "testrpc is running "
-  node_modules/.bin/testrpc > /dev/null &
-  testrpc_pid=$!
-fi
-
-node_modules/.bin/truffle compile --all "$@"
-node_modules/.bin/truffle migrate --reset "$@"
+npm i
 node_modules/.bin/truffle test "$@"
-cd py && python main.py

truffle.js

@@ -8,8 +8,8 @@ module.exports = {
       provider: () => {
         return new HDWalletProvider(mnemonic, host)
       },
-      gas: 4700000,
-      network_id: "*" // Match any network id
+      gas: 127000,
+      network_id: "42" // Match any network id
     }
   },
 }