46ce223d1 Add tests for CMerkleBlock usage with txids specified (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.
Changes made in D3371 have decided the issue of code ownership. In addition,conflict with the original PR; the constructor has been updated to the form it would take if D3371 would have been implemented after this refactoring. the changes to the constructor make the code both more difficult to read and harder to maintain without providing any real benefit. Because of these factorsThis private constructor is more strict than the original one (the original could be called with either, both, I skipped the changes toor neither of the constructor`filter` and only include the changes/additions to tests`txids` parameters).
Partial backport of Core PR11293 (only including test changes)
Also includes left over changes to PR12920