Fix migrating persistant old identity file (#1100)

OriginTrail · Dec 26, 2019 · bafb342 · bafb342
1 parent 51908f3
commit bafb342
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 22 deletions.
diff --git a/modules/migration/m3-network-identity-migration.js b/modules/migration/m3-network-identity-migration.js
@@ -30,17 +30,22 @@ class M3NetworkIdentityMigration {
 
             const backupPath = path.join(this.config.appDataPath, 'Node_2_0_59_Identity_Backup');
             const { xprivkey, index } = identityFileContent;
-            if ((xprivkey || index)
-                && this.config.autoUpdater.enabled
-                && !fs.existsSync(backupPath)) {
+            if ((xprivkey || index) && this.config.autoUpdater.enabled) {
                 this.logger.info('Old network identity detected, running code migrations...');
 
                 // Backup data
-                execSync(`mkdir ${backupPath}`);
+                if (!fs.existsSync(backupPath)) {
+                    execSync(`mkdir ${backupPath}`);
+
+                    try {
+                        execSync(`/bin/mv ${path.join(this.config.appDataPath, 'peercache')} ${backupPath}/`);
+                        execSync(`/bin/mv ${path.join(this.config.appDataPath, 'kadence.dht')} ${backupPath}/`);
+                    } catch (e) {
+                        this.logger.debug('peercache and kadence.dht not found');
+                    }
+                }
 
                 execSync(`/bin/mv ${identityFilePath} ${backupPath}/`);
-                execSync(`/bin/mv ${path.join(this.config.appDataPath, 'peercache')} ${backupPath}/`);
-                execSync(`/bin/mv ${path.join(this.config.appDataPath, 'kadence.dht')} ${backupPath}/`);
             }
         }
     }

diff --git a/ot-node.js b/ot-node.js
@@ -498,22 +498,14 @@ class OTNode {
     async _runNetworkIdentityMigration(config) {
         const migrationsStartedMills = Date.now();
 
-        const migrationDir = path.join(config.appDataPath, 'migrations');
-        const m3NetworkIdentityMigrationFilename = '3_m3NetworkIdentityMigrationFile';
-        const migrationFilePath = path.join(migrationDir, m3NetworkIdentityMigrationFilename);
-        if (!fs.existsSync(migrationFilePath)) {
-            const migration = new M3NetowrkIdentityMigration({ logger: log, config });
-            try {
-                await migration.run();
-                log.notify(`One-time network identity migration completed. Lasted ${Date.now() - migrationsStartedMills} millisecond(s)`);
-
-                await Utilities.writeContentsToFile(migrationDir, m3NetworkIdentityMigrationFilename, 'PROCESSED');
-            } catch (e) {
-                log.error(`Failed to run code migrations. Lasted ${Date.now() - migrationsStartedMills} millisecond(s). ${e.message}`);
-                console.log(e);
-                notifyBugsnag(e);
-                process.exit(1);
-            }
+        const migration = new M3NetowrkIdentityMigration({ logger: log, config });
+        try {
+            await migration.run();
+        } catch (e) {
+            log.error(`Failed to run code migrations. Lasted ${Date.now() - migrationsStartedMills} millisecond(s). ${e.message}`);
+            console.log(e);
+            notifyBugsnag(e);
+            process.exit(1);
         }
     }