Skip to content

Commit 50947ef

Browse files
committed
Change default block priority size to 0
Make RPC tests have a default block priority size of 50000 (the old default) so we can still use free transactions in RPC tests. When priority is eliminated, we will have to make a different change if we want to continue allowing free txs.
1 parent 34e02e0 commit 50947ef

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

qa/rpc-tests/test_framework/util.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,8 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=
217217
datadir = os.path.join(dirname, "node"+str(i))
218218
if binary is None:
219219
binary = os.getenv("BITCOIND", "bitcoind")
220-
args = [ binary, "-datadir="+datadir, "-keypool=1", "-discover=0", "-rest" ]
220+
# RPC tests still depend on free transactions
221+
args = [ binary, "-datadir="+datadir, "-keypool=1", "-discover=0", "-rest", "-blockprioritysize=50000" ]
221222
if extra_args is not None: args.extend(extra_args)
222223
bitcoind_processes[i] = subprocess.Popen(args)
223224
devnull = open(os.devnull, "w")

src/policy/policy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class CCoinsViewCache;
1818
static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 750000;
1919
static const unsigned int DEFAULT_BLOCK_MIN_SIZE = 0;
2020
/** Default for -blockprioritysize, maximum space for zero/low-fee transactions **/
21-
static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 50000;
21+
static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 0;
2222
/** The maximum size for transactions we're willing to relay/mine */
2323
static const unsigned int MAX_STANDARD_TX_SIZE = 100000;
2424
/** Maximum number of signature check operations in an IsStandard() P2SH script */

0 commit comments

Comments
 (0)