diff options
| author | Patrick Lodder <[email protected]> | 2021-08-24 00:49:26 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-08-24 00:49:26 +0200 |
| commit | 5f411050968df80fb6a6bd2bb132f14fe5813108 (patch) | |
| tree | ee5b14c159ec5edd3e99f37ea14b5010c86d93af /src | |
| parent | Merge pull request #2479 from slightlyskepticalpotat/snap-improvements (diff) | |
| parent | Clean up whitespace in modified code (diff) | |
| download | discoin-5f411050968df80fb6a6bd2bb132f14fe5813108.tar.xz discoin-5f411050968df80fb6a6bd2bb132f14fe5813108.zip | |
Merge pull request #2487 from chromatic/fix-compiler-warnings
Fix compiler warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/dogecoin-fees.cpp | 1 | ||||
| -rw-r--r-- | src/rpc/mining.cpp | 7 | ||||
| -rw-r--r-- | src/wallet/wallet.cpp | 8 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/dogecoin-fees.cpp b/src/dogecoin-fees.cpp index 890908ad6..96f8655cf 100644 --- a/src/dogecoin-fees.cpp +++ b/src/dogecoin-fees.cpp @@ -23,6 +23,7 @@ CAmount GetDogecoinWalletFee(size_t nBytes_) { //mlumin: super simple fee calc for dogecoin CAmount nFee=GetDogecoinWalletFeeRate().GetFee(nBytes_); + return nFee; } //mlumin 5/2021: Establish a wallet rate of n koinu per kb. diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 0637d6b33..35320ecdf 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -151,13 +151,14 @@ UniValue generateBlocks(boost::shared_ptr<CReserveScript> coinbaseScript, int nG } } std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(*pblock); - if (!ProcessNewBlock(Params(), shared_pblock, true, NULL)) + if (!ProcessNewBlock(Params(), shared_pblock, true, NULL)) { if (nMineAuxPow) { continue; } - else { - throw JSONRPCError(RPC_INTERNAL_ERROR, "ProcessNewBlock, block not accepted"); + else { + throw JSONRPCError(RPC_INTERNAL_ERROR, "ProcessNewBlock, block not accepted"); } + } ++nHeight; blockHashes.push_back(pblock->GetHash().GetHex()); diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index fa8526686..d0fcdfdef 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3900,11 +3900,11 @@ 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","")); - CWallet:minTxFee = CFeeRate(nFeePerK,1000); + LogPrintf("%s: parameter interaction: -paytxfee=%s -> setting -mintxfee=%s\n", __func__, GetArg("-paytxfee",""), GetArg("-paytxfee","")); + CWallet::minTxFee = CFeeRate(nFeePerK,1000); } } if (IsArgSet("-maxtxfee")) |