diff options
| author | fanquake <fanquake@gmail.com> | 2021-06-12 11:35:37 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-06-12 11:35:49 +0800 |
| commit | 9795e8ec8c279e0df34aee7241bc3b5720a5b380 (patch) | |
| tree | af4383d4fa578a8cc11ec5bab1d71eb4658a5a2a /src/wallet | |
| parent | a55904a80c35730c89d4d84214c2afbec8b1536d (diff) | |
| parent | f47e8028391fbcf44fe1dbf3539f42e4185590fd (diff) | |
Merge bitcoin/bitcoin#22214: refactor: Rearrange fillPSBT arguments
f47e8028391fbcf44fe1dbf3539f42e4185590fd Rearrange fillPSBT arguments (Russell Yanofsky)
Pull request description:
Move fillPSBT inout argument before output-only arguments. This is a nice thing to do to keep the interface style [consistent](https://google.github.io/styleguide/cppguide.html#Inputs_and_Outputs). But motivation is to work around a current limitation of the libmultiprocess code generator (which figures out order of inout parameters by looking at input list, but more ideally would use the output list).
---
This PR is part of the [process separation project](https://github.com/bitcoin/bitcoin/projects/10). The commit was first part of larger PR #10102.
ACKs for top commit:
achow101:
ACK f47e8028391fbcf44fe1dbf3539f42e4185590fd
theStack:
Code-review ACK f47e8028391fbcf44fe1dbf3539f42e4185590fd
Tree-SHA512: 1787af3031ff7ed6b519f3b93054d8b257af96a3380a476a6dab0f759329039ecc5d624b785c5c2d14d594fc852dd81c626880c775c691ec9c79b7b3dbcfb257
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/interfaces.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp index ee92316b89..5a832d020b 100644 --- a/src/wallet/interfaces.cpp +++ b/src/wallet/interfaces.cpp @@ -349,9 +349,9 @@ public: TransactionError fillPSBT(int sighash_type, bool sign, bool bip32derivs, + size_t* n_signed, PartiallySignedTransaction& psbtx, - bool& complete, - size_t* n_signed) override + bool& complete) override { return m_wallet->FillPSBT(psbtx, complete, sighash_type, sign, bip32derivs, n_signed); } |