aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2017-09-22 16:06:31 -0700
committerPieter Wuille <pieter.wuille@gmail.com>2017-09-22 16:09:05 -0700
commitc6223b3daab0328ca742b1cc3c15e89e698630bb (patch)
treef1954d3618bf669bf5ea49e411b1b3d2a6277f85
parent877678710800a4d78afc12519424f232f1a583d3 (diff)
parent22fd04beb9e7ee4c8576a2f43796200faa780938 (diff)
downloadbitcoin-c6223b3daab0328ca742b1cc3c15e89e698630bb.tar.xz
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
-rw-r--r--src/miner.h1
-rw-r--r--src/test/miner_tests.cpp1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/miner.h b/src/miner.h
index 683f4fe085..db165e71c6 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -158,7 +158,6 @@ public:
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
index 9fa9a8509c..41e0626eb9 100644
--- 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);
}