Page MenuHomePhabricator

Merge #10368: [wallet] Remove helper conversion operator from wallet
ClosedPublic

Authored by jasonbcox on Apr 10 2019, 19:17.

Details

Summary

5a5e4e9 [wallet] Remove CTransaction&() helper conversion operator from wallet implementation. (Karl-Johan Alm)

Pull request description:

The `CTransaction&()` operator in `CMerkleTx` makes conversion into `CTransaction`s transparent, but was marked as to-be-removed in favor of explicitly getting the `tx` ivar, presumably as the operator can lead to ambiguous behavior and makes the code harder to follow.

This PR removes the operator and adapts callers. This includes some cases of `static_cast<CTransaction>(wtx)` → `*wtx.tx`, which is definitely an improvement.

Tree-SHA512: 95856fec7194d6a79615ea1c322abfcd6bcedf6ffd0cfa89bbdd332ce13035fa52dd4b828d20df673072dde1be64b79c513529a6f422dd5f0961ce722a32d56a

Backport of Core PR 10368
https://github.com/bitcoin/bitcoin/pull/10368/files
Completes T588

Note: The change in walletmodeltransaction.cpp is missing due to this out-of-order backport: D2618

Test Plan
make check
test_runner.py

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

jasonbcox created this revision.Apr 10 2019, 19:17
Herald added a reviewer: Restricted Project. · View Herald TranscriptApr 10 2019, 19:17
jasonbcox edited the summary of this revision. (Show Details)Apr 10 2019, 19:18
jasonbcox added inline comments.Apr 10 2019, 19:41
src/wallet/walletdb.cpp
306 ↗(On Diff #8026)

This differs from the original PR due to changes in commit 9a4a044d904f2e58e630fa8c33de8c9558760a85 (by freetrader, before Phab apparently)

deadalnix accepted this revision.Apr 10 2019, 21:54
This revision is now accepted and ready to land.Apr 10 2019, 21:54
This revision was automatically updated to reflect the committed changes.