manual fixes on bitcoin#9868

dashpay · Jan 23, 2019 · f9c5857 · f9c5857
1 parent 3ddf3dc
commit f9c5857
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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);
 }