Page MenuHomePhabricator

[backport#16451 1/3][wallet] Move CMerkleTx functions into CWalletTx
ClosedPublic

Authored by majcosta on Jul 25 2020, 07:14.

Details

Summary

CMerkleTx only exists as a base class for CWalletTx and for wallet file
serialization/deserialization. Move CMerkleTx methods into CWalletTx,
but leave class hierarchy and serialization logic in place.

https://github.com/bitcoin/bitcoin/pull/16451/commits/b3a9d179f23f654b8fba63924bbca5fd31ad4bb0


Partial backport of Core PR16451

Test Plan
ninja check check-functional

Event Timeline

majcosta retitled this revision from [backport#16451][wallet] Move CMerkleTx functions into CWalletTx to [backport#16451 1/3][wallet] Move CMerkleTx functions into CWalletTx.Jul 25 2020, 07:18
deadalnix requested changes to this revision.Jul 25 2020, 13:03
deadalnix added a subscriber: deadalnix.
deadalnix added inline comments.
src/wallet/wallet.h
373 ↗(On Diff #22508)

reformat

This revision now requires changes to proceed.Jul 25 2020, 13:03

fixed class comment block formatting

This revision is now accepted and ready to land.Jul 25 2020, 23:00

[Bot Message]
One or more PR numbers were detected in the summary.
Links to those PRs have been inserted into the summary for reference.