Make it compile

This commit is contained in:
lateminer
2018-10-17 21:37:53 +03:00
parent 834db9539b
commit 786436baef
3 changed files with 6 additions and 35 deletions

View File

@@ -1538,8 +1538,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
if (insecure_rand()%MAX_DOUBLESPEND_BLOOM == 0)
doubleSpendFilter.clear();
doubleSpendFilter.insert(relayForOutpoint);
CFeeRate txFeeRate = CFeeRate(0);
RelayTransaction(tx, txFeeRate);
RelayTransaction(tx);
}
else
{
@@ -3633,10 +3632,13 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta
bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIndex * const pindexPrev)
{
const int nHeight = pindexPrev == NULL ? 0 : pindexPrev->nHeight + 1;
/*
const Consensus::Params& consensusParams = Params().GetConsensus();
// Start enforcing BIP113 (Median Time Past) using versionbits logic.
int nLockTimeFlags = 0;
*/
int64_t nLockTimeCutoff = block.GetBlockTime();
@@ -4941,10 +4943,8 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
}
}
bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, int64_t nTimeReceived)
bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, int64_t nTimeReceived, const CChainParams& chainparams)
{
const CChainParams& chainparams = Params();
LogPrint("net", "received: %s (%u bytes) peer=%d\n", SanitizeString(strCommand), vRecv.size(), pfrom->id);
if (mapArgs.count("-dropmessagestest") && GetRand(atoi(mapArgs["-dropmessagestest"])) == 0)
{
@@ -4952,7 +4952,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
return true;
}
if (!(nLocalServices & NODE_BLOOM) &&
(strCommand == NetMsgType::FILTERLOAD ||
strCommand == NetMsgType::FILTERADD ||
@@ -6205,7 +6204,7 @@ bool ProcessMessages(CNode* pfrom)
bool fRet = false;
try
{
fRet = ProcessMessage(pfrom, strCommand, vRecv, msg.nTime);
fRet = ProcessMessage(pfrom, strCommand, vRecv, msg.nTime, chainparams);
boost::this_thread::interruption_point();
}
catch (const std::ios_base::failure& e)