Merge #11293: Deduplicate CMerkleBlock construction code, add test coverage
commitdbc4ae03963014ab4b7957d62ba59dbd8f938c33
authorMarcoFalke <falke.marco@gmail.com>
Tue, 3 Oct 2017 12:26:05 +0000 (3 14:26 +0200)
committerMarcoFalke <falke.marco@gmail.com>
Tue, 3 Oct 2017 12:27:39 +0000 (3 14:27 +0200)
tree7c4c47e709e79de764954456cbbdf1e7b6c2c8aa
parent8ddf60db7ad636b6a31b590251c671ded635fa1d
parent46ce223d15d4111d096f6342eb6f526d2507d7d7
Merge #11293: Deduplicate CMerkleBlock construction code, add test coverage

46ce223d1 Add tests for CMerkleBlock usage with txids specified (James O'Beirne)
5ab586f90 Consolidate CMerkleBlock constructor into a single method (James O'Beirne)

Pull request description:

  What started as a simple task to add test coverage ended up giving way to a light refactoring. This consolidates the mostly-identical `CMerkleBlock` constructors into one (using C++11 constructor delegation) and adds coverage for the by-txids construction case.

  ### Before

  ![selection_006](https://user-images.githubusercontent.com/73197/30242104-0f381fe4-9545-11e7-9617-83b87fce0456.png)

  ### After

  ![selection_008](https://user-images.githubusercontent.com/73197/30242107-1425dfaa-9545-11e7-9e6b-2c3432517dd1.png)

Tree-SHA512: eed84ed3e8bfc43473077b575c8252759a857e37275e4b36ca7cc2c17a65895e5f494bfd9d4aeab09fc6e98fc6a9c641ac7ecc0ddbeefe01a9e4308e7909e529
src/Makefile.test.include