diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-07-31 08:57:08 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-07-31 09:00:55 +0200 |
| commit | 8241b5150431247bc87624804454b1ab8490138c (patch) | |
| tree | a76f18c579638eada3182bafb98ece9d229b255e /.appveyor.yml | |
| parent | 39763b75556be2275554d1db57b36c5ed6b4bf36 (diff) | |
| parent | 05b56d1c937b7667ad51400d2f9fb674af72953f (diff) | |
| download | bitcoin-8241b5150431247bc87624804454b1ab8490138c.tar.xz | |
Merge #16451: Remove CMerkleTx
05b56d1c937b7667ad51400d2f9fb674af72953f [wallet] Remove CMerkleTx serialization logic (John Newbery)
783a76f23ba4f33b6e6f609eaf3bf41afd9bcd6f [wallet] Flatten CWalletTx class hierarchy (John Newbery)
b3a9d179f23f654b8fba63924bbca5fd31ad4bb0 [wallet] Move CMerkleTx functions into CWalletTx (John Newbery)
Pull request description:
CMerkleTx is only used as a base class for
CWalletTx. It was previously also used for vtxPrev which
was removed in 93a18a3650292afbb441a47d1fa1b94aeb0164e3.
This PR moves all of the CMerkleTx members and logic
into CWalletTx. The CMerkleTx class is kept for deserialization
and serialization of old wallet files.
This makes the refactor in #15931 cleaner.
ACKs for top commit:
laanwj:
ACK 05b56d1c937b7667ad51400d2f9fb674af72953f. Looks good to me.
Tree-SHA512: 3d3a0069ebb536b12a328f1261e7dc55158a71088d445ae4b4ace4142c432dc296f58c8183b1922e54a60b8cc77e9d17c3dce7478294cd68693594baacf2bab3
Diffstat (limited to '.appveyor.yml')
0 files changed, 0 insertions, 0 deletions