aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_bitcoin.cpp
diff options
context:
space:
mode:
authorAlex Morcos <morcos@chaincode.com>2017-01-19 22:46:50 -0500
committerAlex Morcos <morcos@chaincode.com>2017-03-03 16:50:19 -0500
commit0315888d0db2f39c784afac19ff5db5086f30820 (patch)
treeab5a4feaae705fd449cd2783e88bcd78a73acba3 /src/test/test_bitcoin.cpp
parentf8380054442d8aca4999277fe7617067edf231b9 (diff)
downloadbitcoin-0315888d0db2f39c784afac19ff5db5086f30820.tar.xz
[test] Remove priority from tests
Remove all coin age priority functionality from unit tests and RPC tests.
Diffstat (limited to 'src/test/test_bitcoin.cpp')
-rw-r--r--src/test/test_bitcoin.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 51fc6ae0ba..e6d34de1af 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -141,17 +141,14 @@ TestChain100Setup::~TestChain100Setup()
}
-CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CMutableTransaction &tx, CTxMemPool *pool) {
+CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CMutableTransaction &tx) {
CTransaction txn(tx);
- return FromTx(txn, pool);
+ return FromTx(txn);
}
-CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CTransaction &txn, CTxMemPool *pool) {
- // Hack to assume either it's completely dependent on other mempool txs or not at all
- CAmount inChainValue = pool && pool->HasNoInputsOf(txn) ? txn.GetValueOut() : 0;
-
- return CTxMemPoolEntry(MakeTransactionRef(txn), nFee, nTime, dPriority, nHeight,
- inChainValue, spendsCoinbase, sigOpCost, lp);
+CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CTransaction &txn) {
+ return CTxMemPoolEntry(MakeTransactionRef(txn), nFee, nTime, 0.0, nHeight,
+ 0, spendsCoinbase, sigOpCost, lp);
}
void Shutdown(void* parg)