diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 0e5376990..35320ecdf 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -155,8 +155,8 @@ UniValue generateBlocks(boost::shared_ptr 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; diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index c60b2a3f2..d0fcdfdef 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -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); } }