Browse Source

Merge #11362: Remove nBlockMaxSize from miner opt struct as it is no longer used.

22fd04beb Remove nBlockMaxSize from miner opt struct as it is no longer used. (Gregory Maxwell)

Pull request description:

Tree-SHA512: f7a0fa380b4173120f33f96de90581cb57b8bd7af50996f0c726845acff7b92bb1212b924495ef89645624239d2b60d19c1cee2a13139b00e917154a33f7da4c
0.16
Pieter Wuille 7 years ago
parent
commit
c6223b3daa
No known key found for this signature in database
GPG Key ID: A636E97631F767E0
  1. 1
      src/miner.h
  2. 1
      src/test/miner_tests.cpp

1
src/miner.h

@ -158,7 +158,6 @@ public:
struct Options { struct Options {
Options(); Options();
size_t nBlockMaxWeight; size_t nBlockMaxWeight;
size_t nBlockMaxSize;
CFeeRate blockMinFeeRate; CFeeRate blockMinFeeRate;
}; };

1
src/test/miner_tests.cpp

@ -32,7 +32,6 @@ static BlockAssembler AssemblerForTest(const CChainParams& params) {
BlockAssembler::Options options; BlockAssembler::Options options;
options.nBlockMaxWeight = MAX_BLOCK_WEIGHT; options.nBlockMaxWeight = MAX_BLOCK_WEIGHT;
options.nBlockMaxSize = MAX_BLOCK_SERIALIZED_SIZE;
options.blockMinFeeRate = blockMinFeeRate; options.blockMinFeeRate = blockMinFeeRate;
return BlockAssembler(params, options); return BlockAssembler(params, options);
} }

Loading…
Cancel
Save