aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-02-04 14:38:58 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2016-02-04 14:54:23 +0100
commit4f4dc5ef7295e85531127cd08a822291e548b2f0 (patch)
tree969a8496e18ea37ef69be7c6cef927d28074bf48 /src/test
parent2cdbf28cf395b110fe9dcfa1d27a45dfcf4c6f2b (diff)
parentfad6244879be8b9916e85cff4ecdb4377dd62ee2 (diff)
downloadbitcoin-4f4dc5ef7295e85531127cd08a822291e548b2f0.tar.xz
Merge #7070: Move maxTxFee out of mempool
fad6244 ATMP: make nAbsurdFee const (MarcoFalke) fa762d0 [wallet.h] Remove main.h include (MarcoFalke) fa79db2 Move maxTxFee out of mempool (MarcoFalke)
Diffstat (limited to 'src/test')
-rw-r--r--src/test/txvalidationcache_tests.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp
index 66be9d3d5e..c29e30792a 100644
--- a/src/test/txvalidationcache_tests.cpp
+++ b/src/test/txvalidationcache_tests.cpp
@@ -23,7 +23,7 @@ ToMemPool(CMutableTransaction& tx)
LOCK(cs_main);
CValidationState state;
- return AcceptToMemoryPool(mempool, state, tx, false, NULL, true, false);
+ return AcceptToMemoryPool(mempool, state, tx, false, NULL, true, 0);
}
BOOST_FIXTURE_TEST_CASE(tx_mempool_block_doublespend, TestChain100Setup)