1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
This commit is contained in:
Kevin Serrano 2016-12-19 14:55:52 -08:00
parent 20c043a4c2
commit e9bea92ac3
No known key found for this signature in database
GPG Key ID: 7CC862A58D2889B4
3 changed files with 5 additions and 6 deletions

View File

@ -73,7 +73,7 @@ module.exports = class KeyringController extends EventEmitter {
// or accept a state-resolving promise to consume their results. // or accept a state-resolving promise to consume their results.
// //
// Not all methods end with this, that might be a nice refactor. // Not all methods end with this, that might be a nice refactor.
fullUpdate() { fullUpdate () {
this.emit('update') this.emit('update')
return Promise.resolve(this.getState()) return Promise.resolve(this.getState())
} }
@ -586,7 +586,6 @@ module.exports = class KeyringController extends EventEmitter {
// Attempts to sign the provided @object msgParams. // Attempts to sign the provided @object msgParams.
signMessage (msgParams, cb) { signMessage (msgParams, cb) {
try { try {
const msgId = msgParams.metamaskId const msgId = msgParams.metamaskId
delete msgParams.metamaskId delete msgParams.metamaskId
const approvalCb = this._unconfMsgCbs[msgId] || noop const approvalCb = this._unconfMsgCbs[msgId] || noop

View File

@ -258,7 +258,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
function estimateGas (cb) { function estimateGas (cb) {
var estimationParams = extend(txParams) var estimationParams = extend(txParams)
query.getBlockByNumber('latest', true, function(err, block){ query.getBlockByNumber('latest', true, function (err, block) {
if (err) return cb(err) if (err) return cb(err)
// check if gasLimit is already specified // check if gasLimit is already specified
const gasLimitSpecified = Boolean(txParams.gas) const gasLimitSpecified = Boolean(txParams.gas)
@ -267,7 +267,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
estimationParams.gas = block.gasLimit estimationParams.gas = block.gasLimit
} }
// run tx, see if it will OOG // run tx, see if it will OOG
query.estimateGas(estimationParams, function(err, estimatedGasHex){ query.estimateGas(estimationParams, function (err, estimatedGasHex) {
if (err) return cb(err.message || err) if (err) return cb(err.message || err)
// all gas used - must be an error // all gas used - must be an error
if (estimatedGasHex === estimationParams.gas) { if (estimatedGasHex === estimationParams.gas) {

View File

@ -177,13 +177,13 @@ function tryUnlockMetamask (password) {
} }
} }
function transitionForward() { function transitionForward () {
return { return {
type: this.TRANSITION_FORWARD, type: this.TRANSITION_FORWARD,
} }
} }
function transitionBackward() { function transitionBackward () {
return { return {
type: this.TRANSITION_BACKWARD, type: this.TRANSITION_BACKWARD,
} }