aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.test.include
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2015-03-25 13:13:09 -0400
committerWladimir J. van der Laan <laanwj@gmail.com>2015-04-06 11:38:43 +0200
commit1c62e8409998f0358f2fca522678704824e332c1 (patch)
treea97745d53f7d078ced94f5f5522431af33c1c80f /src/Makefile.test.include
parent149c1d890ddc6dd0f108436704ac88bbed9ab12c (diff)
downloadbitcoin-1c62e8409998f0358f2fca522678704824e332c1.tar.xz
Keep mempool consistent during block-reorgs
This fixes a subtle bug involving block re-orgs and non-standard transactions. Start with a block containing a non-standard transaction, and one or more transactions spending it in the memory pool. Then re-org away from that block to another chain that does not contain the non-standard transaction. Result before this fix: the dependent transactions get stuck in the mempool without their parent, putting the mempool in an inconsistent state. Tested with a new unit test (adapted for 0.10). Rebased-From: ad9e86dca11dce023d827d342e966f3806c39d27 Github-Pull: #5945
Diffstat (limited to 'src/Makefile.test.include')
-rw-r--r--src/Makefile.test.include1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 0a9a335e7a..9cc479c305 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -51,6 +51,7 @@ BITCOIN_TESTS =\
test/hash_tests.cpp \
test/key_tests.cpp \
test/main_tests.cpp \
+ test/mempool_tests.cpp \
test/miner_tests.cpp \
test/mruset_tests.cpp \
test/multisig_tests.cpp \