Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-10-11 10:08:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

refactor getReceiver() to base SendMailboxMessageTask

Browse source
This commit is contained in:
woodser 2025-10-08 06:32:27 -04:00
parent 53aa781369
commit 662fa01d4c
No known key found for this signature in database
GPG key ID: 55A10DD48ADEE5EF
5 changed files with 11 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

15
core/src/main/java/haveno/core/trade/protocol/tasks/BuyerSendPaymentSentMessage.java
View file

@ -38,16 +38,13 @@ import java.util.concurrent.TimeUnit;
import haveno.common.Timer;
import haveno.common.UserThread;
import haveno.common.crypto.PubKeyRing;
import haveno.common.taskrunner.TaskRunner;
import haveno.core.network.MessageState;
import haveno.core.trade.HavenoUtils;
import haveno.core.trade.Trade;
import haveno.core.trade.messages.PaymentSentMessage;
import haveno.core.trade.messages.TradeMailboxMessage;
import haveno.core.trade.protocol.TradePeer;
import haveno.core.util.JsonUtil;
import haveno.network.p2p.NodeAddress;
import javafx.beans.value.ChangeListener;
import lombok.EqualsAndHashCode;
import lombok.extern.slf4j.Slf4j;
@ -74,18 +71,6 @@ public abstract class BuyerSendPaymentSentMessage extends SendMailboxMessageTask
super(taskHandler, trade);
}
protected abstract TradePeer getReceiver();
@Override
protected NodeAddress getReceiverNodeAddress() {
return getReceiver().getNodeAddress();
}
@Override
protected PubKeyRing getReceiverPubKeyRing() {
return getReceiver().getPubKeyRing();
}
@Override
protected void run() {
try {

15
core/src/main/java/haveno/core/trade/protocol/tasks/SellerSendPaymentReceivedMessage.java
View file

@ -38,7 +38,6 @@ import com.google.common.base.Charsets;
import haveno.common.Timer;
import haveno.common.UserThread;
import haveno.common.crypto.PubKeyRing;
import haveno.common.crypto.Sig;
import haveno.common.taskrunner.TaskRunner;
import haveno.core.account.sign.SignedWitness;
@ -49,9 +48,7 @@ import haveno.core.trade.SellerTrade;
import haveno.core.trade.Trade;
import haveno.core.trade.messages.PaymentReceivedMessage;
import haveno.core.trade.messages.TradeMailboxMessage;
import haveno.core.trade.protocol.TradePeer;
import haveno.core.util.JsonUtil;
import haveno.network.p2p.NodeAddress;
import javafx.beans.value.ChangeListener;
import lombok.EqualsAndHashCode;
import lombok.extern.slf4j.Slf4j;
@ -79,18 +76,6 @@ public abstract class SellerSendPaymentReceivedMessage extends SendMailboxMessag
public SellerSendPaymentReceivedMessage(TaskRunner<Trade> taskHandler, Trade trade) {
super(taskHandler, trade);
}
protected abstract TradePeer getReceiver();
@Override
protected NodeAddress getReceiverNodeAddress() {
return getReceiver().getNodeAddress();
}
@Override
protected PubKeyRing getReceiverPubKeyRing() {
return getReceiver().getPubKeyRing();
}
@Override
protected void run() {

15
core/src/main/java/haveno/core/trade/protocol/tasks/SendDepositsConfirmedMessage.java
View file

@ -21,15 +21,12 @@ import java.util.concurrent.TimeUnit;
import haveno.common.Timer;
import haveno.common.UserThread;
import haveno.common.crypto.PubKeyRing;
import haveno.common.taskrunner.TaskRunner;
import haveno.core.network.MessageState;
import haveno.core.trade.HavenoUtils;
import haveno.core.trade.Trade;
import haveno.core.trade.messages.DepositsConfirmedMessage;
import haveno.core.trade.messages.TradeMailboxMessage;
import haveno.core.trade.protocol.TradePeer;
import haveno.network.p2p.NodeAddress;
import lombok.extern.slf4j.Slf4j;
/**
@ -65,18 +62,6 @@ public abstract class SendDepositsConfirmedMessage extends SendMailboxMessageTas
}
}
protected abstract TradePeer getReceiver();
@Override
protected NodeAddress getReceiverNodeAddress() {
return getReceiver().getNodeAddress();
}
@Override
protected PubKeyRing getReceiverPubKeyRing() {
return getReceiver().getPubKeyRing();
}
@Override
protected TradeMailboxMessage getMailboxMessage(String tradeId) {
if (message == null) {

7
core/src/main/java/haveno/core/trade/protocol/tasks/SendMailboxMessageTask.java
View file

@ -20,6 +20,7 @@ package haveno.core.trade.protocol.tasks;
import haveno.common.crypto.PubKeyRing;
import haveno.common.taskrunner.TaskRunner;
import haveno.core.trade.Trade;
import haveno.core.trade.protocol.TradePeer;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.SendMailboxMessageListener;
import haveno.network.p2p.mailbox.MailboxMessage;
@ -31,12 +32,14 @@ public abstract class SendMailboxMessageTask extends TradeTask {
super(taskHandler, trade);
}
protected abstract TradePeer getReceiver();
protected NodeAddress getReceiverNodeAddress() {
return trade.getTradePeer().getNodeAddress();
return getReceiver().getNodeAddress();
}
protected PubKeyRing getReceiverPubKeyRing() {
return trade.getTradePeer().getPubKeyRing();
return getReceiver().getPubKeyRing();
}
protected abstract MailboxMessage getMailboxMessage(String tradeId);

6
core/src/main/java/haveno/core/trade/protocol/tasks/mediation/SendMediatedPayoutTxPublishedMessage.java
View file

@ -21,6 +21,7 @@ import haveno.common.taskrunner.TaskRunner;
import haveno.core.support.dispute.mediation.MediationResultState;
import haveno.core.trade.Trade;
import haveno.core.trade.messages.TradeMailboxMessage;
import haveno.core.trade.protocol.TradePeer;
import haveno.core.trade.protocol.tasks.SendMailboxMessageTask;
import lombok.extern.slf4j.Slf4j;
@ -31,6 +32,11 @@ public class SendMediatedPayoutTxPublishedMessage extends SendMailboxMessageTask
super(taskHandler, trade);
}
@Override
protected TradePeer getReceiver() {
return trade.getTradePeer();
}
@Override
protected TradeMailboxMessage getMailboxMessage(String id) {
throw new RuntimeException("SendMediatedPayoutTxPublishedMessage.getMessage(id) not implemented for xmr");