Page MenuHomePhabricator

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

Authored by majcosta on Sat, Jul 25, 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

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

majcosta created this revision.Sat, Jul 25, 07:14
Herald added a reviewer: Restricted Project. · View Herald TranscriptSat, Jul 25, 07:14
majcosta retitled this revision from [backport#16451][wallet] Move CMerkleTx functions into CWalletTx to [backport#16451 1/3][wallet] Move CMerkleTx functions into CWalletTx.Sat, Jul 25, 07:18
deadalnix requested changes to this revision.Sat, Jul 25, 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.Sat, Jul 25, 13:03
majcosta updated this revision to Diff 22512.Sat, Jul 25, 19:32

fixed class comment block formatting

deadalnix accepted this revision.Sat, Jul 25, 23:00
This revision is now accepted and ready to land.Sat, Jul 25, 23:00
teamcity edited the summary of this revision. (Show Details)Mon, Jul 27, 22:03

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