From 8246d7876e8cb03b3cc928cab1fc377b756cbe58 Mon Sep 17 00:00:00 2001 From: Adrian Gallagher Date: Sun, 28 Jan 2018 21:28:02 -0800 Subject: [PATCH] Litecoin: Disable mempool replacement by default and update tests --- doc/release-notes-litecoin.md | 5 +++++ src/validation.h | 2 +- test/functional/bumpfee.py | 4 +++- test/functional/listtransactions.py | 4 ++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/doc/release-notes-litecoin.md b/doc/release-notes-litecoin.md index 4c2862cb2e..34bccfb887 100644 --- a/doc/release-notes-litecoin.md +++ b/doc/release-notes-litecoin.md @@ -94,6 +94,11 @@ Minimum relay fee lowered The minimum relay fee `-minrelayfee` has been lowered to 0.01 lites per kB (0.00001 LTC). This is to prepare for dropping the minimum transaction fee to 0.1 lites per kB (0.0001 LTC) in the next release. +Mempool replacement disabled by default +--------------------------------------- + +Mempool replacement `--mempoolreplacement` has been disabled by default. + Miner block size limiting deprecated ------------------------------------ diff --git a/src/validation.h b/src/validation.h index 672ef0a375..a02e1a8a43 100644 --- a/src/validation.h +++ b/src/validation.h @@ -134,7 +134,7 @@ static const unsigned int DEFAULT_BANSCORE_THRESHOLD = 100; /** Default for -persistmempool */ static const bool DEFAULT_PERSIST_MEMPOOL = true; /** Default for -mempoolreplacement */ -static const bool DEFAULT_ENABLE_REPLACEMENT = true; +static const bool DEFAULT_ENABLE_REPLACEMENT = false; /** Default for using fee filter */ static const bool DEFAULT_FEEFILTER = true; diff --git a/test/functional/bumpfee.py b/test/functional/bumpfee.py index f3ac67f94d..5d4cc2f84c 100755 --- a/test/functional/bumpfee.py +++ b/test/functional/bumpfee.py @@ -15,7 +15,7 @@ make assumptions about execution order. """ from segwit import send_to_witness -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import BitcoinTestFramework, SkipTest from test_framework import blocktools from test_framework.mininode import CTransaction from test_framework.util import * @@ -37,6 +37,8 @@ class BumpFeeTest(BitcoinTestFramework): for i in range(self.num_nodes)] def run_test(self): + raise SkipTest("Litecoin doesn't support RBF.") + # Encrypt wallet for test_locked_wallet_fails test self.nodes[1].node_encrypt_wallet(WALLET_PASSPHRASE) self.start_node(1) diff --git a/test/functional/listtransactions.py b/test/functional/listtransactions.py index e4522cc3b5..0dd838e688 100755 --- a/test/functional/listtransactions.py +++ b/test/functional/listtransactions.py @@ -90,8 +90,8 @@ class ListTransactionsTest(BitcoinTestFramework): assert_array_result(self.nodes[0].listtransactions("watchonly", 100, 0, True), {"category":"receive","amount":Decimal("0.1")}, {"txid":txid, "account" : "watchonly"} ) - - self.run_rbf_opt_in_test() + # Litecoin has RBF disabled + # self.run_rbf_opt_in_test() # Check that the opt-in-rbf flag works properly, for sent and received # transactions.