From f9c585776b62626e33adbf3e21019aacfeccce28 Mon Sep 17 00:00:00 2001 From: Pasta Date: Fri, 28 Dec 2018 16:53:13 -0600 Subject: [PATCH] manual fixes on #9868 --- src/miner.h | 1 - src/test/miner_tests.cpp | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/miner.h b/src/miner.h index 1f6737a9da57a..d49a89d8ed452 100644 --- a/src/miner.h +++ b/src/miner.h @@ -165,7 +165,6 @@ class BlockAssembler 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 ef0c0bb9ed2fc..64790a2bf692e 100644 --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -31,8 +31,7 @@ static CFeeRate blockMinFeeRate = CFeeRate(DEFAULT_BLOCK_MIN_TX_FEE); static BlockAssembler AssemblerForTest(const CChainParams& params) { BlockAssembler::Options options; - options.nBlockMaxWeight = MAX_BLOCK_WEIGHT; - options.nBlockMaxSize = MAX_BLOCK_SERIALIZED_SIZE; + options.nBlockMaxSize = DEFAULT_BLOCK_MAX_SIZE; options.blockMinFeeRate = blockMinFeeRate; return BlockAssembler(params, options); }