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

sipa · sipa · commit c6223b3daab0 · 2017-09-22T16:09:05.000-07:00
22fd04b Remove nBlockMaxSize from miner opt struct as it is no longer used. (Gregory Maxwell) Pull request description: Tree-SHA512: f7a0fa380b4173120f33f96de90581cb57b8bd7af50996f0c726845acff7b92bb1212b924495ef89645624239d2b60d19c1cee2a13139b00e917154a33f7da4c
diff --git a/src/miner.h b/src/miner.h
@@ -158,7 +158,6 @@ class BlockAssembler
     struct Options {
         Options();
         size_t nBlockMaxWeight;
-        size_t nBlockMaxSize;
         CFeeRate blockMinFeeRate;
     };
 
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
@@ -32,7 +32,6 @@ static BlockAssembler AssemblerForTest(const CChainParams& params) {
     BlockAssembler::Options options;
 
     options.nBlockMaxWeight = MAX_BLOCK_WEIGHT;
-    options.nBlockMaxSize = MAX_BLOCK_SERIALIZED_SIZE;
     options.blockMinFeeRate = blockMinFeeRate;
     return BlockAssembler(params, options);
 }

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ static BlockAssembler AssemblerForTest(const CChainParams& params) {`
`32`	`32`	`BlockAssembler::Options options;`
`33`	`33`
`34`	`34`	`options.nBlockMaxWeight = MAX_BLOCK_WEIGHT;`
`35`		`- options.nBlockMaxSize = MAX_BLOCK_SERIALIZED_SIZE;`
`36`	`35`	`options.blockMinFeeRate = blockMinFeeRate;`
`37`	`36`	`return BlockAssembler(params, options);`
`38`	`37`	`}`