Merge pull request #1431 from josepfo/fix/mock-scoring-flag

Fix: mock scoring flag

lib/cash-in/cash-in-tx.js

@@ -179,6 +179,9 @@ function doesTxReuseAddress (tx) {
 }
 
 function getWalletScore (tx, pi) {
+  pi.isWalletScoringEnabled(tx)
+    .then(isEnabled => {
+      if(!isEnabled) return null
       if (!tx.fiat || tx.fiat.isZero()) {
         return pi.rateWallet(tx.cryptoCode, tx.toAddress)
       }
@@ -189,6 +192,7 @@ function getWalletScore (tx, pi) {
           score: tx.walletScore,
           isValid
         }))
+    })
 }
 
 function monitorPending (settings) {

lib/cash-out/cash-out-tx.js

@@ -122,6 +122,9 @@ function getWalletScore (tx, pi) {
     return tx
 
     // Transaction shows up on the blockchain, we can request the sender address
+  return pi.isWalletScoringEnabled(tx)
+    .then(isEnabled => {
+      if (!isEnabled) return tx
       return pi.getTransactionHash(tx)
         .then(rejectEmpty("No transaction hashes"))
         .then(txHashes => pi.getInputAddresses(tx, txHashes))
@@ -146,6 +149,7 @@ function getWalletScore (tx, pi) {
           errorCode: 'ciphertraceError',
           dispense: true
         }))
+    })
 }
 
 function monitorLiveIncoming (settings) {

lib/plugins.js

@@ -850,6 +850,10 @@ function plugins (settings, deviceId) {
     return walletScoring.getInputAddresses(settings, tx.cryptoCode, txHashes)
   }
 
+  function isWalletScoringEnabled (tx) {
+    return walletScoring.isWalletScoringEnabled(settings, tx.cryptoCode)
+  }
+
   return {
     getRates,
     recordPing,
@@ -882,7 +886,8 @@ function plugins (settings, deviceId) {
     rateWallet,
     isValidWalletScore,
     getTransactionHash,
-    getInputAddresses
+    getInputAddresses,
+    isWalletScoringEnabled
   }
 }
 

lib/plugins/wallet-scoring/ciphertrace/ciphertrace.js

@@ -126,10 +126,19 @@ function getInputAddresses (account, cryptoCode, txHashes) {
     })
 }
 
+function isWalletScoringEnabled (account, cryptoCode) {
+  if (!SUPPORTED_COINS.includes(cryptoCode)) {
+    return Promise.reject(new Error('Unsupported crypto: ' + cryptoCode))
+  }
+
+  return Promise.resolve(!_.isNil(account) && account.enabled)
+}
+
 module.exports = {
   NAME,
   rateWallet,
   isValidWalletScore,
   getTransactionHash,
-  getInputAddresses
+  getInputAddresses,
+  isWalletScoringEnabled
 }

lib/plugins/wallet-scoring/mock-scoring/mock-scoring.js

@@ -36,10 +36,20 @@ function getInputAddresses (account, cryptoCode, txHashes) {
   })
 }
 
+function isWalletScoringEnabled (account, cryptoCode) {
+  return new Promise((resolve, _) => {
+    setTimeout(() => {
+      return resolve(true)
+    }, 100)
+  })
+}
+
+
 module.exports = {
   NAME,
   rateWallet,
   isValidWalletScore,
   getTransactionHash,
-  getInputAddresses
+  getInputAddresses,
+  isWalletScoringEnabled
 }

lib/wallet-scoring.js

@@ -47,9 +47,19 @@ function getInputAddresses (settings, cryptoCode, txHashes) {
     })
 }
 
+function isWalletScoringEnabled (settings, cryptoCode) {
+  return Promise.resolve()
+    .then(() => {
+      const { plugin, account } = loadWalletScoring(settings)
+
+      return plugin.isWalletScoringEnabled(account, cryptoCode)
+    })
+}
+
 module.exports = {
   rateWallet,
   isValidWalletScore,
   getTransactionHash,
-  getInputAddresses
+  getInputAddresses,
+  isWalletScoringEnabled
 }

package.json

@@ -123,7 +123,7 @@
     "test": "mocha --recursive tests",
     "jtest": "jest --detectOpenHandles",
     "build-admin": "npm run build-admin:css && npm run build-admin:main && npm run build-admin:lamassu",
-    "server": "nodemon bin/lamassu-server --mockSms --logLevel silly",
+    "server": "nodemon bin/lamassu-server --mockSms --mockScoring --logLevel silly",
     "admin-server": "nodemon bin/lamassu-admin-server --dev --logLevel silly",
     "graphql-server": "nodemon bin/new-graphql-dev-insecure",
     "watch": "concurrently \"npm:server\" \"npm:admin-server\" \"npm:graphql-server\"",