m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge pull request #3565 from MetaMask/local-store-fix

Browse Source 
Fix local store promisification
This commit is contained in:
Dan Finlay 2018-03-14 11:27:24 -07:00 committed by GitHub
commit 19b553907c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/scripts/lib/local-store.js
View File

@ -3,7 +3,6 @@
// https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/storage/local // https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/storage/local
const extension = require('extensionizer') const extension = require('extensionizer')
const { promisify } = require('util')
module.exports = class ExtensionStore { module.exports = class ExtensionStore {
constructor() { constructor() {
@ -11,9 +10,6 @@ module.exports = class ExtensionStore {
if (!this.isSupported) { if (!this.isSupported) {
log.error('Storage local API not available.') log.error('Storage local API not available.')
} }
const local = extension.storage.local
this._get = promisify(local.get).bind(local)
this._set = promisify(local.set).bind(local)
} }
async get() { async get() {
@ -31,6 +27,34 @@ module.exports = class ExtensionStore {
async set(state) { async set(state) {
return this._set(state) return this._set(state)
} }
_get() {
const local = extension.storage.local
return new Promise((resolve, reject) => {
local.get(null, (result) => {
const err = extension.runtime.lastError
if (err) {
reject(err)
} else {
resolve(result)
}
})
})
}
_set(obj) {
const local = extension.storage.local
return new Promise((resolve, reject) => {
local.set(obj, () => {
const err = extension.runtime.lastError
if (err) {
reject(err)
} else {
resolve()
}
})
})
}
} }
function isEmpty(obj) { function isEmpty(obj) {

2
development/genStates.js
View File

@ -1,6 +1,6 @@
const fs = require('fs') const fs = require('fs')
const path = require('path') const path = require('path')
const { promisify } = require('util') const promisify = require('pify')
start().catch(console.error) start().catch(console.error)

2
development/run-version-bump.js
View File

@ -1,4 +1,4 @@
const { promisify } = require('util') const promisify = require('pify')
const fs = require('fs') const fs = require('fs')
const readFile = promisify(fs.readFile) const readFile = promisify(fs.readFile)
const writeFile = promisify(fs.writeFile) const writeFile = promisify(fs.writeFile)

4
test/unit/development/version–bump-test.js
View File

@ -1,6 +1,6 @@
const assert = require('assert') const assert = require('assert')
const versionBump = require('../../../development/version-bump') const versionBump = require('../../../development/version-bump')
const { promisify } = require('util') const promisify = require('pify')
const fs = require('fs') const fs = require('fs')
const readFile = promisify(fs.readFile) const readFile = promisify(fs.readFile)
const path = require('path') const path = require('path')
@ -41,5 +41,3 @@ describe('version bumper', function () {
assert.ok(result.changelog.includes(expected)) assert.ok(result.changelog.includes(expected))
}) })
}) })