Commit 1fbc33f8 authored by Andreas Schildbach's avatar Andreas Schildbach

Wallet: Fix precondition for transaction confidence of transactions in the...

Wallet: Fix precondition for transaction confidence of transactions in the pending pool. They can now also be IN_CONFLICT.
parent 57787946
......@@ -5069,7 +5069,8 @@ public class Wallet extends BaseTaggableObject
// is no inversion.
for (Transaction tx : toBroadcast) {
ConfidenceType confidenceType = tx.getConfidence().getConfidenceType();
checkState(confidenceType == ConfidenceType.PENDING, "Expected PENDING, was %s.", confidenceType);
checkState(confidenceType == ConfidenceType.PENDING || confidenceType == ConfidenceType.IN_CONFLICT,
"Expected PENDING or IN_CONFLICT, was %s.", confidenceType);
// Re-broadcast even if it's marked as already seen for two reasons
// 1) Old wallets may have transactions marked as broadcast by 1 peer when in reality the network
// never saw it, due to bugs.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment