Merge pull request #7351 from thecockatiel/fix_short_id_and_pre_condi…

…tion fix: Utilities.getShortId and FluentProtocol.preCondition usage
bisq-network · Jan 15, 2025 · c079407 · c079407
2 parents c8e05fc + 61c90bf
commit c079407
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/common/src/main/java/bisq/common/util/Utilities.java b/common/src/main/java/bisq/common/util/Utilities.java
@@ -485,7 +485,7 @@ public static String getShortId(String id) {
     @SuppressWarnings("SameParameterValue")
     public static String getShortId(String id, String sep) {
         String[] chunks = id.split(sep);
-        if (chunks.length > 0)
+        if (chunks.length > 1 && chunks[0].length() <= 8)
             return chunks[0];
         else
             return id.substring(0, Math.min(8, id.length()));

diff --git a/core/src/main/java/bisq/core/trade/protocol/FluentProtocol.java b/core/src/main/java/bisq/core/trade/protocol/FluentProtocol.java
@@ -218,10 +218,16 @@ public Condition preCondition(boolean preCondition) {
             return this;
         }
 
+        /** Calling this more than once discards the previous conditionFailedHandler */
         public Condition preCondition(boolean preCondition, Runnable conditionFailedHandler) {
             checkArgument(result == null);
             preCondition(preCondition);
 
+            // warn if we are replacing it with another preConditionHandler:
+            if (this.preConditionFailedHandler != null) {
+                log.warn("preCondition with conditionFailedHandler was called more than once." +
+                         "previous conditionFailedHandler will be discarded.");
+            }
             this.preConditionFailedHandler = conditionFailedHandler;
             return this;
         }

diff --git a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/DisputeProtocol.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/DisputeProtocol.java
@@ -109,10 +109,11 @@ public void onAcceptMediationResult(ResultHandler resultHandler, ErrorMessageHan
                 Trade.Phase.FIAT_SENT,
                 Trade.Phase.FIAT_RECEIVED)
                 .with(event)
-                .preCondition(trade.getProcessModel().getTradePeer().getMediatedPayoutTxSignature() == null,
-                        () -> errorMessageHandler.handleErrorMessage("We have received already the signature from the peer."))
-                .preCondition(trade.getPayoutTx() == null,
-                        () -> errorMessageHandler.handleErrorMessage("Payout tx is already published.")))
+                .preCondition(
+                        (trade.getProcessModel().getTradePeer().getMediatedPayoutTxSignature() == null) ||
+                        (trade.getPayoutTx() == null),
+                        () -> errorMessageHandler.handleErrorMessage("We either have received already the signature from the peer or payout tx is already published."))
+                )
                 .setup(tasks(ApplyFilter.class,
                         SignMediatedPayoutTx.class,
                         SendMediatedPayoutSignatureMessage.class,