Move maxTxFee out of mempool

Also, remove default values in CMerkleTx::AcceptToMemoryPool()
This commit is contained in:
MarcoFalke
2015-11-20 16:48:06 +01:00
parent fd13fe7ca0
commit fa79db2641
6 changed files with 18 additions and 17 deletions

View File

@@ -281,7 +281,7 @@ void PruneAndFlush();
/** (try to) add transaction to memory pool **/
bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransaction &tx, bool fLimitFree,
bool* pfMissingInputs, bool fOverrideMempoolLimit=false, bool fRejectAbsurdFee=false);
bool* pfMissingInputs, bool fOverrideMempoolLimit=false, const CAmount nAbsurdFee=0);
/** Convert CValidationState to a human-readable message for logging */
std::string FormatStateMessage(const CValidationState &state);