Clean up whitespace in modified code
This commit is contained in:
parent
d8643a4129
commit
622d1cc126
|
@ -155,8 +155,8 @@ UniValue generateBlocks(boost::shared_ptr<CReserveScript> coinbaseScript, int nG
|
||||||
if (nMineAuxPow) {
|
if (nMineAuxPow) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
throw JSONRPCError(RPC_INTERNAL_ERROR, "ProcessNewBlock, block not accepted");
|
throw JSONRPCError(RPC_INTERNAL_ERROR, "ProcessNewBlock, block not accepted");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
++nHeight;
|
++nHeight;
|
||||||
|
|
|
@ -3900,10 +3900,10 @@ bool CWallet::ParameterInteraction()
|
||||||
GetArg("-paytxfee", ""), ::minRelayTxFeeRate.ToString()));
|
GetArg("-paytxfee", ""), ::minRelayTxFeeRate.ToString()));
|
||||||
}
|
}
|
||||||
|
|
||||||
// if -mintxfee is not set, then a lower payTxFee overrides minTxFee
|
// if -mintxfee is not set, then a lower payTxFee overrides minTxFee
|
||||||
if (!IsArgSet("-mintxfee") && payTxFee < CWallet::minTxFee)
|
if (!IsArgSet("-mintxfee") && payTxFee < CWallet::minTxFee)
|
||||||
{
|
{
|
||||||
LogPrintf("%s: parameter interaction: -paytxfee=%s -> setting -mintxfee=%s\n", __func__, GetArg("-paytxfee",""), GetArg("-paytxfee",""));
|
LogPrintf("%s: parameter interaction: -paytxfee=%s -> setting -mintxfee=%s\n", __func__, GetArg("-paytxfee",""), GetArg("-paytxfee",""));
|
||||||
CWallet::minTxFee = CFeeRate(nFeePerK,1000);
|
CWallet::minTxFee = CFeeRate(nFeePerK,1000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue