Browse Source
Fix various warnings
Found while building on Debian 7
pull/4/head
Luke Dashjr
9 years ago
committed by
Jack Grigg
No known key found for this signature in database
GPG Key ID: 6A6914DAFBEA00DA
3 changed files with
4 additions and
4 deletions
-
src/main.h
-
src/rest.cpp
-
src/txmempool.cpp
|
|
@ -145,7 +145,7 @@ extern bool fPruneMode; |
|
|
|
/** Number of MiB of block files that we're trying to stay below. */ |
|
|
|
extern uint64_t nPruneTarget; |
|
|
|
/** Block files containing a block-height within MIN_BLOCKS_TO_KEEP of chainActive.Tip() will not be pruned. */ |
|
|
|
static const signed int MIN_BLOCKS_TO_KEEP = 288; |
|
|
|
static const unsigned int MIN_BLOCKS_TO_KEEP = 288; |
|
|
|
|
|
|
|
// Require that user allocate at least 550MB for block & undo files (blk???.dat and rev???.dat)
|
|
|
|
// At 1MB per block, 288 blocks = 288MB.
|
|
|
@ -155,7 +155,7 @@ static const signed int MIN_BLOCKS_TO_KEEP = 288; |
|
|
|
// full block file chunks, we need the high water mark which triggers the prune to be
|
|
|
|
// one 128MB block file + added 15% undo data = 147MB greater for a total of 545MB
|
|
|
|
// Setting the target to > than 550MB will make it likely we can respect the target.
|
|
|
|
static const signed int MIN_DISK_SPACE_FOR_BLOCK_FILES = 550 * 1024 * 1024; |
|
|
|
static const uint64_t MIN_DISK_SPACE_FOR_BLOCK_FILES = 550 * 1024 * 1024; |
|
|
|
|
|
|
|
/** Register with a network node to receive its signals */ |
|
|
|
void RegisterNodeSignals(CNodeSignals& nodeSignals); |
|
|
|
|
|
@ -20,7 +20,7 @@ |
|
|
|
|
|
|
|
using namespace std; |
|
|
|
|
|
|
|
static const int MAX_GETUTXOS_OUTPOINTS = 15; //allow a max of 15 outpoints to be queried at once
|
|
|
|
static const size_t MAX_GETUTXOS_OUTPOINTS = 15; //allow a max of 15 outpoints to be queried at once
|
|
|
|
|
|
|
|
enum RetFormat { |
|
|
|
RF_UNDEF, |
|
|
|
|
|
@ -176,7 +176,7 @@ void CTxMemPool::removeCoinbaseSpends(const CCoinsViewCache *pcoins, unsigned in |
|
|
|
continue; |
|
|
|
const CCoins *coins = pcoins->AccessCoins(txin.prevout.hash); |
|
|
|
if (fSanityCheck) assert(coins); |
|
|
|
if (!coins || (coins->IsCoinBase() && nMemPoolHeight - coins->nHeight < COINBASE_MATURITY)) { |
|
|
|
if (!coins || (coins->IsCoinBase() && ((signed long)nMemPoolHeight) - coins->nHeight < COINBASE_MATURITY)) { |
|
|
|
transactionsToRemove.push_back(tx); |
|
|
|
break; |
|
|
|
} |
|
|
|