v6.1.1: do not fetch all assets if only is defined

ufw0x · Apr 11, 2022 · ef94ef6 · ef94ef6
1 parent 8b9075c
commit ef94ef6
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 49 deletions.
diff --git a/dist/esm/index.js b/dist/esm/index.js
@@ -152,22 +152,24 @@ var dripAssets = async (options) => {
 
   // All other assets
 
-  let allAssets = await getAssets(options);
-  promises = promises.concat((allAssets.map((asset)=>{
-    return new Promise((resolve, reject)=>{
-      return new Token(asset).balance(options.accounts[asset.blockchain]).then((balance)=>{
-        if(exists({ assets, asset })) { return resolve() }
-        const assetWithBalance = reduceAssetWithBalance(asset, balance);
-        if(assetWithBalance.balance != '0') {
-          assets.push(assetWithBalance);
-          if(typeof options.drip == 'function') { options.drip(assetWithBalance); }
-          resolve(assetWithBalance);
-        } else {
-          resolve();
-        }
+  if(options.only == undefined || Object.keys(options.only).every((list)=>list.length == 0)) {
+    let allAssets = await getAssets(options);
+    promises = promises.concat((allAssets.map((asset)=>{
+      return new Promise((resolve, reject)=>{
+        return new Token(asset).balance(options.accounts[asset.blockchain]).then((balance)=>{
+          if(exists({ assets, asset })) { return resolve() }
+          const assetWithBalance = reduceAssetWithBalance(asset, balance);
+          if(assetWithBalance.balance != '0') {
+            assets.push(assetWithBalance);
+            if(typeof options.drip == 'function') { options.drip(assetWithBalance); }
+            resolve(assetWithBalance);
+          } else {
+            resolve();
+          }
+        })
       })
-    })
-  })));
+    })));
+  }
 
   await Promise.all(promises);
 

diff --git a/dist/umd/index.js b/dist/umd/index.js
@@ -153,22 +153,24 @@
 
     // All other assets
 
-    let allAssets = await getAssets(options);
-    promises = promises.concat((allAssets.map((asset)=>{
-      return new Promise((resolve, reject)=>{
-        return new web3Tokens.Token(asset).balance(options.accounts[asset.blockchain]).then((balance)=>{
-          if(exists({ assets, asset })) { return resolve() }
-          const assetWithBalance = reduceAssetWithBalance(asset, balance);
-          if(assetWithBalance.balance != '0') {
-            assets.push(assetWithBalance);
-            if(typeof options.drip == 'function') { options.drip(assetWithBalance); }
-            resolve(assetWithBalance);
-          } else {
-            resolve();
-          }
+    if(options.only == undefined || Object.keys(options.only).every((list)=>list.length == 0)) {
+      let allAssets = await getAssets(options);
+      promises = promises.concat((allAssets.map((asset)=>{
+        return new Promise((resolve, reject)=>{
+          return new web3Tokens.Token(asset).balance(options.accounts[asset.blockchain]).then((balance)=>{
+            if(exists({ assets, asset })) { return resolve() }
+            const assetWithBalance = reduceAssetWithBalance(asset, balance);
+            if(assetWithBalance.balance != '0') {
+              assets.push(assetWithBalance);
+              if(typeof options.drip == 'function') { options.drip(assetWithBalance); }
+              resolve(assetWithBalance);
+            } else {
+              resolve();
+            }
+          })
         })
-      })
-    })));
+      })));
+    }
 
     await Promise.all(promises);
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/web3-assets",
   "moduleName": "Web3Assets",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "description": "",
   "main": "dist/umd/index.js",
   "module": "dist/esm/index.js",

diff --git a/src/dripAssets.js b/src/dripAssets.js
@@ -87,22 +87,24 @@ export default async (options) => {
 
   // All other assets
 
-  let allAssets = await getAssets(options)
-  promises = promises.concat((allAssets.map((asset)=>{
-    return new Promise((resolve, reject)=>{
-      return new Token(asset).balance(options.accounts[asset.blockchain]).then((balance)=>{
-        if(exists({ assets, asset })) { return resolve() }
-        const assetWithBalance = reduceAssetWithBalance(asset, balance)
-        if(assetWithBalance.balance != '0') {
-          assets.push(assetWithBalance)
-          if(typeof options.drip == 'function') { options.drip(assetWithBalance) }
-          resolve(assetWithBalance)
-        } else {
-          resolve()
-        }
+  if(options.only == undefined || Object.keys(options.only).every((list)=>list.length == 0)) {
+    let allAssets = await getAssets(options)
+    promises = promises.concat((allAssets.map((asset)=>{
+      return new Promise((resolve, reject)=>{
+        return new Token(asset).balance(options.accounts[asset.blockchain]).then((balance)=>{
+          if(exists({ assets, asset })) { return resolve() }
+          const assetWithBalance = reduceAssetWithBalance(asset, balance)
+          if(assetWithBalance.balance != '0') {
+            assets.push(assetWithBalance)
+            if(typeof options.drip == 'function') { options.drip(assetWithBalance) }
+            resolve(assetWithBalance)
+          } else {
+            resolve()
+          }
+        })
       })
-    })
-  })))
+    })))
+  }
 
   await Promise.all(promises)
 

diff --git a/tests/setup.js b/tests/setup.js
@@ -1,4 +1 @@
 import 'regenerator-runtime/runtime'
-
-import fetch from 'cross-fetch'
-global.fetch = fetch