Page MenuHomePhabricator
Differential D2794

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

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

Details

Reviewers
deadalnix
Fabien
Group Reviewers
Restricted Project
Commits
rSTAGING7646a2c69b99: Merge #10368: [wallet] Remove helper conversion operator from wallet
rABC7646a2c69b99: Merge #10368: [wallet] Remove helper conversion operator from wallet
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
Branch
pr10368
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 5430
Build 8922: Bitcoin ABC Buildbot (legacy)
Build 8921: arc lint + arc unit

Event Timeline

jasonbcox created this revision.Apr 10 2019, 19:17
Herald added a reviewer: Restricted Project. · View Herald TranscriptApr 10 2019, 19:17
teamcity added a comment.Apr 10 2019, 19:18

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

jasonbcox edited the summary of this revision. (Show Details)Apr 10 2019, 19:18
teamcity added a comment.Apr 10 2019, 19:32

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B5430: Diff 8026.Apr 10 2019, 19:32
jasonbcox added inline comments.Apr 10 2019, 19:41
src/wallet/walletdb.cpp
306

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
Closed by commit rABC7646a2c69b99: Merge #10368: [wallet] Remove helper conversion operator from wallet (authored by Wladimir J. van der Laan <laanwj@gmail.com>, committed by jasonbcox). · Explain WhyApr 10 2019, 22:48
This revision was automatically updated to reflect the committed changes.
jasonbcox added a commit: rSTAGING7646a2c69b99: Merge #10368: [wallet] Remove helper conversion operator from wallet.Sep 18 2019, 22:57

Revision Contents
Changeset List

Diff 8026

View Options

src/qt/transactiondesc.cpp

Loading...
View Options

src/qt/transactionrecord.cpp

Loading...
View Options

src/qt/transactiontablemodel.cpp

Loading...
View Options

src/wallet/rpcdump.cpp

Loading...
View Options

src/wallet/rpcwallet.cpp

Loading...
View Options

src/wallet/test/accounting_tests.cpp

Loading...
View Options

src/wallet/wallet.h

Loading...
View Options

src/wallet/wallet.cpp

Loading...
View Options

src/wallet/walletdb.cpp

Loading...