Merge pull request #1086 from MetaMask/kumavis-refactor7

Refactor round 7

1 files changed, 12 insertions, 1 deletions

diff --git a/app/scripts/lib/migrator/index.js b/app/scripts/lib/migrator/index.js
index ab5a757b3..312345263 100644
--- a/app/scripts/lib/migrator/index.js
+++ b/app/scripts/lib/migrator/index.js
@@ -15,7 +15,7 @@ class Migrator {
     let remaining = this.migrations.filter(migrationIsPending)
     
     return (
-      asyncQ.eachSeries(remaining, (migration) => migration.migrate(versionedData))
+      asyncQ.eachSeries(remaining, (migration) => this.runMigration(versionedData, migration))
       .then(() => versionedData)
     )
 
@@ -26,6 +26,17 @@ class Migrator {
     }
   }
 
+  runMigration(versionedData, migration) {
+    return (
+      migration.migrate(versionedData)
+      .then((versionedData) => {
+        if (!versionedData.data) return Promise.reject(new Error('Migrator - Migration returned empty data'))
+        if (migration.version !== undefined && versionedData.meta.version !== migration.version) return Promise.reject(new Error('Migrator - Migration did not update version number correctly'))
+        return Promise.resolve(versionedData)
+      })
+    )
+  }
+
   generateInitialState (initState) {
     return {
       meta: {