Merge pull request bitpay#1649 from jguthrie7/bitcore-client/refactor/storage

micahriggan · web-flow · commit 206e3004fb18 · 2018-07-23T09:43:20.000-04:00
Bitcore client/refactor/storage
diff --git a/packages/bitcore-client/lib/storage.js b/packages/bitcore-client/lib/storage.js
@@ -28,19 +28,14 @@ class Storage {
     }
     this.db = levelup(leveldown(this.path), { createIfMissing, errorIfExists });
   }
+
   async loadWallet(params) {
     const { name } = params;
-    return new Promise(async (resolve, reject) => {
-      try {
-        const wallet = await this.db.get(`wallet|${name}`);
-        if (wallet) {
-          resolve(JSON.parse(wallet));
-        }
-        resolve(null);
-      } catch (err) {
-        reject(err);
-      }
-    });
+    const wallet = await this.db.get(`wallet|${name}`);
+    if (!wallet) {
+      return;
+    }
+    return JSON.parse(wallet);
   }
 
   listWallets() {
@@ -64,7 +59,7 @@ class Storage {
       );
       return JSON.parse(decrypted);
     } else {
-      json;
+      return json;
     }
   }
   async addKeys(params) {
