diff options
| author | Matt Corallo <git@bluematt.me> | 2017-08-24 11:36:07 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-11-02 15:18:56 -0400 |
| commit | 7871a7d3be4b89e1605ca29c2269c08f3ae68472 (patch) | |
| tree | 2b34fb69d7c925d37af2e3ce8a094930a14219b2 /src/policy/policy.h | |
| parent | 6baa317b5fa615d463cdf0a2095533f6c10c84de (diff) | |
| download | bitcoin-7871a7d3be4b89e1605ca29c2269c08f3ae68472.tar.xz | |
Deprecate confusing blockmaxsize, fix getmininginfo output
* This removes block-size-limiting code in favor of GBT clients
doing the limiting themselves (if at all).
* -blockmaxsize is deprecated and only used to calculate an implied
blockmaxweight, addressing confusion from multiple users.
* getmininginfo's currentblocksize return value was returning
garbage values, and has been removed, also removing a
GetSerializeSize call in some block generation inner loops and
potentially addressing some performance edge cases.
Github-Pull: #11100
Rebased-From: ba206d2c63a8d3cbd4a8dd47e9ef126af1bb3bb9
Diffstat (limited to 'src/policy/policy.h')
| -rw-r--r-- | src/policy/policy.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/policy/policy.h b/src/policy/policy.h index c06820f84e..7024713834 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -16,8 +16,6 @@ class CCoinsViewCache; class CTxOut; -/** Default for -blockmaxsize, which controls the maximum size of block the mining code will create **/ -static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 750000; /** Default for -blockmaxweight, which controls the range of block weights the mining code will create **/ static const unsigned int DEFAULT_BLOCK_MAX_WEIGHT = 3000000; /** Default for -blockmintxfee, which sets the minimum feerate for a transaction in blocks created by mining code **/ |