aboutsummaryrefslogtreecommitdiff
path: root/src/psbt.cpp
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2019-02-14 10:01:06 -0500
committerMarcoFalke <falke.marco@gmail.com>2019-02-14 10:32:02 -0500
commitfa9b60c842741dc92a33925fca5796ebaa4510bd (patch)
treea918c59fb07a53c5af68f72430f751b2cb642da9 /src/psbt.cpp
parent38989ab03fb74ad56c1018c37cb24d17cbb3a16f (diff)
downloadbitcoin-fa9b60c842741dc92a33925fca5796ebaa4510bd.tar.xz
Remove unused TransactionError constants
Diffstat (limited to 'src/psbt.cpp')
-rw-r--r--src/psbt.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/psbt.cpp b/src/psbt.cpp
index 81633c0cc7..f0e177a640 100644
--- a/src/psbt.cpp
+++ b/src/psbt.cpp
@@ -263,21 +263,19 @@ bool FinalizeAndExtractPSBT(PartiallySignedTransaction& psbtx, CMutableTransacti
return true;
}
-bool CombinePSBTs(PartiallySignedTransaction& out, TransactionError& error, const std::vector<PartiallySignedTransaction>& psbtxs)
+TransactionError CombinePSBTs(PartiallySignedTransaction& out, const std::vector<PartiallySignedTransaction>& psbtxs)
{
out = psbtxs[0]; // Copy the first one
// Merge
for (auto it = std::next(psbtxs.begin()); it != psbtxs.end(); ++it) {
if (!out.Merge(*it)) {
- error = TransactionError::PSBT_MISMATCH;
- return false;
+ return TransactionError::PSBT_MISMATCH;
}
}
if (!out.IsSane()) {
- error = TransactionError::INVALID_PSBT;
- return false;
+ return TransactionError::INVALID_PSBT;
}
- return true;
+ return TransactionError::OK;
}