Remove use of AcceptToMemoryPool in wallet code

This commit does not change behavior.
This commit is contained in:
Russell Yanofsky
2017-07-31 16:31:29 -04:00
parent e2c8ba9f6e
commit d02b34c8a8
4 changed files with 26 additions and 10 deletions

View File

@@ -7,6 +7,7 @@
#include <optional.h> // For Optional and nullopt
#include <policy/rbf.h> // For RBFTransactionState
#include <primitives/transaction.h> // For CTransactionRef
#include <memory>
#include <stddef.h>
@@ -16,7 +17,7 @@
class CBlock;
class CScheduler;
class CTransaction;
class CValidationState;
class uint256;
struct CBlockLocator;
struct FeeCalculation;
@@ -109,6 +110,10 @@ public:
//! Check if transaction will be final given chain height current time.
virtual bool checkFinalTx(const CTransaction& tx) = 0;
//! Add transaction to memory pool if the transaction fee is below the
//! amount specified by absurd_fee (as a safeguard). */
virtual bool submitToMemoryPool(CTransactionRef tx, CAmount absurd_fee, CValidationState& state) = 0;
};
//! Return Lock interface. Chain is locked when this is called, and
@@ -159,6 +164,12 @@ public:
//! Pool min fee.
virtual CFeeRate mempoolMinFee() = 0;
//! Get node max tx fee setting (-maxtxfee).
//! This could be replaced by a per-wallet max fee, as proposed at
//! https://github.com/bitcoin/bitcoin/issues/15355
//! But for the time being, wallets call this to access the node setting.
virtual CAmount maxTxFee() = 0;
//! Check if pruning is enabled.
virtual bool getPruneMode() = 0;