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/validation.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/validation.h')
| -rw-r--r-- | src/validation.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/validation.h b/src/validation.h index 4acdac81c9..804fb644d9 100644 --- a/src/validation.h +++ b/src/validation.h @@ -161,7 +161,6 @@ extern CTxMemPool mempool; typedef std::unordered_map<uint256, CBlockIndex*, BlockHasher> BlockMap; extern BlockMap mapBlockIndex; extern uint64_t nLastBlockTx; -extern uint64_t nLastBlockSize; extern uint64_t nLastBlockWeight; extern const std::string strMessageMagic; extern CWaitableCriticalSection csBestBlock; |