aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Morcos <morcos@chaincode.com>2017-01-19 14:59:28 -0500
committerAlex Morcos <morcos@chaincode.com>2017-02-27 11:23:50 -0500
commit400b15147cf1c4757927935222611e8d3481e739 (patch)
tree60b8bf57b3c698f333640daa3cc10fe4f791d445
parent272b25a6a99057fdcd5db5bce70b49625e973080 (diff)
downloadbitcoin-400b15147cf1c4757927935222611e8d3481e739.tar.xz
[debug] Change -printpriority option
-printpriority output is now changed to only show the fee rate and hash of transactions included in a block by the mining code.
-rw-r--r--src/init.cpp2
-rw-r--r--src/miner.cpp6
2 files changed, 2 insertions, 6 deletions
diff --git a/src/init.cpp b/src/init.cpp
index e664721868..c6026646d0 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -456,7 +456,7 @@ std::string HelpMessage(HelpMessageMode mode)
strUsage += HelpMessageOpt("-printtoconsole", _("Send trace/debug info to console instead of debug.log file"));
if (showDebug)
{
- strUsage += HelpMessageOpt("-printpriority", strprintf("Log transaction priority and fee per kB when mining blocks (default: %u)", DEFAULT_PRINTPRIORITY));
+ strUsage += HelpMessageOpt("-printpriority", strprintf("Log transaction fee per kB when mining blocks (default: %u)", DEFAULT_PRINTPRIORITY));
}
strUsage += HelpMessageOpt("-shrinkdebugfile", _("Shrink debug.log file on client startup (default: 1 when no -debug)"));
diff --git a/src/miner.cpp b/src/miner.cpp
index 1198dbb097..75c9d82a2f 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -263,11 +263,7 @@ void BlockAssembler::AddToBlock(CTxMemPool::txiter iter)
bool fPrintPriority = GetBoolArg("-printpriority", DEFAULT_PRINTPRIORITY);
if (fPrintPriority) {
- double dPriority = iter->GetPriority(nHeight);
- CAmount dummy;
- mempool.ApplyDeltas(iter->GetTx().GetHash(), dPriority, dummy);
- LogPrintf("priority %.1f fee %s txid %s\n",
- dPriority,
+ LogPrintf("fee %s txid %s\n",
CFeeRate(iter->GetModifiedFee(), iter->GetTxSize()).ToString(),
iter->GetTx().GetHash().ToString());
}