diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-08-01 10:42:27 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-08-01 10:42:31 +0200 |
| commit | ea268747b6d417a406977e9b4931badce29b9d7a (patch) | |
| tree | 15edbf00f8e52d30fa72415b87409e3200f350c4 /src | |
| parent | c7e05b35ab0a791c7a8e2d863e716fdec6f3f671 (diff) | |
| parent | 8bfd70817bf8b8b07b81660e47c88dd122b7423f (diff) | |
| download | bitcoin-ea268747b6d417a406977e9b4931badce29b9d7a.tar.xz | |
Merge #8419: Enable size accounting in mining unit tests
8bfd708 Enable size accounting in mining unit tests (Suhas Daftuar)
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/miner_tests.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp index fd581db52e..15fceb963a 100644 --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -181,9 +181,7 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey, // NOTE: These tests rely on CreateNewBlock doing its own self-validation! BOOST_AUTO_TEST_CASE(CreateNewBlock_validity) { - // Disable size accounting (CPFP does not support it) - mapArgs["-blockmaxsize"] = strprintf("%u", MAX_BLOCK_SERIALIZED_SIZE); - + // Note that by default, these tests run with size accounting enabled. const CChainParams& chainparams = Params(CBaseChainParams::MAIN); CScript scriptPubKey = CScript() << ParseHex("04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f") << OP_CHECKSIG; CBlockTemplate *pblocktemplate; |