From 72cf236bd655427a7782e03f2e6e0614e5c5cde2 Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Tue, 8 Mar 2016 09:29:57 -0300 Subject: [PATCH] fix variable names --- lib/common/defaults.js | 2 +- lib/server.js | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/common/defaults.js b/lib/common/defaults.js index a2f5f85..9b0f468 100644 --- a/lib/common/defaults.js +++ b/lib/common/defaults.js @@ -51,7 +51,7 @@ Defaults.HISTORY_LIMIT = 100; Defaults.UTXO_SELECTION_MAX_SINGLE_UTXO_FACTOR = 2; Defaults.UTXO_SELECTION_MAX_FEE_VS_SINGLE_UTXO_FEE_FACTOR = 5; -Defaults.UTXO_SELECTION_MAX_TX_AMOUNT_VS_FEE_FACTOR = 0.002; +Defaults.UTXO_SELECTION_MAX_FEE_VS_TX_AMOUNT_FACTOR = 0.002; Defaults.UTXO_SELECTION_MIN_TX_AMOUNT_VS_UTXO_FACTOR = 0.1; module.exports = Defaults; diff --git a/lib/server.js b/lib/server.js index c56b490..e77f6e3 100644 --- a/lib/server.js +++ b/lib/server.js @@ -1352,12 +1352,12 @@ WalletService.prototype._selectTxInputs = function(txp, utxosToExclude, cb) { log.debug('Tx size: ' + Utils.formatSize(txpSize) + ', Tx fee: ' + Utils.formatAmountInBtc(txpFee)); - var amountVsFeeRatio = txpFee / txpAmount; - var singleInputFeeVsFeeRatio = txpFee / (baseTxpFee + feePerInput); + var feeVsAmountRatio = txpFee / txpAmount; + var feeVsSingleInputFeeRatio = txpFee / (baseTxpFee + feePerInput); var amountVsUtxoRatio = inputAmount / txpAmount; - log.debug('Tx amount/Fee: ' + Utils.formatRatio(amountVsFeeRatio) + ' (max: ' + Utils.formatRatio(Defaults.UTXO_SELECTION_MAX_TX_AMOUNT_VS_FEE_FACTOR) + ')'); - log.debug('Single-input fee/Multi-input fee: ' + Utils.formatRatio(singleInputFeeVsFeeRatio) + ' (max: ' + Utils.formatRatio(Defaults.UTXO_SELECTION_MAX_FEE_VS_SINGLE_UTXO_FEE_FACTOR) + ')' + ' loses wrt single-input tx: ' + Utils.formatAmountInBtc((selected.length - 1) * feePerInput)); + log.debug('Tx amount/Fee: ' + Utils.formatRatio(feeVsAmountRatio) + ' (max: ' + Utils.formatRatio(Defaults.UTXO_SELECTION_MAX_FEE_VS_TX_AMOUNT_FACTOR) + ')'); + log.debug('Single-input fee/Multi-input fee: ' + Utils.formatRatio(feeVsSingleInputFeeRatio) + ' (max: ' + Utils.formatRatio(Defaults.UTXO_SELECTION_MAX_FEE_VS_SINGLE_UTXO_FEE_FACTOR) + ')' + ' loses wrt single-input tx: ' + Utils.formatAmountInBtc((selected.length - 1) * feePerInput)); log.debug('Tx amount/input amount:' + Utils.formatRatio(amountVsUtxoRatio) + ' (min: ' + Utils.formatRatio(Defaults.UTXO_SELECTION_MIN_TX_AMOUNT_VS_UTXO_FACTOR) + ')'); if (txpSize / 1000. > Defaults.MAX_TX_SIZE_IN_KB) { @@ -1367,8 +1367,8 @@ WalletService.prototype._selectTxInputs = function(txp, utxosToExclude, cb) { } if (!_.isEmpty(bigInputs)) { - if ((amountVsFeeRatio > Defaults.UTXO_SELECTION_MAX_TX_AMOUNT_VS_FEE_FACTOR && - singleInputFeeVsFeeRatio > Defaults.UTXO_SELECTION_MAX_FEE_VS_SINGLE_UTXO_FEE_FACTOR)) { + if ((feeVsAmountRatio > Defaults.UTXO_SELECTION_MAX_FEE_VS_TX_AMOUNT_FACTOR && + feeVsSingleInputFeeRatio > Defaults.UTXO_SELECTION_MAX_FEE_VS_SINGLE_UTXO_FEE_FACTOR)) { log.debug('Breaking because fee exceeded fee/amount ratio and fee is too expensive compared to single input tx'); return false; }