Remove all traces of testnet

1 files changed, 5 insertions, 10 deletions

diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index 4ca02135a..d77cd2126 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -2,12 +2,10 @@ const MetamaskConfig = require('../config.js')
 const ethUtil = require('ethereumjs-util')
 const normalize = require('eth-sig-util').normalize
 
-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 ROPSTEN_RPC = MetamaskConfig.network.ropsten
-
+const KOVAN_RPC = MetamaskConfig.network.kovan
+const RINKEBY_RPC = MetamaskConfig.network.rinkeby
 
 /* The config-manager is a convenience object
  * wrapping a pojo-migrator.
@@ -150,17 +148,14 @@ ConfigManager.prototype.getCurrentRpcAddress = function () {
     case 'ropsten':
       return ROPSTEN_RPC
 
-    case 'morden':
-      return MORDEN_RPC
-
     case 'kovan':
       return KOVAN_RPC
 
-    case 'testnet':
-      return TESTNET_RPC
+    case 'rinkeby':
+      return RINKEBY_RPC
 
     default:
-      return provider && provider.rpcTarget ? provider.rpcTarget : TESTNET_RPC
+      return provider && provider.rpcTarget ? provider.rpcTarget : RINKEBY_RPC
   }
 }