1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 01:39:44 +01:00

Resolve changelog order conflict

This commit is contained in:
Dan Finlay 2016-04-22 14:48:10 -07:00
commit 081a943d9b
4 changed files with 35 additions and 4 deletions

View File

@ -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

View File

@ -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,
]

View File

@ -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
}
}

View File

@ -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()
})
})