MarcoFalke bf0a08be28 Merge #10330: [wallet] fix zapwallettxes interaction with persistent mempool ... 4c3b538 [logs] fix zapwallettxes startup logs (John Newbery) e7a2181 [wallet] fix zapwallettxes interaction with persistent mempool (John Newbery) ff7365e [tests] fix flake8 warnings in zapwallettxes.py (John Newbery) Pull request description: zapwallettxes previously did not interact well with persistent mempool. zapwallettxes would cause wallet transactions to be zapped, but they would then be reloaded from the mempool on startup. This commit softsets persistmempool to false if zapwallettxes is enabled so transactions are actually zapped. This PR also fixes the zapwallettxes.py functional test, which did not properly test this feature. The test line: ```py assert_raises(JSONRPCException, self.nodes[0].gettransaction, [txid3]) #there must be a expection because the unconfirmed wallettx0 must be gone by now ``` is not actually testing the presence of the transaction since the RPC is being called incorrectly (with an array instead of a string). The `assert_raises()` passes since an assert is raised, but it's not the one the test writer had in mind! Fixes #9710 . Tree-SHA512: e3236efc7a2fd2b3bf1d9e2e8a7726d470c57f5d95cf41b7bde264edc8817bd36a6f3feff52f8de8db0ef64b7247c88b24e7ff7cefaa706cba86fe4e2135a508		2017-07-17 04:23:52 +02:00
..
test	scripted-diff: Remove #include <boost/foreach.hpp>	2017-06-22 03:48:52 +02:00
coincontrol.h	Introduce a fee estimate mode.	2017-07-06 22:20:23 -04:00
crypter.cpp	Merge #10193: scripted-diff: Remove #include <boost/foreach.hpp>	2017-07-04 18:05:18 +02:00
crypter.h	Use the override specifier (C++11) where we expect to be overriding the virtual function of a base class	2017-06-28 02:12:06 +02:00
db.cpp	Merge #10193: scripted-diff: Remove #include <boost/foreach.hpp>	2017-07-04 18:05:18 +02:00
db.h	Fix uninitialized atomic variables	2017-07-13 23:25:56 +01:00
feebumper.cpp	Add RPC options for RBF, confirmation target, and conservative fee estimation.	2017-07-10 12:40:02 -04:00
feebumper.h	Add RPC options for RBF, confirmation target, and conservative fee estimation.	2017-07-10 12:40:02 -04:00
rpcdump.cpp	Merge #10193: scripted-diff: Remove #include <boost/foreach.hpp>	2017-07-04 18:05:18 +02:00
rpcwallet.cpp	getbalance example covers at least 6 confirms	2017-07-12 14:40:02 -04:00
rpcwallet.h	Fix incorrect Doxygen tag (@ince → @since). Make Doxygen parameter names match actual parameter names.	2017-07-16 21:22:05 +02:00
wallet.cpp	Merge #10330: [wallet] fix zapwallettxes interaction with persistent mempool	2017-07-17 04:23:52 +02:00
wallet.h	Merge #10235: Track keypool entries as internal vs external in memory	2017-07-15 14:02:05 -07:00
walletdb.cpp	Merge #10760: Avoid dereference-of-casted-pointer	2017-07-15 12:22:50 -07:00
walletdb.h	wallet: Include actual backup filename in recovery warning message	2017-06-06 21:17:09 +00:00