manual fixes on #9868

This commit is contained in:
Pasta 2018-12-28 16:53:13 -06:00 committed by Pasta
parent 3ddf3dc62b
commit f9c585776b
No known key found for this signature in database
GPG Key ID: 232CE2963BB66063
2 changed files with 1 additions and 3 deletions

View File

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

View File

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