DEXW-2351: remove legacy user settings during migration

wavesplatform · Nov 15, 2019 · d9d98cd · d9d98cd
1 parent 630b399
commit d9d98cd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/modules/app/services/DefaultSettings.js b/src/modules/app/services/DefaultSettings.js
@@ -193,6 +193,10 @@
                 return Object.prototype.hasOwnProperty.call(this.commonDefaults, start);
             }
 
+            getDefaultSettings() {
+                return this.defaults;
+            }
+
         }
 
         return {

diff --git a/src/modules/app/services/StorageExporter.js b/src/modules/app/services/StorageExporter.js
@@ -1,23 +1,27 @@
 (function () {
     'use strict';
 
+    const { pickBy, hasIn } = require('ramda');
+
     class StorageExporter {
 
         static $inject = [
             '$log',
             'storage',
-            'multiAccount'
+            'multiAccount',
+            'defaultSettings'
         ];
 
         /**
          * @param {ng.ILogService} $log
          * @param {app.utils.Storage} storage
          * @param {app.MultiAccount} multiAccount
          */
-        constructor($log, storage, multiAccount) {
+        constructor($log, storage, multiAccount, defaultSettings) {
             this.$log = $log;
             this.storage = storage;
             this.multiAccount = multiAccount;
+            this.defaultSettings = defaultSettings;
         }
 
         /**
@@ -49,6 +53,13 @@
                 }
             }
 
+            const predicate = (value, key) => hasIn(key, this.defaultSettings.create().getDefaultSettings());
+
+            for (const user of Object.entries(storageData.usersList)) {
+                delete user.settings.encryptionRounds;
+                user.settings = pickBy(predicate)(user.settings);
+            }
+
             return this.multiAccount.export(privateKeyFrom, publicKeyTo, storageData);
         }