From 4ab7ef8270a8c259e595c3cf3eb9debd6ef9e04f Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Fri, 29 Oct 2021 16:09:15 +0200
Subject: [PATCH] fix migration test

---
 apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts | 2 +-
 apps/remix-ide/src/app.js                              | 4 ++--
 apps/remix-ide/src/app/files/fileManager.js            | 9 +++++----
 apps/remix-ide/src/app/files/fileProvider.js           | 1 -
 apps/remix-ide/src/lib/gist-handler.js                 | 2 ++
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts b/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts
index 9c43d996ee..bac7bd9e6a 100644
--- a/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts
+++ b/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts
@@ -9,7 +9,7 @@ module.exports = {
   'Should have README file with TEST README as content': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('*[data-id="remixIdeSidePanel"]', 5000)
       .click('*[data-id="verticalIconsFileExplorerIcons"]')
-      .openFile('README.txt')
+      .openFile('TEST_README.txt')
       .getEditorValue((content) => {
         browser.assert.equal(content, 'TEST README')
       })
diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js
index 715297008c..a22de6db40 100644
--- a/apps/remix-ide/src/app.js
+++ b/apps/remix-ide/src/app.js
@@ -20,7 +20,7 @@ import { MainPanel } from './app/components/main-panel'
 
 import { OffsetToLineColumnConverter, CompilerMetadata, CompilerArtefacts, FetchAndCompile, CompilerImports } from '@remix-project/core-plugin'
 
-import migrateFileSystem from './migrateFileSystem'
+
 
 const isElectron = require('is-electron')
 const csjs = require('csjs-inject')
@@ -158,7 +158,7 @@ class App {
 
     registry.put({ api: self._components.filesProviders, name: 'fileproviders' })
 
-    migrateFileSystem(self._components.filesProviders.browser)
+
   }
 
   init () {
diff --git a/apps/remix-ide/src/app/files/fileManager.js b/apps/remix-ide/src/app/files/fileManager.js
index f784d31049..15af51c52d 100644
--- a/apps/remix-ide/src/app/files/fileManager.js
+++ b/apps/remix-ide/src/app/files/fileManager.js
@@ -744,10 +744,10 @@ class FileManager extends Plugin {
     if (!fileProvider) fileProvider = 'browser'
     if (override === undefined) override = false
 
-    async.each(Object.keys(filesSet), (file, callback) => {
+    async.each(Object.keys(filesSet), async (file, callback) => {
       if (override) {
         try {
-          self._deps.filesProviders[fileProvider].set(file, filesSet[file].content)
+          await self._deps.filesProviders[fileProvider].set(file, filesSet[file].content)
         } catch (e) {
           return callback(e.message || e)
         }
@@ -756,14 +756,15 @@ class FileManager extends Plugin {
       }
 
       helper.createNonClashingName(file, self._deps.filesProviders[fileProvider],
-        (error, name) => {
+        async (error, name) => {
           if (error) {
             modalDialogCustom.alert('Unexpected error loading the file ' + error)
           } else if (helper.checkSpecialChars(name)) {
             modalDialogCustom.alert('Special characters are not allowed')
           } else {
             try {
-              self._deps.filesProviders[fileProvider].set(name, filesSet[file].content)
+              console.log('set ', fileProvider, name, filesSet[file].content)
+              await self._deps.filesProviders[fileProvider].set(name, filesSet[file].content)
             } catch (e) {
               return callback(e.message || e)
             }
diff --git a/apps/remix-ide/src/app/files/fileProvider.js b/apps/remix-ide/src/app/files/fileProvider.js
index c078b96e5d..3c310e0644 100644
--- a/apps/remix-ide/src/app/files/fileProvider.js
+++ b/apps/remix-ide/src/app/files/fileProvider.js
@@ -293,7 +293,6 @@ class FileProvider {
       return ret
     } catch (error) {
       if (cb) cb(error, null)
-      throw new Error(error)
     }
   }
 
diff --git a/apps/remix-ide/src/lib/gist-handler.js b/apps/remix-ide/src/lib/gist-handler.js
index da881e1103..6772cdc2ca 100644
--- a/apps/remix-ide/src/lib/gist-handler.js
+++ b/apps/remix-ide/src/lib/gist-handler.js
@@ -58,8 +58,10 @@ function GistHandler (_window) {
 
           obj['/' + 'gist-' + gistId + '/' + path] = data.files[element]
         })
+        console.log('loading gist', obj)
         fileManager.setBatchFiles(obj, 'workspace', true, (errorLoadingFile) => {
           if (!errorLoadingFile) {
+            console.log('gist loaded')
             const provider = fileManager.getProvider('workspace')
             provider.lastLoadedGistId = gistId
           } else {