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

Merge pull request #2487 from chromatic/fix-compiler-warnings

Browse source 
Fix compiler warnings
This commit is contained in:
Patrick Lodder 2021-08-24 00:49:26 +02:00 committed by GitHub
parent 7a83a2363f 622d1cc126
commit 5f41105096
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dogecoin-fees.cpp
View file

@ -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.

7
src/rpc/mining.cpp
View file

@ -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());

8
src/wallet/wallet.cpp
View file

@ -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"))