diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-01 12:38:55 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-01 12:39:34 +0100 |
| commit | 9afbd96919afd1f773e4c2633b0cfd6068e2b228 (patch) | |
| tree | 13792e87a1e38723aba442346ba0d4de6ec6e6d4 | |
| parent | 6abf6eb7bb777a5c4f22e9db6d4544281277378f (diff) | |
| parent | 50947ef23f46428ed8a260e3d4ff5ac0402ed727 (diff) | |
| download | bitcoin-9afbd96919afd1f773e4c2633b0cfd6068e2b228.tar.xz | |
Merge pull request #7022
50947ef Change default block priority size to 0 (Alex Morcos)
| -rw-r--r-- | qa/rpc-tests/test_framework/util.py | 3 | ||||
| -rw-r--r-- | src/policy/policy.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py index 1a526ae06e..b7e90a8a8b 100644 --- a/qa/rpc-tests/test_framework/util.py +++ b/qa/rpc-tests/test_framework/util.py @@ -217,7 +217,8 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary= datadir = os.path.join(dirname, "node"+str(i)) if binary is None: binary = os.getenv("BITCOIND", "bitcoind") - args = [ binary, "-datadir="+datadir, "-keypool=1", "-discover=0", "-rest" ] + # RPC tests still depend on free transactions + args = [ binary, "-datadir="+datadir, "-keypool=1", "-discover=0", "-rest", "-blockprioritysize=50000" ] if extra_args is not None: args.extend(extra_args) bitcoind_processes[i] = subprocess.Popen(args) devnull = open(os.devnull, "w") diff --git a/src/policy/policy.h b/src/policy/policy.h index c8d2c1a924..31655f2f3a 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -18,7 +18,7 @@ class CCoinsViewCache; static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 750000; static const unsigned int DEFAULT_BLOCK_MIN_SIZE = 0; /** Default for -blockprioritysize, maximum space for zero/low-fee transactions **/ -static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 50000; +static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 0; /** The maximum size for transactions we're willing to relay/mine */ static const unsigned int MAX_STANDARD_TX_SIZE = 100000; /** Maximum number of signature check operations in an IsStandard() P2SH script */ |