From a4bf8b367d0428929e5ef4e4484ad839ab52c23e Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Fri, 29 Jun 2018 14:17:59 -0400 Subject: [PATCH] hotfix blockchain configs for privatenet --- test_apps/contracts_app/blockchain.json | 16 ++++------------ test_apps/test_app/config/blockchain.json | 16 ++++------------ 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/test_apps/contracts_app/blockchain.json b/test_apps/contracts_app/blockchain.json index a24efdbc3..9c85d6267 100644 --- a/test_apps/contracts_app/blockchain.json +++ b/test_apps/contracts_app/blockchain.json @@ -17,12 +17,12 @@ "wsHost": "localhost", "wsPort": 8546 }, - "privateNet": { + "privatenet": { "networkType": "custom", "networkId": "1337", "isDev": false, - "genesisBlock": "privateNet/genesis.json", - "datadir": ".embark/privateNet/datadir", + "genesisBlock": "privatenet/genesis.json", + "datadir": ".embark/privatenet/datadir", "mineWhenNeeded": true, "nodiscover": true, "maxpeers": 0, @@ -30,7 +30,7 @@ "rpcPort": 8545, "rpcCorsDomain": "auto", "account": { - "password": "privateNet/password" + "password": "privatenet/password" }, "targetGasLimit": 8000000, "wsOrigins": "auto", @@ -64,13 +64,5 @@ "account": { "password": "livenet/password" } - }, - "privatenet": { - "networkType": "custom", - "rpcHost": "localhost", - "rpcPort": 8545, - "datadir": "yourdatadir", - "networkId": "123", - "bootnodes": "" } } diff --git a/test_apps/test_app/config/blockchain.json b/test_apps/test_app/config/blockchain.json index 9b88dd4af..31e1fe834 100644 --- a/test_apps/test_app/config/blockchain.json +++ b/test_apps/test_app/config/blockchain.json @@ -18,13 +18,13 @@ "wsPort": 8546, "proxy": true }, - "privateNet": { + "privatenet": { "enabled": true, "networkType": "custom", "networkId": "1337", "isDev": false, - "genesisBlock": "config/privateNet/genesis.json", - "datadir": ".embark/privateNet/datadir", + "genesisBlock": "config/privatenet/genesis.json", + "datadir": ".embark/privatenet/datadir", "mineWhenNeeded": true, "nodiscover": true, "maxpeers": 0, @@ -32,7 +32,7 @@ "rpcPort": 8545, "rpcCorsDomain": "auto", "account": { - "password": "config/privateNet/password" + "password": "config/privatenet/password" }, "targetGasLimit": 8000000, "wsOrigins": "auto", @@ -67,13 +67,5 @@ "account": { "password": "config/livenet/password" } - }, - "privatenet": { - "networkType": "custom", - "rpcHost": "localhost", - "rpcPort": 8545, - "datadir": "yourdatadir", - "networkId": "123", - "bootnodes": "" } }