1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 01:39:44 +01:00
This commit is contained in:
Thomas Huang 2017-05-28 11:18:07 -07:00 committed by kumavis
parent 8af41f1b05
commit 13e6672028
9 changed files with 26 additions and 31 deletions

View File

@ -31,7 +31,7 @@ const diskStore = new LocalStorageStore({ storageKey: STORAGE_KEY })
// initialization flow
initialize().catch(console.error)
async function initialize() {
async function initialize () {
const initState = await loadStateFromPersistence()
await setupController(initState)
console.log('MetaMask initialization complete.')

View File

@ -14,8 +14,8 @@ class Migrator {
async migrateData (versionedData = this.generateInitialState()) {
const pendingMigrations = this.migrations.filter(migrationIsPending)
for (let index in pendingMigrations) {
let migration = pendingMigrations[index]
for (const index in pendingMigrations) {
const migration = pendingMigrations[index]
versionedData = await migration.migrate(versionedData)
if (!versionedData.data) throw new Error('Migrator - migration returned empty data')
if (versionedData.version !== undefined && versionedData.meta.version !== migration.version) throw new Error('Migrator - Migration did not update version number correctly')

View File

@ -2,7 +2,7 @@ const createStore = require('redux').createStore
const applyMiddleware = require('redux').applyMiddleware
const thunkMiddleware = require('redux-thunk')
const createLogger = require('redux-logger')
const rootReducer = function() {}
const rootReducer = function () {}
module.exports = configureStore

View File

@ -18,7 +18,7 @@ describe('BnInput', function () {
}
const value = new BN(valueStr, 10)
let inputStr = '2.3'
const inputStr = '2.3'
let targetStr = '23'
while (targetStr.length < 19) {
@ -43,9 +43,9 @@ describe('BnInput', function () {
const component = additions.renderIntoDocument(inputComponent)
renderer.render(inputComponent)
const input = additions.find(component, 'input.hex-input')[0]
ReactTestUtils.Simulate.change(input, { preventDefault() {}, target: {
ReactTestUtils.Simulate.change(input, { preventDefault () {}, target: {
value: inputStr,
checkValidity() { return true } },
checkValidity () { return true } },
})
})
})

View File

@ -15,23 +15,22 @@ describe('PendingTx', function () {
const gasPrice = '0x4A817C800' // 20 Gwei
const txData = {
'id':5021615666270214,
'time':1494458763011,
'status':'unapproved',
'metamaskNetworkId':'1494442339676',
'txParams':{
'from':'0xfdea65c8e26263f6d9a1b5de9555d2931a33b826',
'to':'0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb',
'value':'0xde0b6b3a7640000',
'id': 5021615666270214,
'time': 1494458763011,
'status': 'unapproved',
'metamaskNetworkId': '1494442339676',
'txParams': {
'from': '0xfdea65c8e26263f6d9a1b5de9555d2931a33b826',
'to': '0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb',
'value': '0xde0b6b3a7640000',
gasPrice,
'gas':'0x7b0c'},
'gasLimitSpecified':false,
'estimatedGas':'0x5208',
'gas': '0x7b0c'},
'gasLimitSpecified': false,
'estimatedGas': '0x5208',
}
it('should use updated values when edited.', function (done) {
const renderer = ReactTestUtils.createRenderer()
const newGasPrice = '0x77359400'
@ -40,7 +39,6 @@ describe('PendingTx', function () {
accounts: identities,
txData,
sendTransaction: (txMeta, event) => {
// Assert changes:
const result = ethUtil.addHexPrefix(txMeta.txParams.gasPrice)
assert.notEqual(result, gasPrice, 'gas price should change')
@ -60,17 +58,16 @@ describe('PendingTx', function () {
ReactTestUtils.Simulate.change(input, {
target: {
value: 2,
checkValidity() { return true },
checkValidity () { return true },
},
})
const form = additions.find(component, 'form')[0]
form.checkValidity = () => true
form.getFormEl = () => { return { checkValidity() { return true } } }
ReactTestUtils.Simulate.submit(form, { preventDefault() {}, target: { checkValidity() {
form.getFormEl = () => { return { checkValidity () { return true } } }
ReactTestUtils.Simulate.submit(form, { preventDefault () {}, target: { checkValidity () {
return true
} } })
} catch (e) {
console.log('WHAAAA')
console.error(e)

View File

@ -11,5 +11,4 @@ describe('explorer-link', function () {
var result = linkGen('hash', '42')
assert.notEqual(result.indexOf('kovan'), -1, 'kovan injected')
})
})

View File

@ -28,7 +28,7 @@ const migrations = [
},
},
]
const versionedData = {meta: {version: 0}, data:{hello:'world'}}
const versionedData = {meta: {version: 0}, data: {hello: 'world'}}
describe('Migrator', () => {
const migrator = new Migrator({ migrations })
it('migratedData version should be version 3', (done) => {

View File

@ -27,7 +27,7 @@ describe('# Network Controller', function () {
})
})
describe('network', function () {
describe('#provider', function() {
describe('#provider', function () {
it('provider should be updatable without reassignment', function () {
networkController.initializeProvider(networkController.providerInit)
const provider = networkController.provider
@ -37,7 +37,7 @@ describe('# Network Controller', function () {
})
describe('#getNetworkState', function () {
it('should return loading when new', function () {
let networkState = networkController.getNetworkState()
const networkState = networkController.getNetworkState()
assert.equal(networkState, 'loading', 'network is loading')
})
})
@ -45,14 +45,14 @@ describe('# Network Controller', function () {
describe('#setNetworkState', function () {
it('should update the network', function () {
networkController.setNetworkState(1)
let networkState = networkController.getNetworkState()
const networkState = networkController.getNetworkState()
assert.equal(networkState, 1, 'network is 1')
})
})
describe('#getRpcAddressForType', function () {
it('should return the right rpc address', function () {
let rpcTarget = networkController.getRpcAddressForType('mainnet')
const rpcTarget = networkController.getRpcAddressForType('mainnet')
assert.equal(rpcTarget, 'https://mainnet.infura.io/metamask', 'returns the right rpcAddress')
})
})

View File

@ -320,5 +320,4 @@ describe('Transaction Controller', function () {
})
})
})
})