aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/scripts/migrations/002.js10
-rw-r--r--app/scripts/migrations/003.js13
-rw-r--r--test/unit/migrations-test.js14
3 files changed, 30 insertions, 7 deletions
diff --git a/app/scripts/migrations/002.js b/app/scripts/migrations/002.js
index ab6a256ab..087f8bcd9 100644
--- a/app/scripts/migrations/002.js
+++ b/app/scripts/migrations/002.js
@@ -1,11 +1,13 @@
+var oldTestRpc = 'https://rawtestrpc.metamask.io/'
+var newTestRpc = 'https://testrpc.metamask.io/'
+
module.exports = {
- version: 2,
+ version: 3,
migrate: function(data) {
try {
- if (data.config.provider.type === 'etherscan') {
- data.config.provider.type = 'rpc'
- data.config.provider.rpcTarget = 'https://rpc.metamask.io/'
+ if (data.config.provider.rpcTarget === oldTestRpc) {
+ data.config.provider.rpcTarget = newTestRpc
}
} catch (e) {}
return data
diff --git a/app/scripts/migrations/003.js b/app/scripts/migrations/003.js
new file mode 100644
index 000000000..ab6a256ab
--- /dev/null
+++ b/app/scripts/migrations/003.js
@@ -0,0 +1,13 @@
+module.exports = {
+ version: 2,
+
+ migrate: function(data) {
+ try {
+ if (data.config.provider.type === 'etherscan') {
+ data.config.provider.type = 'rpc'
+ data.config.provider.rpcTarget = 'https://rpc.metamask.io/'
+ }
+ } catch (e) {}
+ return data
+ }
+}
diff --git a/test/unit/migrations-test.js b/test/unit/migrations-test.js
index 092c0eccd..4170b8e62 100644
--- a/test/unit/migrations-test.js
+++ b/test/unit/migrations-test.js
@@ -3,13 +3,21 @@ 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')
+
+ 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/', 'provider should be our rpc')
+
+ var oldTestRpc = 'https://rawtestrpc.metamask.io/'
+ firstResult.config.provider.rpcTarget = oldTestRpc
+ var secondResult = migration3.migrate(firstResult)
+ assert.equal(firstResult.config.provider.rpcTarget, 'https://testrpc.metamask.io/', 'provider should be our rpc')
+
done()
})
})