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

use asyncQ.waterfall instead of asyncQ.eachSeries

Browse Source
This commit is contained in:
frankiebee 2017-05-11 10:46:17 +02:00
parent 1772d34e94
commit 6c01b26845
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/scripts/lib/migrator/index.js
View File

@ -14,9 +14,15 @@ class Migrator {
migrateData (versionedData = this.generateInitialState()) {
const remaining = this.migrations.filter(migrationIsPending)
if (remaining.length === 0) return versionedData
const migrations = remaining.map((migration, i) => {
if (i === 0) return this.runMigration.bind(this, migration, versionedData)
return this.runMigration.bind(this, migration)
})
return (
asyncQ.eachSeries(remaining, (migration) => this.runMigration(versionedData, migration))
.then((migratedData) => migratedData.pop())
asyncQ.waterfall(migrations)
.then((migratedData) => Promise.resolve(migratedData))
)
// migration is "pending" if hit has a higher
@ -26,10 +32,10 @@ class Migrator {
}
}
runMigration (versionedData, migration) {
runMigration (migration, versionedData) {
return migration.migrate(versionedData)
.then((migratedData) => {
if (!migratedData.data) return Promise.reject(new Error('Migrator - Migration returned empty data'))
if (!migratedData.data) return Promise.reject(new Error('Migrator - migration returned empty data'))
if (migration.version !== undefined && migratedData.meta.version !== migration.version) return Promise.reject(new Error('Migrator - Migration did not update version number correctly'))
return Promise.resolve(migratedData)