Resolve changelog order conflict

4 files changed, 35 insertions, 4 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6abe3bbb..a3ffe84ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Add save button to custom RPC input field.
 - Add quick-select button for RPC on `localhost:8545`.
 - Improve config view styling.
+- Users have been migrated from old test-net RPC to a newer test-net RPC.
 
 # 1.5.1 2016-04-15
 
diff --git a/app/scripts/lib/migrations.js b/app/scripts/lib/migrations.js
index cab5bec66..0b8e6265c 100644
--- a/app/scripts/lib/migrations.js
+++ b/app/scripts/lib/migrations.js
@@ -2,7 +2,9 @@ var path = require('path')
 var fs = require('fs')
 
 var migration2 = require('../migrations/002')
+var migration3 = require('../migrations/003')
 
 module.exports = [
   migration2,
+  migration3,
 ]
diff --git a/app/scripts/migrations/003.js b/app/scripts/migrations/003.js
new file mode 100644
index 000000000..087f8bcd9
--- /dev/null
+++ b/app/scripts/migrations/003.js
@@ -0,0 +1,15 @@
+var oldTestRpc = 'https://rawtestrpc.metamask.io/'
+var newTestRpc = 'https://testrpc.metamask.io/'
+
+module.exports = {
+  version: 3,
+
+  migrate: function(data) {
+    try {
+      if (data.config.provider.rpcTarget === oldTestRpc) {
+        data.config.provider.rpcTarget = newTestRpc
+      }
+    } catch (e) {}
+    return data
+  }
+}
diff --git a/test/unit/migrations-test.js b/test/unit/migrations-test.js
index 092c0eccd..3b347530a 100644
--- a/test/unit/migrations-test.js
+++ b/test/unit/migrations-test.js
@@ -2,14 +2,27 @@ var assert = require('assert')
 var path = require('path')
 
 var wallet1 = require(path.join('..', 'lib', 'migrations', '001.json'))
+
 var migration2 = require(path.join('..', '..', 'app', 'scripts', 'migrations', '002'))
+var migration3 = require(path.join('..', '..', 'app', 'scripts', 'migrations', '003'))
 
 describe('wallet1 is migrated successfully', function() {
 
-  it('should convert etherscan provider', function(done) {
-    var result = migration2.migrate(wallet1.data)
-    assert.equal(result.config.provider.type, 'rpc', 'provider should be rpc')
-    assert.equal(result.config.provider.rpcTarget, 'https://rpc.metamask.io/', 'provider should be our rpc')
+  it('should convert providers', function(done) {
+
+    wallet1.data.config.provider = { type: 'etherscan', rpcTarget: null }
+
+    var firstResult = migration2.migrate(wallet1.data)
+    assert.equal(firstResult.config.provider.type, 'rpc', 'provider should be rpc')
+    assert.equal(firstResult.config.provider.rpcTarget, 'https://rpc.metamask.io/', 'main provider should be our rpc')
+
+    var oldTestRpc = 'https://rawtestrpc.metamask.io/'
+    var newTestRpc = 'https://testrpc.metamask.io/'
+    firstResult.config.provider.rpcTarget = oldTestRpc
+
+    var secondResult = migration3.migrate(firstResult)
+    assert.equal(secondResult.config.provider.rpcTarget, newTestRpc)
+
     done()
   })
 })