diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-02-14 10:01:06 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-02-14 10:32:02 -0500 |
| commit | fa9b60c842741dc92a33925fca5796ebaa4510bd (patch) | |
| tree | a918c59fb07a53c5af68f72430f751b2cb642da9 /src/psbt.h | |
| parent | 38989ab03fb74ad56c1018c37cb24d17cbb3a16f (diff) | |
| download | bitcoin-fa9b60c842741dc92a33925fca5796ebaa4510bd.tar.xz | |
Remove unused TransactionError constants
Diffstat (limited to 'src/psbt.h')
| -rw-r--r-- | src/psbt.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/psbt.h b/src/psbt.h index e18790322b..efa3d58498 100644 --- a/src/psbt.h +++ b/src/psbt.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2019 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -565,10 +565,9 @@ bool FinalizeAndExtractPSBT(PartiallySignedTransaction& psbtx, CMutableTransacti * Combines PSBTs with the same underlying transaction, resulting in a single PSBT with all partial signatures from each input. * * @param[out] &out the combined PSBT, if successful - * @param[out] &error reference to TransactionError to fill with error info on failure * @param[in] psbtxs the PSBTs to combine - * @return True if we successfully combined the transactions, false if they were not compatible + * @return error (OK if we successfully combined the transactions, other error if they were not compatible) */ -bool CombinePSBTs(PartiallySignedTransaction& out, TransactionError& error, const std::vector<PartiallySignedTransaction>& psbtxs); +NODISCARD TransactionError CombinePSBTs(PartiallySignedTransaction& out, const std::vector<PartiallySignedTransaction>& psbtxs); #endif // BITCOIN_PSBT_H |