aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'app/scripts')
-rw-r--r--app/scripts/config.js6
-rw-r--r--app/scripts/lib/config-manager.js10
2 files changed, 8 insertions, 8 deletions
diff --git a/app/scripts/config.js b/app/scripts/config.js
index 391c67230..67067cfd7 100644
--- a/app/scripts/config.js
+++ b/app/scripts/config.js
@@ -1,7 +1,7 @@
const MAINET_RPC_URL = 'https://mainnet.infura.io/metamask'
-const TESTNET_RPC_URL = 'https://ropsten.infura.io/metamask'
+const TESTNET_RPC_URL = 'https://rinkeby.infura.io/metamask'
const KOVAN_RPC_URL = 'https://kovan.infura.io/metamask'
-const RINKEBY_RPC_URL = 'https://rinkeby.infura.io/metamask'
+const ROPSTEN_RPC_URL = 'https://ropsten.infura.io/metamask'
const DEFAULT_RPC_URL = TESTNET_RPC_URL
global.METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
@@ -13,6 +13,6 @@ module.exports = {
testnet: TESTNET_RPC_URL,
morden: TESTNET_RPC_URL,
kovan: KOVAN_RPC_URL,
- rinkeby: RINKEBY_RPC_URL,
+ ropsten: ROPSTEN_RPC_URL,
},
}
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index ab9410842..4ca02135a 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -6,7 +6,7 @@ const TESTNET_RPC = MetamaskConfig.network.testnet
const MAINNET_RPC = MetamaskConfig.network.mainnet
const MORDEN_RPC = MetamaskConfig.network.morden
const KOVAN_RPC = MetamaskConfig.network.kovan
-const RINKEBY_RPC = MetamaskConfig.network.rinkeby
+const ROPSTEN_RPC = MetamaskConfig.network.ropsten
/* The config-manager is a convenience object
@@ -147,8 +147,8 @@ ConfigManager.prototype.getCurrentRpcAddress = function () {
case 'mainnet':
return MAINNET_RPC
- case 'testnet':
- return TESTNET_RPC
+ case 'ropsten':
+ return ROPSTEN_RPC
case 'morden':
return MORDEN_RPC
@@ -156,8 +156,8 @@ ConfigManager.prototype.getCurrentRpcAddress = function () {
case 'kovan':
return KOVAN_RPC
- case 'rinkeby':
- return RINKEBY_RPC
+ case 'testnet':
+ return TESTNET_RPC
default:
return provider && provider.rpcTarget ? provider.rpcTarget : TESTNET_RPC