Skip to content

Commit 27362dd

Browse files
committed
Remove -blockminsize option
1 parent d2e46e1 commit 27362dd

File tree

4 files changed

+3
-10
lines changed

4 files changed

+3
-10
lines changed

src/init.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,6 @@ std::string HelpMessage(HelpMessageMode mode)
453453

454454
strUsage += HelpMessageGroup(_("Block creation options:"));
455455
strUsage += HelpMessageOpt("-blockmaxcost=<n>", strprintf(_("Set maximum block cost (default: %d)"), DEFAULT_BLOCK_MAX_COST));
456-
strUsage += HelpMessageOpt("-blockminsize=<n>", strprintf(_("Set minimum block size in bytes (default: %u)"), DEFAULT_BLOCK_MIN_SIZE));
457456
strUsage += HelpMessageOpt("-blockmaxsize=<n>", strprintf(_("Set maximum block size in bytes (default: %d)"), DEFAULT_BLOCK_MAX_SIZE));
458457
strUsage += HelpMessageOpt("-blockprioritysize=<n>", strprintf(_("Set maximum size of high-priority/low-fee transactions in bytes (default: %d)"), DEFAULT_BLOCK_PRIORITY_SIZE));
459458
if (showDebug)

src/miner.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,8 @@ BlockAssembler::BlockAssembler(const CChainParams& _chainparams)
100100
// Limit size to between 1K and MAX_BLOCK_SERIALIZED_SIZE-1K for sanity:
101101
nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MAX_BLOCK_SERIALIZED_SIZE-1000), nBlockMaxSize));
102102

103-
// Minimum block size you want to create; block will be filled with free transactions
104-
// until there are no more or the block reaches this size:
105-
nBlockMinSize = GetArg("-blockminsize", DEFAULT_BLOCK_MIN_SIZE);
106-
nBlockMinSize = std::min(nBlockMaxSize, nBlockMinSize);
107-
108103
// Whether we need to account for byte usage (in addition to cost usage)
109-
fNeedSizeAccounting = (nBlockMaxSize < MAX_BLOCK_SERIALIZED_SIZE-1000) || (nBlockMinSize > 0);
104+
fNeedSizeAccounting = (nBlockMaxSize < MAX_BLOCK_SERIALIZED_SIZE-1000);
110105
}
111106

112107
void BlockAssembler::resetBlock()

src/miner.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ class BlockAssembler
141141

142142
// Configuration parameters for the block size
143143
bool fIncludeWitness;
144-
unsigned int nBlockMaxCost, nBlockMaxSize, nBlockMinSize;
144+
unsigned int nBlockMaxCost, nBlockMaxSize;
145145
bool fNeedSizeAccounting;
146146

147147
// Information on the current status of the block

src/policy/policy.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414

1515
class CCoinsViewCache;
1616

17-
/** Default for -blockmaxsize and -blockminsize, which control the range of sizes the mining code will create **/
17+
/** Default for -blockmaxsize, which controls the maximum size of block the mining code will create **/
1818
static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 750000;
19-
static const unsigned int DEFAULT_BLOCK_MIN_SIZE = 0;
2019
/** Default for -blockprioritysize, maximum space for zero/low-fee transactions **/
2120
static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 0;
2221
/** Default for -blockmaxcost, which control the range of block costs the mining code will create **/

0 commit comments

Comments
 (0)