mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename to make use case more clear

Browse source 
Signed-off-by: HenrikJannsen <boilingfrog@gmx.com>
This commit is contained in:
HenrikJannsen 2022-11-02 22:49:57 -05:00
parent 0bf44f061d
commit 97648c51f3
No known key found for this signature in database
GPG key ID: 02AA2BAE387C8307
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/bisq/core/support/dispute/DisputeManager.java
View file

@ -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 |

7
core/src/main/java/bisq/core/support/dispute/DisputeValidation.java
View file

@ -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.

2
desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java
View file

@ -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) {