wallet: clean up remove and test

handshake-org · Feb 4, 2021 · 5b77ede · 5b77ede
1 parent 79b3b05
commit 5b77ede
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/lib/wallet/walletdb.js b/lib/wallet/walletdb.js
@@ -1018,6 +1018,16 @@ class WalletDB extends EventEmitter {
       return this.removePathMap(b, hash, wid);
     });
 
+    const niter = this.db.iterator({
+      gte: layout.N.min(),
+      lte: layout.N.max()
+    });
+
+    await niter.each((key) => {
+      const [hash] = layout.N.decode(key);
+      return this.removeNameMap(b, hash, wid);
+    });
+
     const removeRange = (opt) => {
       return this.db.iterator(opt).each(key => b.del(key));
     };
@@ -1070,16 +1080,6 @@ class WalletDB extends EventEmitter {
       return this.removeOutpointMap(b, hash, index, wid);
     });
 
-    const niter = this.db.iterator({
-      gte: layout.N.min(),
-      lte: layout.N.max()
-    });
-
-    await niter.each((key) => {
-      const [hash] = layout.N.decode(key);
-      return this.removeNameMap(b, hash, wid);
-    });
-
     const uiter = bucket.iterator({
       gte: tlayout.p.min(),
       lte: tlayout.p.max(),

diff --git a/test/wallet-test.js b/test/wallet-test.js
@@ -1510,20 +1510,23 @@ describe('Wallet', function() {
     await b.write();
 
     // Should return tx from TX Map
-    assert(await wdb.getWalletsByTX(mtx));
+    let wids = await wdb.getWalletsByTX(mtx);
+    assert(wids.has(wid));
 
     // Should have wid in NameMap
-    const map = await wdb.getNameMap(hashName('test123'));
+    let map = await wdb.getNameMap(hashName('test123'));
     assert(map.wids.has(wid));
 
     // Remove wallet
     await wdb.remove('alice100');
 
-    // Should not return wid from NameMap after wid is removed
-    assert(!await wdb.getNameMap(hashName('test123')));
-
     // Should not return tx from TX Map after wallet is removed
-    assert(!await wdb.getWalletsByTX(mtx));
+    wids = await wdb.getWalletsByTX(mtx);
+    assert.strictEqual(wids, null);
+
+    // Should not return wid from NameMap after wid is removed
+    map = await wdb.getNameMap(hashName('test123'));
+    assert.strictEqual(map, null);
 
     // Should not return wallet after it is removed
     assert(!await wdb.get('alice100'));