embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #536 from embark-framework/gethFixes 

fix test app config and swap olympic for rinkeby as testnet option
This commit is contained in:
Iuri Matias 2018-06-15 14:22:40 -04:00 committed by GitHub
parent 3d00b9b852 391777d5bf
commit 91b147d248
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/cmds/blockchain/geth_commands.js
View File

@ -47,8 +47,8 @@ class GethCommands {
let cmd; let cmd;
if (config.networkType === 'testnet') { if (config.networkType === 'testnet') {
cmd = "--testnet"; cmd = "--testnet";
} else if (config.networkType === 'olympic') { } else if (config.networkType === 'rinkeby') {
cmd = "--olympic"; cmd = "--rinkeby";
} else if (config.networkType === 'custom') { } else if (config.networkType === 'custom') {
cmd = "--networkid=" + config.networkId; cmd = "--networkid=" + config.networkId;
} }

5
test_apps/test_app/config/blockchain.json
View File

@ -25,7 +25,10 @@
"testnet": { "testnet": {
"networkType": "testnet", "networkType": "testnet",
"rpcHost": "localhost", "rpcHost": "localhost",
"rpcPort": 8545 "rpcPort": 8545,
"account": {
"password": "config/development/password"
}
}, },
"livenet": { "livenet": {
"networkType": "livenet", "networkType": "livenet",