Remove local hardcodes from .env

magmo · May 8, 2019 · e58cdf0 · e58cdf0
1 parent e6c25b2
commit e58cdf0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/packages/server/.env b/packages/server/.env
@@ -1,5 +1,4 @@
-NODE_ENV=development
-SERVER_WALLET_DB_CONN_STRING="postgres://misha@localhost:5432"
+SERVER_WALLET_DB_CONN_STRING=RequiredInLocalDotenv
 SERVER_WALLET_DB_NAME=server_wallet_${NODE_ENV}
 
 ETH_ACCOUNT_MNENOMIC="a dozen random words"
@@ -11,12 +10,11 @@ DEV_GANACHE_NETWORK_ID=123456789
 ENABLE_SOLC_OPTIMIZER=TRUE
 
 ROPSTEN_NETWORK_ID=3
-GANACHE_NETWORK_ID=123456789
 TESTNET=ropsten
-INFURA_API_KEY=2972b45cf9444a6d8f8695f6bdbc672f
+INFURA_API_KEY=RequiredInLocalDotenv
 INFURA_JSON_RPC_ENDPOINT=https://${TESTNET}.infura.io/v3/${INFURA_API_KEY}
-GANACHE_JSON_RPC_ENDPOINT=http://${process.env.DEV_GANACHE_HOST}:${process.env.DEV_GANACHE_PORT}
+DEV_GANACHE_JSON_RPC_ENDPOINT=http://${process.env.DEV_GANACHE_HOST}:${process.env.DEV_GANACHE_PORT}
 
 
-JSON_RPC_ENDPOINT=${GANACHE_JSON_RPC_ENDPOINT}
-NETWORK_ID=${GANACHE_NETWORK_ID}
+JSON_RPC_ENDPOINT=${DEV_GANACHE_JSON_RPC_ENDPOINT}
+NETWORK_ID=${DEV_GANACHE_NETWORK_ID}
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -13,16 +13,18 @@
     "db:seed": "npx knex seed:run",
     "test:server": "npx jest --runInBand -c ./config/jest/jest.config.js",
     "test:chain": "npx ganache-then-jest --runInBand -c ./config/jest/jest.chain.config.js",
-    "test:ci": "run-s clearContracts prettier:check 'test:chain --all --ci' test:server",
+    "test:ci": "run-s contracts:clear prettier:check 'test:chain --all --ci' test:server",
     "watch-server": "nodemon --watch 'src/**/*' -e ts,tsx --exec ts-node ./src/app/server.ts",
     "build": "tsc && npx tsc knexfile.ts",
-    "start": "node ./lib/app/server.js",
+    "start": "run-s start:server start-adjudicator-watcher",
+    "start:server": "node ./lib/app/server.js",
+    "start:adjudicator-watcher": "node lib/wallet/adjudicator-watcher/index.js",
     "prestart": "npm run db:rollback && npm run db:migrate && npm run db:seed",
     "prettier:check": "npx prettier --check 'src/**/*.{ts,tsx}'",
     "prettier:write": "npx prettier --write 'src/**/*.{ts,tsx}'",
     "postinstall": "npm run build",
-    "clearContracts": "rm -rf ./build/contracts",
-    "deployContracts": "npx deploy-contracts"
+    "contracts:clear": "rm -rf ./build/contracts",
+    "contracts:deploy": "npx deploy-contracts"
   },
   "author": "",
   "license": "MIT",