From da1032d33860ad2d492bb0d87c27d124dd797414 Mon Sep 17 00:00:00 2001 From: TomZ Date: Wed, 2 Mar 2016 11:47:11 +0000 Subject: [PATCH 1/2] Fix unit test to not depend on default values --- qa/rpc-tests/listtransactions.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qa/rpc-tests/listtransactions.py b/qa/rpc-tests/listtransactions.py index f86f18de984..8f62d74b5ab 100755 --- a/qa/rpc-tests/listtransactions.py +++ b/qa/rpc-tests/listtransactions.py @@ -40,6 +40,10 @@ def check_array_result(object_array, to_match, expected): class ListTransactionsTest(BitcoinTestFramework): + def setup_nodes(self): + node_count=4 + return start_nodes(node_count, self.options.tmpdir, [["-mempoolreplacement=1"]] * node_count) + def run_test(self): # Simple send, 0 to 1: txid = self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 0.1) From 376b257dbcc006365dc52cbc80c745d60a4098a9 Mon Sep 17 00:00:00 2001 From: TomZ Date: Wed, 2 Mar 2016 11:32:24 +0000 Subject: [PATCH 2/2] Change default value --- src/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.h b/src/main.h index 7ae8eec4df0..de38f79b64f 100644 --- a/src/main.h +++ b/src/main.h @@ -111,7 +111,7 @@ static const unsigned int DEFAULT_BANSCORE_THRESHOLD = 100; static const bool DEFAULT_TESTSAFEMODE = false; /** Default for -mempoolreplacement */ -static const bool DEFAULT_ENABLE_REPLACEMENT = true; +static const bool DEFAULT_ENABLE_REPLACEMENT = false; /** Maximum number of headers to announce when relaying blocks with headers message.*/ static const unsigned int MAX_BLOCKS_TO_ANNOUNCE = 8;