Page MenuHomePhabricator
Differential D7114

[backport#17154 3/3][wallet] Remove `state` argument from CWallet::CommitTransaction
ClosedPublic
Actions

Authored by majcosta on Aug 1 2020, 15:15.

Details

Reviewers
deadalnix
Group Reviewers
Restricted Project
Commits
rABCa87b1b6c042e: [backport#17154 3/3][wallet] Remove `state` argument from CWallet…
Summary

The state return argument has not been set since commit 611291c198.
Remove it (and the one place that it's used in a calling function).

https://github.com/bitcoin/bitcoin/pull/17154/commits/9e95931865186d7a9a6dc54b64bd96507e9fea4b

Depends on D7113

Concludes backport of Core PR17154

Test Plan
ninja check check-functional

Diff Detail

Event Timeline

majcosta created this revision.Aug 1 2020, 15:15
Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 1 2020, 15:15
majcosta requested review of this revision.Aug 1 2020, 15:15
teamcity edited the summary of this revision. (Show Details)Aug 1 2020, 15:15

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

Harbormaster completed remote builds in B12279: Diff 22696.Aug 1 2020, 15:27
Fabien added a subscriber: Fabien.Aug 3 2020, 09:30
Fabien added inline comments.
src/interfaces/wallet.cpp
9

This is removed in the PR, what is it still used for ?

src/wallet/rpcwallet.cpp
10

Same question

majcosta mentioned this in D6998: [backport#17260 1/3] Move wallet enums to walletutil.h.Aug 3 2020, 11:02
majcosta added inline comments.Aug 3 2020, 14:04
src/interfaces/wallet.cpp
9

ContextualCheckTransaction still uses it

deadalnix added a subscriber: deadalnix.Aug 3 2020, 14:12
deadalnix added inline comments.
src/interfaces/wallet.cpp
9

It is defined in consensus/tx_verify.h

majcosta added inline comments.Aug 3 2020, 14:51
src/interfaces/wallet.cpp
71

I mean, TxValidationState is required for calls to ContextualCheckTransaction here

src/wallet/rpcwallet.cpp
692

here

766

here

1200

and here

majcosta added a child revision: D7118: [backport#16798] Refactor rawtransaction_util's SignTransaction to separate prevtx parsing.Aug 3 2020, 18:36
deadalnix accepted this revision.Aug 4 2020, 22:49
This revision is now accepted and ready to land.Aug 4 2020, 22:49
Closed by commit rABCa87b1b6c042e: [backport#17154 3/3][wallet] Remove `state` argument from CWallet… (authored by John Newbery <john@johnnewbery.com>, committed by majcosta). · Explain WhyAug 5 2020, 05:08
This revision was automatically updated to reflect the committed changes.
majcosta added a commit: rABCa87b1b6c042e: [backport#17154 3/3][wallet] Remove `state` argument from CWallet….

Revision Contents
Changeset List

PathSize
src/
interfaces/
3 lines
wallet/
8 lines
test/
4 lines
5 lines
3 lines

Diff 22696

View Options

src/interfaces/wallet.cpp

Loading...
View Options

src/wallet/rpcwallet.cpp

Loading...
View Options

src/wallet/test/wallet_tests.cpp

Loading...
View Options

src/wallet/wallet.h

Loading...
View Options

src/wallet/wallet.cpp

Loading...