maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Clean up whitespace in modified code

Browse source
This commit is contained in:
chromatic 2021-08-22 12:33:50 -07:00
parent d8643a4129
commit 622d1cc126
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/rpc/mining.cpp
View file

@ -155,8 +155,8 @@ UniValue generateBlocks(boost::shared_ptr<CReserveScript> coinbaseScript, int nG
if (nMineAuxPow) {
continue;
}
else {
throw JSONRPCError(RPC_INTERNAL_ERROR, "ProcessNewBlock, block not accepted");
else {
throw JSONRPCError(RPC_INTERNAL_ERROR, "ProcessNewBlock, block not accepted");
}
}
++nHeight;

6
src/wallet/wallet.cpp
View file

@ -3900,10 +3900,10 @@ bool CWallet::ParameterInteraction()
GetArg("-paytxfee", ""), ::minRelayTxFeeRate.ToString()));
}
// if -mintxfee is not set, then a lower payTxFee overrides minTxFee
if (!IsArgSet("-mintxfee") && payTxFee < CWallet::minTxFee)
// if -mintxfee is not set, then a lower payTxFee overrides 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);
}
}