From 97648c51f368021accf175c2a3ff2afb1e5d7578 Mon Sep 17 00:00:00 2001
From: HenrikJannsen <boilingfrog@gmx.com>
Date: Wed, 2 Nov 2022 22:49:57 -0500
Subject: [PATCH] Rename to make use case more clear

Signed-off-by: HenrikJannsen <boilingfrog@gmx.com>
---
 .../java/bisq/core/support/dispute/DisputeManager.java     | 4 ++--
 .../java/bisq/core/support/dispute/DisputeValidation.java  | 7 ++++---
 .../main/overlays/windows/DisputeSummaryWindow.java        | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/bisq/core/support/dispute/DisputeManager.java b/core/src/main/java/bisq/core/support/dispute/DisputeManager.java
index 6be0482c2f..7b61d5e4dc 100644
--- a/core/src/main/java/bisq/core/support/dispute/DisputeManager.java
+++ b/core/src/main/java/bisq/core/support/dispute/DisputeManager.java
@@ -273,7 +273,7 @@ public abstract class DisputeManager<T extends DisputeList<Dispute>> extends Sup
         List<Dispute> disputes = getDisputeList().getList();
         disputes.forEach(dispute -> {
             try {
-                DisputeValidation.validateDonationAddress(dispute, dispute.getDonationAddressOfDelayedPayoutTx(), daoFacade);
+                DisputeValidation.validateDonationAddressMatchesAnyPastParamValues(dispute, dispute.getDonationAddressOfDelayedPayoutTx(), daoFacade);
                 DisputeValidation.validateNodeAddresses(dispute, config);
             } catch (DisputeValidation.AddressException | DisputeValidation.NodeAddressException e) {
                 log.error(e.toString());
@@ -368,7 +368,7 @@ public abstract class DisputeManager<T extends DisputeList<Dispute>> extends Sup
         addMediationResultMessage(dispute);
 
         try {
-            DisputeValidation.validateDonationAddress(dispute, dispute.getDonationAddressOfDelayedPayoutTx(), daoFacade);
+            DisputeValidation.validateDonationAddressMatchesAnyPastParamValues(dispute, dispute.getDonationAddressOfDelayedPayoutTx(), daoFacade);
             DisputeValidation.testIfDisputeTriesReplay(dispute, disputeList.getList());
             DisputeValidation.validateNodeAddresses(dispute, config);
         } catch (DisputeValidation.AddressException |
diff --git a/core/src/main/java/bisq/core/support/dispute/DisputeValidation.java b/core/src/main/java/bisq/core/support/dispute/DisputeValidation.java
index 00b8cb25bd..50188b95af 100644
--- a/core/src/main/java/bisq/core/support/dispute/DisputeValidation.java
+++ b/core/src/main/java/bisq/core/support/dispute/DisputeValidation.java
@@ -64,9 +64,10 @@ public class DisputeValidation {
         }
     }
 
-    public static void validateDonationAddress(Dispute dispute, String addressAsString, DaoFacade daoFacade)
+    public static void validateDonationAddressMatchesAnyPastParamValues(Dispute dispute,
+                                                                        String addressAsString,
+                                                                        DaoFacade daoFacade)
             throws AddressException {
-
         Set<String> allPastParamValues = daoFacade.getAllDonationAddresses();
         if (!allPastParamValues.contains(addressAsString)) {
             String errorMsg = "Donation address is not a valid DAO donation address." +
@@ -92,7 +93,7 @@ public class DisputeValidation {
             throw new DisputeValidation.AddressException(dispute, errorMsg);
         }
         String delayedPayoutTxOutputAddress = address.toString();
-        validateDonationAddress(dispute, delayedPayoutTxOutputAddress, daoFacade);
+        validateDonationAddressMatchesAnyPastParamValues(dispute, delayedPayoutTxOutputAddress, daoFacade);
 
         if (dispute != null) {
             // Verify that address in the dispute matches the one in the trade.
diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java
index 56c59f2ec0..adea7f53f0 100644
--- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java
+++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java
@@ -814,7 +814,7 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
     private void doCloseIfValid(Button closeTicketButton) {
         var disputeManager = checkNotNull(getDisputeManager(dispute));
         try {
-            DisputeValidation.validateDonationAddress(dispute, dispute.getDonationAddressOfDelayedPayoutTx(), daoFacade);
+            DisputeValidation.validateDonationAddressMatchesAnyPastParamValues(dispute, dispute.getDonationAddressOfDelayedPayoutTx(), daoFacade);
             DisputeValidation.testIfDisputeTriesReplay(dispute, disputeManager.getDisputesAsObservableList());
             doClose(closeTicketButton);
         } catch (DisputeValidation.AddressException exception) {