Browse Source

Add TestMemPoolEntryHelper::FromTx version for CTransaction

tags/v0.15.1
Matt Corallo 5 years ago
parent
commit
f4f8f14adc
2 changed files with 6 additions and 1 deletions
  1. 5
    1
      src/test/test_bitcoin.cpp
  2. 1
    0
      src/test/test_bitcoin.h

+ 5
- 1
src/test/test_bitcoin.cpp View File

@@ -126,7 +126,11 @@ TestChain100Setup::~TestChain100Setup()

CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(CMutableTransaction &tx, CTxMemPool *pool) {
CTransaction txn(tx);
bool hasNoDependencies = pool ? pool->HasNoInputsOf(tx) : hadNoDependencies;
return FromTx(txn, pool);
}

CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(CTransaction &txn, CTxMemPool *pool) {
bool hasNoDependencies = pool ? pool->HasNoInputsOf(txn) : hadNoDependencies;
// Hack to assume either its completely dependent on other mempool txs or not at all
CAmount inChainValue = hasNoDependencies ? txn.GetValueOut() : 0;


+ 1
- 0
src/test/test_bitcoin.h View File

@@ -78,6 +78,7 @@ struct TestMemPoolEntryHelper
hadNoDependencies(false), spendsCoinbase(false), sigOpCount(1) { }
CTxMemPoolEntry FromTx(CMutableTransaction &tx, CTxMemPool *pool = NULL);
CTxMemPoolEntry FromTx(CTransaction &tx, CTxMemPool *pool = NULL);

// Change the default value
TestMemPoolEntryHelper &Fee(CAmount _fee) { nFee = _fee; return *this; }

Loading…
Cancel
Save