From c21ebe6a9ddfc60ca8c418530244fa85d9dc03c6 Mon Sep 17 00:00:00 2001 From: woodser Date: Mon, 19 Sep 2022 20:07:33 -0400 Subject: [PATCH] normalize names of protocol tasks --- .../offer/placeoffer/PlaceOfferProtocol.java | 12 ++-- ...ava => MakerProcessSignOfferResponse.java} | 4 +- ...Funds.java => MakerReserveOfferFunds.java} | 4 +- ...st.java => MakerSendSignOfferRequest.java} | 6 +- .../trade/protocol/ArbitratorProtocol.java | 16 ++--- .../trade/protocol/BuyerAsMakerProtocol.java | 4 +- .../trade/protocol/BuyerAsTakerProtocol.java | 8 +-- .../core/trade/protocol/BuyerProtocol.java | 26 ++++---- .../trade/protocol/SellerAsMakerProtocol.java | 4 +- .../trade/protocol/SellerAsTakerProtocol.java | 8 +-- .../core/trade/protocol/SellerProtocol.java | 20 +++--- .../core/trade/protocol/TradeProtocol.java | 4 +- ...a => ArbitratorProcessDepositRequest.java} | 4 +- ...ratorProcessPaymentAccountKeyRequest.java} | 4 +- ...x.java => ArbitratorProcessReserveTx.java} | 4 +- ...ratorSendInitTradeOrMultisigRequests.java} | 4 +- ...va => BuyerPreparePaymentSentMessage.java} | 4 +- ...uyerProcessPaymentAccountKeyResponse.java} | 4 +- ...> BuyerProcessPaymentReceivedMessage.java} | 4 +- ...PaymentAccountKeyRequestToArbitrator.java} | 4 +- ....java => BuyerSendPaymentSentMessage.java} | 4 +- ...=> BuyerSendPayoutTxPublishedMessage.java} | 4 +- ...enOffer.java => MakerRemoveOpenOffer.java} | 4 +- ...st.java => MakerSendInitTradeRequest.java} | 4 +- ...etsLockTime.java => MakerSetLockTime.java} | 4 +- ...lerMaybeSendPayoutTxPublishedMessage.java} | 4 +- ... SellerPreparePaymentReceivedMessage.java} | 4 +- ...a => SellerProcessPaymentSentMessage.java} | 4 +- ...sitTx.java => SellerPublishDepositTx.java} | 4 +- ...java => SellerPublishTradeStatistics.java} | 4 +- ...> SellerSendPaymentAccountPayloadKey.java} | 4 +- ... => SellerSendPaymentReceivedMessage.java} | 4 +- ...Funds.java => TakerReserveTradeFunds.java} | 4 +- ...akerSendInitTradeRequestToArbitrator.java} | 4 +- .../bisq/desktop/main/debug/DebugView.java | 64 +++++++++---------- 35 files changed, 134 insertions(+), 134 deletions(-) rename core/src/main/java/bisq/core/offer/placeoffer/tasks/{MakerProcessesSignOfferResponse.java => MakerProcessSignOfferResponse.java} (92%) rename core/src/main/java/bisq/core/offer/placeoffer/tasks/{MakerReservesOfferFunds.java => MakerReserveOfferFunds.java} (95%) rename core/src/main/java/bisq/core/offer/placeoffer/tasks/{MakerSendsSignOfferRequest.java => MakerSendSignOfferRequest.java} (97%) rename core/src/main/java/bisq/core/trade/protocol/tasks/{ArbitratorProcessesDepositRequest.java => ArbitratorProcessDepositRequest.java} (98%) rename core/src/main/java/bisq/core/trade/protocol/tasks/{ArbitratorProcessesPaymentAccountKeyRequest.java => ArbitratorProcessPaymentAccountKeyRequest.java} (94%) rename core/src/main/java/bisq/core/trade/protocol/tasks/{ArbitratorProcessesReserveTx.java => ArbitratorProcessReserveTx.java} (95%) rename core/src/main/java/bisq/core/trade/protocol/tasks/{ArbitratorSendsInitTradeOrMultisigRequests.java => ArbitratorSendInitTradeOrMultisigRequests.java} (98%) rename core/src/main/java/bisq/core/trade/protocol/tasks/{BuyerPreparesPaymentSentMessage.java => BuyerPreparePaymentSentMessage.java} (97%) rename core/src/main/java/bisq/core/trade/protocol/tasks/{BuyerProcessesPaymentAccountKeyResponse.java => BuyerProcessPaymentAccountKeyResponse.java} (93%) rename core/src/main/java/bisq/core/trade/protocol/tasks/{BuyerProcessesPaymentReceivedMessage.java => BuyerProcessPaymentReceivedMessage.java} (96%) rename core/src/main/java/bisq/core/trade/protocol/tasks/{BuyerSendsPaymentAccountKeyRequestToArbitrator.java => BuyerSendPaymentAccountKeyRequestToArbitrator.java} (94%) rename core/src/main/java/bisq/core/trade/protocol/tasks/{BuyerSendsPaymentSentMessage.java => BuyerSendPaymentSentMessage.java} (96%) rename core/src/main/java/bisq/core/trade/protocol/tasks/{BuyerSendsPayoutTxPublishedMessage.java => BuyerSendPayoutTxPublishedMessage.java} (93%) rename core/src/main/java/bisq/core/trade/protocol/tasks/{MaybeRemoveOpenOffer.java => MakerRemoveOpenOffer.java} (92%) rename core/src/main/java/bisq/core/trade/protocol/tasks/{MakerSendsInitTradeRequest.java => MakerSendInitTradeRequest.java} (97%) rename core/src/main/java/bisq/core/trade/protocol/tasks/{MakerSetsLockTime.java => MakerSetLockTime.java} (93%) rename core/src/main/java/bisq/core/trade/protocol/tasks/{SellerMaybeSendsPayoutTxPublishedMessage.java => SellerMaybeSendPayoutTxPublishedMessage.java} (94%) rename core/src/main/java/bisq/core/trade/protocol/tasks/{SellerPreparesPaymentReceivedMessage.java => SellerPreparePaymentReceivedMessage.java} (92%) rename core/src/main/java/bisq/core/trade/protocol/tasks/{SellerProcessesPaymentSentMessage.java => SellerProcessPaymentSentMessage.java} (95%) rename core/src/main/java/bisq/core/trade/protocol/tasks/{SellerPublishesDepositTx.java => SellerPublishDepositTx.java} (95%) rename core/src/main/java/bisq/core/trade/protocol/tasks/{SellerPublishesTradeStatistics.java => SellerPublishTradeStatistics.java} (95%) rename core/src/main/java/bisq/core/trade/protocol/tasks/{SellerSendsPaymentAccountPayloadKey.java => SellerSendPaymentAccountPayloadKey.java} (95%) rename core/src/main/java/bisq/core/trade/protocol/tasks/{SellerSendsPaymentReceivedMessage.java => SellerSendPaymentReceivedMessage.java} (95%) rename core/src/main/java/bisq/core/trade/protocol/tasks/{TakerReservesTradeFunds.java => TakerReserveTradeFunds.java} (95%) rename core/src/main/java/bisq/core/trade/protocol/tasks/{TakerSendsInitTradeRequestToArbitrator.java => TakerSendInitTradeRequestToArbitrator.java} (97%) diff --git a/core/src/main/java/bisq/core/offer/placeoffer/PlaceOfferProtocol.java b/core/src/main/java/bisq/core/offer/placeoffer/PlaceOfferProtocol.java index 55a005bed8..1ce7f7c4fc 100644 --- a/core/src/main/java/bisq/core/offer/placeoffer/PlaceOfferProtocol.java +++ b/core/src/main/java/bisq/core/offer/placeoffer/PlaceOfferProtocol.java @@ -20,9 +20,9 @@ package bisq.core.offer.placeoffer; import bisq.core.locale.Res; import bisq.core.offer.messages.SignOfferResponse; import bisq.core.offer.placeoffer.tasks.AddToOfferBook; -import bisq.core.offer.placeoffer.tasks.MakerReservesOfferFunds; -import bisq.core.offer.placeoffer.tasks.MakerSendsSignOfferRequest; -import bisq.core.offer.placeoffer.tasks.MakerProcessesSignOfferResponse; +import bisq.core.offer.placeoffer.tasks.MakerReserveOfferFunds; +import bisq.core.offer.placeoffer.tasks.MakerSendSignOfferRequest; +import bisq.core.offer.placeoffer.tasks.MakerProcessSignOfferResponse; import bisq.core.offer.placeoffer.tasks.ValidateOffer; import bisq.core.trade.handlers.TransactionResultHandler; import bisq.core.trade.protocol.TradeProtocol; @@ -77,8 +77,8 @@ public class PlaceOfferProtocol { ); taskRunner.addTasks( ValidateOffer.class, - MakerReservesOfferFunds.class, - MakerSendsSignOfferRequest.class + MakerReserveOfferFunds.class, + MakerSendSignOfferRequest.class ); taskRunner.run(); @@ -123,7 +123,7 @@ public class PlaceOfferProtocol { } ); taskRunner.addTasks( - MakerProcessesSignOfferResponse.class, + MakerProcessSignOfferResponse.class, AddToOfferBook.class ); diff --git a/core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerProcessesSignOfferResponse.java b/core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerProcessSignOfferResponse.java similarity index 92% rename from core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerProcessesSignOfferResponse.java rename to core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerProcessSignOfferResponse.java index fad5d1c774..2d631be224 100644 --- a/core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerProcessesSignOfferResponse.java +++ b/core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerProcessSignOfferResponse.java @@ -27,8 +27,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import bisq.common.taskrunner.Task; import bisq.common.taskrunner.TaskRunner; -public class MakerProcessesSignOfferResponse extends Task { - public MakerProcessesSignOfferResponse(TaskRunner taskHandler, PlaceOfferModel model) { +public class MakerProcessSignOfferResponse extends Task { + public MakerProcessSignOfferResponse(TaskRunner taskHandler, PlaceOfferModel model) { super(taskHandler, model); } diff --git a/core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerReservesOfferFunds.java b/core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerReserveOfferFunds.java similarity index 95% rename from core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerReservesOfferFunds.java rename to core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerReserveOfferFunds.java index e084bf6043..5921f7ae69 100644 --- a/core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerReservesOfferFunds.java +++ b/core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerReserveOfferFunds.java @@ -29,9 +29,9 @@ import java.util.List; import monero.daemon.model.MoneroOutput; import monero.wallet.model.MoneroTxWallet; -public class MakerReservesOfferFunds extends Task { +public class MakerReserveOfferFunds extends Task { - public MakerReservesOfferFunds(TaskRunner taskHandler, PlaceOfferModel model) { + public MakerReserveOfferFunds(TaskRunner taskHandler, PlaceOfferModel model) { super(taskHandler, model); } diff --git a/core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerSendsSignOfferRequest.java b/core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerSendSignOfferRequest.java similarity index 97% rename from core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerSendsSignOfferRequest.java rename to core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerSendSignOfferRequest.java index a9c1f52b35..610d7923f3 100644 --- a/core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerSendsSignOfferRequest.java +++ b/core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerSendSignOfferRequest.java @@ -42,13 +42,13 @@ import java.util.UUID; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class MakerSendsSignOfferRequest extends Task { - private static final Logger log = LoggerFactory.getLogger(MakerSendsSignOfferRequest.class); +public class MakerSendSignOfferRequest extends Task { + private static final Logger log = LoggerFactory.getLogger(MakerSendSignOfferRequest.class); private boolean failed = false; @SuppressWarnings({"unused"}) - public MakerSendsSignOfferRequest(TaskRunner taskHandler, PlaceOfferModel model) { + public MakerSendSignOfferRequest(TaskRunner taskHandler, PlaceOfferModel model) { super(taskHandler, model); } diff --git a/core/src/main/java/bisq/core/trade/protocol/ArbitratorProtocol.java b/core/src/main/java/bisq/core/trade/protocol/ArbitratorProtocol.java index ef04322837..60768075c4 100644 --- a/core/src/main/java/bisq/core/trade/protocol/ArbitratorProtocol.java +++ b/core/src/main/java/bisq/core/trade/protocol/ArbitratorProtocol.java @@ -12,11 +12,11 @@ import bisq.core.trade.messages.PayoutTxPublishedMessage; import bisq.core.trade.messages.TradeMessage; import bisq.core.trade.protocol.FluentProtocol.Condition; import bisq.core.trade.protocol.tasks.ApplyFilter; -import bisq.core.trade.protocol.tasks.ArbitratorProcessesDepositRequest; -import bisq.core.trade.protocol.tasks.ArbitratorProcessesPaymentAccountKeyRequest; -import bisq.core.trade.protocol.tasks.ArbitratorProcessesReserveTx; +import bisq.core.trade.protocol.tasks.ArbitratorProcessDepositRequest; +import bisq.core.trade.protocol.tasks.ArbitratorProcessPaymentAccountKeyRequest; +import bisq.core.trade.protocol.tasks.ArbitratorProcessReserveTx; import bisq.core.trade.protocol.tasks.ArbitratorProcessPayoutTxPublishedMessage; -import bisq.core.trade.protocol.tasks.ArbitratorSendsInitTradeOrMultisigRequests; +import bisq.core.trade.protocol.tasks.ArbitratorSendInitTradeOrMultisigRequests; import bisq.core.trade.protocol.tasks.ProcessInitTradeRequest; import bisq.core.util.Validator; import bisq.network.p2p.NodeAddress; @@ -61,8 +61,8 @@ public class ArbitratorProtocol extends DisputeProtocol { .setup(tasks( ApplyFilter.class, ProcessInitTradeRequest.class, - ArbitratorProcessesReserveTx.class, - ArbitratorSendsInitTradeOrMultisigRequests.class) + ArbitratorProcessReserveTx.class, + ArbitratorSendInitTradeOrMultisigRequests.class) .using(new TradeTaskRunner(trade, () -> { startTimeout(TRADE_TIMEOUT); @@ -92,7 +92,7 @@ public class ArbitratorProtocol extends DisputeProtocol { .with(request) .from(sender)) .setup(tasks( - ArbitratorProcessesDepositRequest.class) + ArbitratorProcessDepositRequest.class) .using(new TradeTaskRunner(trade, () -> { if (trade.getState() == Trade.State.ARBITRATOR_PUBLISHED_DEPOSIT_TXS) { @@ -125,7 +125,7 @@ public class ArbitratorProtocol extends DisputeProtocol { .with(request) .from(sender)) .setup(tasks( - ArbitratorProcessesPaymentAccountKeyRequest.class) + ArbitratorProcessPaymentAccountKeyRequest.class) .using(new TradeTaskRunner(trade, () -> { stopTimeout(); diff --git a/core/src/main/java/bisq/core/trade/protocol/BuyerAsMakerProtocol.java b/core/src/main/java/bisq/core/trade/protocol/BuyerAsMakerProtocol.java index 1cb6e838c7..a868e0f278 100644 --- a/core/src/main/java/bisq/core/trade/protocol/BuyerAsMakerProtocol.java +++ b/core/src/main/java/bisq/core/trade/protocol/BuyerAsMakerProtocol.java @@ -26,7 +26,7 @@ import bisq.core.trade.messages.PaymentAccountKeyResponse; import bisq.core.trade.messages.PaymentReceivedMessage; import bisq.core.trade.messages.SignContractRequest; import bisq.core.trade.messages.SignContractResponse; -import bisq.core.trade.protocol.tasks.MakerSendsInitTradeRequest; +import bisq.core.trade.protocol.tasks.MakerSendInitTradeRequest; import bisq.core.trade.protocol.tasks.ProcessInitTradeRequest; import bisq.network.p2p.NodeAddress; import bisq.common.handlers.ErrorMessageHandler; @@ -64,7 +64,7 @@ public class BuyerAsMakerProtocol extends BuyerProtocol implements MakerProtocol ProcessInitTradeRequest.class, //ApplyFilter.class, // TODO (woodser): these checks apply when maker signs availability request, but not here //VerifyPeersAccountAgeWitness.class, // TODO (woodser): these checks apply after in multisig, means if rejected need to reimburse other's fee - MakerSendsInitTradeRequest.class) + MakerSendInitTradeRequest.class) .using(new TradeTaskRunner(trade, () -> { startTimeout(TRADE_TIMEOUT); diff --git a/core/src/main/java/bisq/core/trade/protocol/BuyerAsTakerProtocol.java b/core/src/main/java/bisq/core/trade/protocol/BuyerAsTakerProtocol.java index 6146e3ac5a..c8a382bde1 100644 --- a/core/src/main/java/bisq/core/trade/protocol/BuyerAsTakerProtocol.java +++ b/core/src/main/java/bisq/core/trade/protocol/BuyerAsTakerProtocol.java @@ -30,8 +30,8 @@ import bisq.core.trade.messages.SignContractRequest; import bisq.core.trade.messages.SignContractResponse; import bisq.core.trade.messages.TradeMessage; import bisq.core.trade.protocol.tasks.ApplyFilter; -import bisq.core.trade.protocol.tasks.TakerReservesTradeFunds; -import bisq.core.trade.protocol.tasks.TakerSendsInitTradeRequestToArbitrator; +import bisq.core.trade.protocol.tasks.TakerReserveTradeFunds; +import bisq.core.trade.protocol.tasks.TakerSendInitTradeRequestToArbitrator; import bisq.network.p2p.NodeAddress; import bisq.common.handlers.ErrorMessageHandler; import bisq.common.handlers.ResultHandler; @@ -74,8 +74,8 @@ public class BuyerAsTakerProtocol extends BuyerProtocol implements TakerProtocol .from(trade.getTradingPeerNodeAddress())) .setup(tasks( ApplyFilter.class, - TakerReservesTradeFunds.class, - TakerSendsInitTradeRequestToArbitrator.class) + TakerReserveTradeFunds.class, + TakerSendInitTradeRequestToArbitrator.class) .using(new TradeTaskRunner(trade, () -> { startTimeout(TRADE_TIMEOUT); diff --git a/core/src/main/java/bisq/core/trade/protocol/BuyerProtocol.java b/core/src/main/java/bisq/core/trade/protocol/BuyerProtocol.java index 2f4a2baa5f..50fd68481a 100644 --- a/core/src/main/java/bisq/core/trade/protocol/BuyerProtocol.java +++ b/core/src/main/java/bisq/core/trade/protocol/BuyerProtocol.java @@ -25,13 +25,13 @@ import bisq.core.trade.messages.SignContractResponse; import bisq.core.trade.messages.TradeMessage; import bisq.core.trade.protocol.FluentProtocol.Condition; import bisq.core.trade.protocol.tasks.ApplyFilter; -import bisq.core.trade.protocol.tasks.BuyerSendsPayoutTxPublishedMessage; -import bisq.core.trade.protocol.tasks.BuyerPreparesPaymentSentMessage; -import bisq.core.trade.protocol.tasks.BuyerProcessesPaymentReceivedMessage; -import bisq.core.trade.protocol.tasks.BuyerSendsPaymentAccountKeyRequestToArbitrator; -import bisq.core.trade.protocol.tasks.BuyerSendsPaymentSentMessage; +import bisq.core.trade.protocol.tasks.BuyerSendPayoutTxPublishedMessage; +import bisq.core.trade.protocol.tasks.BuyerPreparePaymentSentMessage; +import bisq.core.trade.protocol.tasks.BuyerProcessPaymentReceivedMessage; +import bisq.core.trade.protocol.tasks.BuyerSendPaymentAccountKeyRequestToArbitrator; +import bisq.core.trade.protocol.tasks.BuyerSendPaymentSentMessage; import bisq.core.trade.protocol.tasks.BuyerSetupPayoutTxListener; -import bisq.core.trade.protocol.tasks.BuyerProcessesPaymentAccountKeyResponse; +import bisq.core.trade.protocol.tasks.BuyerProcessPaymentAccountKeyResponse; import bisq.core.trade.protocol.tasks.SetupDepositTxsListener; import bisq.core.util.Validator; import bisq.network.p2p.NodeAddress; @@ -83,7 +83,7 @@ public abstract class BuyerProtocol extends DisputeProtocol { given(anyPhase(Trade.Phase.PAYMENT_SENT, Trade.Phase.PAYMENT_RECEIVED) .anyState(Trade.State.BUYER_STORED_IN_MAILBOX_PAYMENT_SENT_MSG, Trade.State.BUYER_SEND_FAILED_PAYMENT_SENT_MSG) .with(BuyerEvent.STARTUP)) - .setup(tasks(BuyerSendsPaymentSentMessage.class)) + .setup(tasks(BuyerSendPaymentSentMessage.class)) .executeTasks(); } @@ -121,7 +121,7 @@ public abstract class BuyerProtocol extends DisputeProtocol { expect(new Condition(trade) .with(response) .from(sender)) - .setup(tasks(BuyerProcessesPaymentAccountKeyResponse.class) + .setup(tasks(BuyerProcessPaymentAccountKeyResponse.class) .using(new TradeTaskRunner(trade, () -> { handleTaskRunnerSuccess(sender, response); @@ -152,9 +152,9 @@ public abstract class BuyerProtocol extends DisputeProtocol { .preCondition(trade.confirmPermitted())) .setup(tasks(ApplyFilter.class, //UpdateMultisigWithTradingPeer.class, // TODO (woodser): can use this to test protocol with updated multisig from peer. peer should attempt to send updated multisig hex earlier as part of protocol. cannot use with countdown latch because response comes back in a separate thread and blocks on trade - BuyerPreparesPaymentSentMessage.class, + BuyerPreparePaymentSentMessage.class, //BuyerSetupPayoutTxListener.class, - BuyerSendsPaymentSentMessage.class) // don't latch trade because this blocks and runs in background + BuyerSendPaymentSentMessage.class) // don't latch trade because this blocks and runs in background .using(new TradeTaskRunner(trade, () -> { this.errorMessageHandler = null; @@ -190,8 +190,8 @@ public abstract class BuyerProtocol extends DisputeProtocol { .with(message) .from(peer)) .setup(tasks( - BuyerProcessesPaymentReceivedMessage.class, - BuyerSendsPayoutTxPublishedMessage.class) + BuyerProcessPaymentReceivedMessage.class, + BuyerSendPayoutTxPublishedMessage.class) .using(new TradeTaskRunner(trade, () -> { handleTaskRunnerSuccess(peer, message); @@ -241,7 +241,7 @@ public abstract class BuyerProtocol extends DisputeProtocol { if (trade.getSeller().getPaymentAccountPayload() != null) return; // skip if initialized latchTrade(); expect(new Condition(trade)) - .setup(tasks(BuyerSendsPaymentAccountKeyRequestToArbitrator.class) + .setup(tasks(BuyerSendPaymentAccountKeyRequestToArbitrator.class) .using(new TradeTaskRunner(trade, () -> { handleTaskRunnerSuccess(event); diff --git a/core/src/main/java/bisq/core/trade/protocol/SellerAsMakerProtocol.java b/core/src/main/java/bisq/core/trade/protocol/SellerAsMakerProtocol.java index 234d03aa5c..5c42b11f2d 100644 --- a/core/src/main/java/bisq/core/trade/protocol/SellerAsMakerProtocol.java +++ b/core/src/main/java/bisq/core/trade/protocol/SellerAsMakerProtocol.java @@ -27,7 +27,7 @@ import bisq.core.trade.messages.DepositResponse; import bisq.core.trade.messages.InitMultisigRequest; import bisq.core.trade.messages.InitTradeRequest; import bisq.core.trade.messages.TradeMessage; -import bisq.core.trade.protocol.tasks.MakerSendsInitTradeRequest; +import bisq.core.trade.protocol.tasks.MakerSendInitTradeRequest; import bisq.core.trade.protocol.tasks.ProcessInitTradeRequest; import bisq.network.p2p.NodeAddress; import bisq.common.handlers.ErrorMessageHandler; @@ -65,7 +65,7 @@ public class SellerAsMakerProtocol extends SellerProtocol implements MakerProtoc ProcessInitTradeRequest.class, //ApplyFilter.class, // TODO (woodser): these checks apply when maker signs availability request, but not here //VerifyPeersAccountAgeWitness.class, // TODO (woodser): these checks apply after in multisig, means if rejected need to reimburse other's fee - MakerSendsInitTradeRequest.class) + MakerSendInitTradeRequest.class) .using(new TradeTaskRunner(trade, () -> { startTimeout(TRADE_TIMEOUT); diff --git a/core/src/main/java/bisq/core/trade/protocol/SellerAsTakerProtocol.java b/core/src/main/java/bisq/core/trade/protocol/SellerAsTakerProtocol.java index 80deda53f3..74eac8eb94 100644 --- a/core/src/main/java/bisq/core/trade/protocol/SellerAsTakerProtocol.java +++ b/core/src/main/java/bisq/core/trade/protocol/SellerAsTakerProtocol.java @@ -29,8 +29,8 @@ import bisq.core.trade.messages.DepositResponse; import bisq.core.trade.messages.InitMultisigRequest; import bisq.core.trade.messages.TradeMessage; import bisq.core.trade.protocol.tasks.ApplyFilter; -import bisq.core.trade.protocol.tasks.TakerReservesTradeFunds; -import bisq.core.trade.protocol.tasks.TakerSendsInitTradeRequestToArbitrator; +import bisq.core.trade.protocol.tasks.TakerReserveTradeFunds; +import bisq.core.trade.protocol.tasks.TakerSendInitTradeRequestToArbitrator; import bisq.network.p2p.NodeAddress; import bisq.common.handlers.ErrorMessageHandler; import bisq.common.handlers.ResultHandler; @@ -72,8 +72,8 @@ public class SellerAsTakerProtocol extends SellerProtocol implements TakerProtoc .from(trade.getTradingPeerNodeAddress())) .setup(tasks( ApplyFilter.class, - TakerReservesTradeFunds.class, - TakerSendsInitTradeRequestToArbitrator.class) + TakerReserveTradeFunds.class, + TakerSendInitTradeRequestToArbitrator.class) .using(new TradeTaskRunner(trade, () -> { startTimeout(TRADE_TIMEOUT); diff --git a/core/src/main/java/bisq/core/trade/protocol/SellerProtocol.java b/core/src/main/java/bisq/core/trade/protocol/SellerProtocol.java index 5b3f45b90e..163e95c885 100644 --- a/core/src/main/java/bisq/core/trade/protocol/SellerProtocol.java +++ b/core/src/main/java/bisq/core/trade/protocol/SellerProtocol.java @@ -24,11 +24,11 @@ import bisq.core.trade.messages.SignContractResponse; import bisq.core.trade.messages.TradeMessage; import bisq.core.trade.protocol.FluentProtocol.Condition; import bisq.core.trade.protocol.tasks.ApplyFilter; -import bisq.core.trade.protocol.tasks.SellerMaybeSendsPayoutTxPublishedMessage; -import bisq.core.trade.protocol.tasks.SellerPreparesPaymentReceivedMessage; -import bisq.core.trade.protocol.tasks.SellerProcessesPaymentSentMessage; -import bisq.core.trade.protocol.tasks.SellerSendsPaymentReceivedMessage; -import bisq.core.trade.protocol.tasks.SellerSendsPaymentAccountPayloadKey; +import bisq.core.trade.protocol.tasks.SellerMaybeSendPayoutTxPublishedMessage; +import bisq.core.trade.protocol.tasks.SellerPreparePaymentReceivedMessage; +import bisq.core.trade.protocol.tasks.SellerProcessPaymentSentMessage; +import bisq.core.trade.protocol.tasks.SellerSendPaymentReceivedMessage; +import bisq.core.trade.protocol.tasks.SellerSendPaymentAccountPayloadKey; import bisq.core.trade.protocol.tasks.SetupDepositTxsListener; import bisq.network.p2p.NodeAddress; import bisq.common.handlers.ErrorMessageHandler; @@ -122,7 +122,7 @@ public abstract class SellerProtocol extends DisputeProtocol { })) .setup(tasks( ApplyFilter.class, - SellerProcessesPaymentSentMessage.class) + SellerProcessPaymentSentMessage.class) .using(new TradeTaskRunner(trade, () -> { handleTaskRunnerSuccess(peer, message); @@ -154,9 +154,9 @@ public abstract class SellerProtocol extends DisputeProtocol { .preCondition(trade.confirmPermitted())) .setup(tasks( ApplyFilter.class, - SellerPreparesPaymentReceivedMessage.class, - SellerMaybeSendsPayoutTxPublishedMessage.class, - SellerSendsPaymentReceivedMessage.class) + SellerPreparePaymentReceivedMessage.class, + SellerMaybeSendPayoutTxPublishedMessage.class, + SellerSendPaymentReceivedMessage.class) .using(new TradeTaskRunner(trade, () -> { this.errorMessageHandler = null; handleTaskRunnerSuccess(event); @@ -182,7 +182,7 @@ public abstract class SellerProtocol extends DisputeProtocol { synchronized (trade) { latchTrade(); expect(new Condition(trade)) - .setup(tasks(SellerSendsPaymentAccountPayloadKey.class) + .setup(tasks(SellerSendPaymentAccountPayloadKey.class) .using(new TradeTaskRunner(trade, () -> { handleTaskRunnerSuccess(event); diff --git a/core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java b/core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java index 3cc694fd7a..36e5cb9ae6 100644 --- a/core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java +++ b/core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java @@ -29,7 +29,7 @@ import bisq.core.trade.messages.SignContractRequest; import bisq.core.trade.messages.SignContractResponse; import bisq.core.trade.messages.TradeMessage; import bisq.core.trade.messages.UpdateMultisigRequest; -import bisq.core.trade.protocol.tasks.MaybeRemoveOpenOffer; +import bisq.core.trade.protocol.tasks.MakerRemoveOpenOffer; import bisq.core.trade.protocol.tasks.MaybeSendSignContractRequest; import bisq.core.trade.protocol.tasks.ProcessDepositResponse; import bisq.core.trade.protocol.tasks.ProcessInitMultisigRequest; @@ -301,7 +301,7 @@ public abstract class TradeProtocol implements DecryptedDirectMessageListener, D .setup(tasks( // TODO (woodser): validate request ProcessSignContractResponse.class, - MaybeRemoveOpenOffer.class) + MakerRemoveOpenOffer.class) .using(new TradeTaskRunner(trade, () -> { startTimeout(TRADE_TIMEOUT); diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessesDepositRequest.java b/core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessDepositRequest.java similarity index 98% rename from core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessesDepositRequest.java rename to core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessDepositRequest.java index da33a36b91..5c3aab72f9 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessesDepositRequest.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessDepositRequest.java @@ -38,10 +38,10 @@ import lombok.extern.slf4j.Slf4j; import monero.daemon.MoneroDaemon; @Slf4j -public class ArbitratorProcessesDepositRequest extends TradeTask { +public class ArbitratorProcessDepositRequest extends TradeTask { @SuppressWarnings({"unused"}) - public ArbitratorProcessesDepositRequest(TaskRunner taskHandler, Trade trade) { + public ArbitratorProcessDepositRequest(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); } diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessesPaymentAccountKeyRequest.java b/core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessPaymentAccountKeyRequest.java similarity index 94% rename from core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessesPaymentAccountKeyRequest.java rename to core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessPaymentAccountKeyRequest.java index d328fbc1ea..9b5fe2cf08 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessesPaymentAccountKeyRequest.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessPaymentAccountKeyRequest.java @@ -29,10 +29,10 @@ import java.util.UUID; import lombok.extern.slf4j.Slf4j; @Slf4j -public class ArbitratorProcessesPaymentAccountKeyRequest extends TradeTask { +public class ArbitratorProcessPaymentAccountKeyRequest extends TradeTask { @SuppressWarnings({"unused"}) - public ArbitratorProcessesPaymentAccountKeyRequest(TaskRunner taskHandler, Trade trade) { + public ArbitratorProcessPaymentAccountKeyRequest(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); } diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessesReserveTx.java b/core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessReserveTx.java similarity index 95% rename from core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessesReserveTx.java rename to core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessReserveTx.java index 45b81f0106..a93784d7b1 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessesReserveTx.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessReserveTx.java @@ -34,9 +34,9 @@ import lombok.extern.slf4j.Slf4j; * the original offer signer and thus does not have the original reserve tx. */ @Slf4j -public class ArbitratorProcessesReserveTx extends TradeTask { +public class ArbitratorProcessReserveTx extends TradeTask { @SuppressWarnings({"unused"}) - public ArbitratorProcessesReserveTx(TaskRunner taskHandler, Trade trade) { + public ArbitratorProcessReserveTx(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); } diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorSendsInitTradeOrMultisigRequests.java b/core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorSendInitTradeOrMultisigRequests.java similarity index 98% rename from core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorSendsInitTradeOrMultisigRequests.java rename to core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorSendInitTradeOrMultisigRequests.java index 294f594684..12d7fe0e2a 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorSendsInitTradeOrMultisigRequests.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorSendInitTradeOrMultisigRequests.java @@ -41,10 +41,10 @@ import monero.wallet.MoneroWallet; * Arbitrator sends InitMultisigRequests after the maker acks. */ @Slf4j -public class ArbitratorSendsInitTradeOrMultisigRequests extends TradeTask { +public class ArbitratorSendInitTradeOrMultisigRequests extends TradeTask { @SuppressWarnings({"unused"}) - public ArbitratorSendsInitTradeOrMultisigRequests(TaskRunner taskHandler, Trade trade) { + public ArbitratorSendInitTradeOrMultisigRequests(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); } diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerPreparesPaymentSentMessage.java b/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerPreparePaymentSentMessage.java similarity index 97% rename from core/src/main/java/bisq/core/trade/protocol/tasks/BuyerPreparesPaymentSentMessage.java rename to core/src/main/java/bisq/core/trade/protocol/tasks/BuyerPreparePaymentSentMessage.java index 7662615865..dd4139923c 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerPreparesPaymentSentMessage.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerPreparePaymentSentMessage.java @@ -40,10 +40,10 @@ import monero.wallet.model.MoneroSubaddress; import monero.wallet.model.MoneroTxWallet; @Slf4j -public class BuyerPreparesPaymentSentMessage extends TradeTask { +public class BuyerPreparePaymentSentMessage extends TradeTask { @SuppressWarnings({"unused"}) - public BuyerPreparesPaymentSentMessage(TaskRunner taskHandler, Trade trade) { + public BuyerPreparePaymentSentMessage(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); } diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerProcessesPaymentAccountKeyResponse.java b/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerProcessPaymentAccountKeyResponse.java similarity index 93% rename from core/src/main/java/bisq/core/trade/protocol/tasks/BuyerProcessesPaymentAccountKeyResponse.java rename to core/src/main/java/bisq/core/trade/protocol/tasks/BuyerProcessPaymentAccountKeyResponse.java index 1fe58a39c6..dec7439c2d 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerProcessesPaymentAccountKeyResponse.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerProcessPaymentAccountKeyResponse.java @@ -24,10 +24,10 @@ import bisq.core.trade.messages.PaymentAccountKeyResponse; import lombok.extern.slf4j.Slf4j; @Slf4j -public class BuyerProcessesPaymentAccountKeyResponse extends TradeTask { +public class BuyerProcessPaymentAccountKeyResponse extends TradeTask { @SuppressWarnings({"unused"}) - public BuyerProcessesPaymentAccountKeyResponse(TaskRunner taskHandler, Trade trade) { + public BuyerProcessPaymentAccountKeyResponse(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); } diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerProcessesPaymentReceivedMessage.java b/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerProcessPaymentReceivedMessage.java similarity index 96% rename from core/src/main/java/bisq/core/trade/protocol/tasks/BuyerProcessesPaymentReceivedMessage.java rename to core/src/main/java/bisq/core/trade/protocol/tasks/BuyerProcessPaymentReceivedMessage.java index 079c5c60d1..f229e16c92 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerProcessesPaymentReceivedMessage.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerProcessPaymentReceivedMessage.java @@ -37,8 +37,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import monero.wallet.MoneroWallet; @Slf4j -public class BuyerProcessesPaymentReceivedMessage extends TradeTask { - public BuyerProcessesPaymentReceivedMessage(TaskRunner taskHandler, Trade trade) { +public class BuyerProcessPaymentReceivedMessage extends TradeTask { + public BuyerProcessPaymentReceivedMessage(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); } diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendsPaymentAccountKeyRequestToArbitrator.java b/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendPaymentAccountKeyRequestToArbitrator.java similarity index 94% rename from core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendsPaymentAccountKeyRequestToArbitrator.java rename to core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendPaymentAccountKeyRequestToArbitrator.java index 979c710788..db61a2a5ee 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendsPaymentAccountKeyRequestToArbitrator.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendPaymentAccountKeyRequestToArbitrator.java @@ -27,10 +27,10 @@ import java.util.UUID; import lombok.extern.slf4j.Slf4j; @Slf4j -public class BuyerSendsPaymentAccountKeyRequestToArbitrator extends TradeTask { +public class BuyerSendPaymentAccountKeyRequestToArbitrator extends TradeTask { @SuppressWarnings({"unused"}) - public BuyerSendsPaymentAccountKeyRequestToArbitrator(TaskRunner taskHandler, Trade trade) { + public BuyerSendPaymentAccountKeyRequestToArbitrator(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); } diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendsPaymentSentMessage.java b/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendPaymentSentMessage.java similarity index 96% rename from core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendsPaymentSentMessage.java rename to core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendPaymentSentMessage.java index f8dc535f75..91874c1357 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendsPaymentSentMessage.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendPaymentSentMessage.java @@ -40,12 +40,12 @@ import lombok.extern.slf4j.Slf4j; * online he will process it. */ @Slf4j -public class BuyerSendsPaymentSentMessage extends SendMailboxMessageTask { +public class BuyerSendPaymentSentMessage extends SendMailboxMessageTask { private PaymentSentMessage message; private ChangeListener listener; private Timer timer; - public BuyerSendsPaymentSentMessage(TaskRunner taskHandler, Trade trade) { + public BuyerSendPaymentSentMessage(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); } diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendsPayoutTxPublishedMessage.java b/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendPayoutTxPublishedMessage.java similarity index 93% rename from core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendsPayoutTxPublishedMessage.java rename to core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendPayoutTxPublishedMessage.java index 75d7d36561..600ed17215 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendsPayoutTxPublishedMessage.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendPayoutTxPublishedMessage.java @@ -32,9 +32,9 @@ import lombok.extern.slf4j.Slf4j; @EqualsAndHashCode(callSuper = true) @Slf4j -public class BuyerSendsPayoutTxPublishedMessage extends SendMailboxMessageTask { +public class BuyerSendPayoutTxPublishedMessage extends SendMailboxMessageTask { - public BuyerSendsPayoutTxPublishedMessage(TaskRunner taskHandler, Trade trade) { + public BuyerSendPayoutTxPublishedMessage(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); } diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/MaybeRemoveOpenOffer.java b/core/src/main/java/bisq/core/trade/protocol/tasks/MakerRemoveOpenOffer.java similarity index 92% rename from core/src/main/java/bisq/core/trade/protocol/tasks/MaybeRemoveOpenOffer.java rename to core/src/main/java/bisq/core/trade/protocol/tasks/MakerRemoveOpenOffer.java index 4957e29bbb..784eea0218 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/MaybeRemoveOpenOffer.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/MakerRemoveOpenOffer.java @@ -26,8 +26,8 @@ import lombok.extern.slf4j.Slf4j; import static com.google.common.base.Preconditions.checkNotNull; @Slf4j -public class MaybeRemoveOpenOffer extends TradeTask { - public MaybeRemoveOpenOffer(TaskRunner taskHandler, Trade trade) { +public class MakerRemoveOpenOffer extends TradeTask { + public MakerRemoveOpenOffer(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); } diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/MakerSendsInitTradeRequest.java b/core/src/main/java/bisq/core/trade/protocol/tasks/MakerSendInitTradeRequest.java similarity index 97% rename from core/src/main/java/bisq/core/trade/protocol/tasks/MakerSendsInitTradeRequest.java rename to core/src/main/java/bisq/core/trade/protocol/tasks/MakerSendInitTradeRequest.java index 080b28b0fb..44addcc4b7 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/MakerSendsInitTradeRequest.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/MakerSendInitTradeRequest.java @@ -37,9 +37,9 @@ import static bisq.core.util.Validator.checkTradeId; import static com.google.common.base.Preconditions.checkNotNull; @Slf4j -public class MakerSendsInitTradeRequest extends TradeTask { +public class MakerSendInitTradeRequest extends TradeTask { @SuppressWarnings({"unused"}) - public MakerSendsInitTradeRequest(TaskRunner taskHandler, Trade trade) { + public MakerSendInitTradeRequest(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); } diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/MakerSetsLockTime.java b/core/src/main/java/bisq/core/trade/protocol/tasks/MakerSetLockTime.java similarity index 93% rename from core/src/main/java/bisq/core/trade/protocol/tasks/MakerSetsLockTime.java rename to core/src/main/java/bisq/core/trade/protocol/tasks/MakerSetLockTime.java index 70da94a75b..35afdde343 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/MakerSetsLockTime.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/MakerSetLockTime.java @@ -25,8 +25,8 @@ import bisq.common.taskrunner.TaskRunner; import lombok.extern.slf4j.Slf4j; @Slf4j -public class MakerSetsLockTime extends TradeTask { - public MakerSetsLockTime(TaskRunner taskHandler, Trade trade) { +public class MakerSetLockTime extends TradeTask { + public MakerSetLockTime(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); } diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerMaybeSendsPayoutTxPublishedMessage.java b/core/src/main/java/bisq/core/trade/protocol/tasks/SellerMaybeSendPayoutTxPublishedMessage.java similarity index 94% rename from core/src/main/java/bisq/core/trade/protocol/tasks/SellerMaybeSendsPayoutTxPublishedMessage.java rename to core/src/main/java/bisq/core/trade/protocol/tasks/SellerMaybeSendPayoutTxPublishedMessage.java index 9cf343a5e3..98ab66df64 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerMaybeSendsPayoutTxPublishedMessage.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/SellerMaybeSendPayoutTxPublishedMessage.java @@ -30,9 +30,9 @@ import lombok.extern.slf4j.Slf4j; @EqualsAndHashCode(callSuper = true) @Slf4j -public class SellerMaybeSendsPayoutTxPublishedMessage extends SendMailboxMessageTask { +public class SellerMaybeSendPayoutTxPublishedMessage extends SendMailboxMessageTask { - public SellerMaybeSendsPayoutTxPublishedMessage(TaskRunner taskHandler, Trade trade) { + public SellerMaybeSendPayoutTxPublishedMessage(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); } diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerPreparesPaymentReceivedMessage.java b/core/src/main/java/bisq/core/trade/protocol/tasks/SellerPreparePaymentReceivedMessage.java similarity index 92% rename from core/src/main/java/bisq/core/trade/protocol/tasks/SellerPreparesPaymentReceivedMessage.java rename to core/src/main/java/bisq/core/trade/protocol/tasks/SellerPreparePaymentReceivedMessage.java index 7ebede4fcf..6816845f12 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerPreparesPaymentReceivedMessage.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/SellerPreparePaymentReceivedMessage.java @@ -25,10 +25,10 @@ import lombok.extern.slf4j.Slf4j; import monero.wallet.model.MoneroTxWallet; @Slf4j -public class SellerPreparesPaymentReceivedMessage extends TradeTask { +public class SellerPreparePaymentReceivedMessage extends TradeTask { @SuppressWarnings({"unused"}) - public SellerPreparesPaymentReceivedMessage(TaskRunner taskHandler, Trade trade) { + public SellerPreparePaymentReceivedMessage(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); } diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerProcessesPaymentSentMessage.java b/core/src/main/java/bisq/core/trade/protocol/tasks/SellerProcessPaymentSentMessage.java similarity index 95% rename from core/src/main/java/bisq/core/trade/protocol/tasks/SellerProcessesPaymentSentMessage.java rename to core/src/main/java/bisq/core/trade/protocol/tasks/SellerProcessPaymentSentMessage.java index a462312c27..8f3e0f3a1b 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerProcessesPaymentSentMessage.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/SellerProcessPaymentSentMessage.java @@ -28,8 +28,8 @@ import lombok.extern.slf4j.Slf4j; import monero.wallet.MoneroWallet; @Slf4j -public class SellerProcessesPaymentSentMessage extends TradeTask { - public SellerProcessesPaymentSentMessage(TaskRunner taskHandler, Trade trade) { +public class SellerProcessPaymentSentMessage extends TradeTask { + public SellerProcessPaymentSentMessage(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); } diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerPublishesDepositTx.java b/core/src/main/java/bisq/core/trade/protocol/tasks/SellerPublishDepositTx.java similarity index 95% rename from core/src/main/java/bisq/core/trade/protocol/tasks/SellerPublishesDepositTx.java rename to core/src/main/java/bisq/core/trade/protocol/tasks/SellerPublishDepositTx.java index a7593ebc20..dd84704639 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerPublishesDepositTx.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/SellerPublishDepositTx.java @@ -23,8 +23,8 @@ import bisq.common.taskrunner.TaskRunner; import lombok.extern.slf4j.Slf4j; @Slf4j -public class SellerPublishesDepositTx extends TradeTask { - public SellerPublishesDepositTx(TaskRunner taskHandler, Trade trade) { +public class SellerPublishDepositTx extends TradeTask { + public SellerPublishDepositTx(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); } diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerPublishesTradeStatistics.java b/core/src/main/java/bisq/core/trade/protocol/tasks/SellerPublishTradeStatistics.java similarity index 95% rename from core/src/main/java/bisq/core/trade/protocol/tasks/SellerPublishesTradeStatistics.java rename to core/src/main/java/bisq/core/trade/protocol/tasks/SellerPublishTradeStatistics.java index 4a25acec0a..d52d3519dc 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerPublishesTradeStatistics.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/SellerPublishTradeStatistics.java @@ -23,8 +23,8 @@ import bisq.common.taskrunner.TaskRunner; import lombok.extern.slf4j.Slf4j; @Slf4j -public class SellerPublishesTradeStatistics extends TradeTask { - public SellerPublishesTradeStatistics(TaskRunner taskHandler, Trade trade) { +public class SellerPublishTradeStatistics extends TradeTask { + public SellerPublishTradeStatistics(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); } diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerSendsPaymentAccountPayloadKey.java b/core/src/main/java/bisq/core/trade/protocol/tasks/SellerSendPaymentAccountPayloadKey.java similarity index 95% rename from core/src/main/java/bisq/core/trade/protocol/tasks/SellerSendsPaymentAccountPayloadKey.java rename to core/src/main/java/bisq/core/trade/protocol/tasks/SellerSendPaymentAccountPayloadKey.java index 5e7015a380..ebc74f0f60 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerSendsPaymentAccountPayloadKey.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/SellerSendPaymentAccountPayloadKey.java @@ -31,10 +31,10 @@ import monero.wallet.MoneroWallet; * Allow sender's payment account info to be decrypted when trade state is confirmed. */ @Slf4j -public class SellerSendsPaymentAccountPayloadKey extends SendMailboxMessageTask { +public class SellerSendPaymentAccountPayloadKey extends SendMailboxMessageTask { private PaymentAccountKeyResponse message; - public SellerSendsPaymentAccountPayloadKey(TaskRunner taskHandler, Trade trade) { + public SellerSendPaymentAccountPayloadKey(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); } diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerSendsPaymentReceivedMessage.java b/core/src/main/java/bisq/core/trade/protocol/tasks/SellerSendPaymentReceivedMessage.java similarity index 95% rename from core/src/main/java/bisq/core/trade/protocol/tasks/SellerSendsPaymentReceivedMessage.java rename to core/src/main/java/bisq/core/trade/protocol/tasks/SellerSendPaymentReceivedMessage.java index 8a79f48fb9..429c9ed4a2 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerSendsPaymentReceivedMessage.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/SellerSendPaymentReceivedMessage.java @@ -30,10 +30,10 @@ import static com.google.common.base.Preconditions.checkNotNull; @EqualsAndHashCode(callSuper = true) @Slf4j -public class SellerSendsPaymentReceivedMessage extends SendMailboxMessageTask { +public class SellerSendPaymentReceivedMessage extends SendMailboxMessageTask { SignedWitness signedWitness = null; - public SellerSendsPaymentReceivedMessage(TaskRunner taskHandler, Trade trade) { + public SellerSendPaymentReceivedMessage(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); } diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/TakerReservesTradeFunds.java b/core/src/main/java/bisq/core/trade/protocol/tasks/TakerReserveTradeFunds.java similarity index 95% rename from core/src/main/java/bisq/core/trade/protocol/tasks/TakerReservesTradeFunds.java rename to core/src/main/java/bisq/core/trade/protocol/tasks/TakerReserveTradeFunds.java index 843e26c124..f2bda4ce57 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/TakerReservesTradeFunds.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/TakerReserveTradeFunds.java @@ -27,9 +27,9 @@ import java.util.List; import monero.daemon.model.MoneroOutput; import monero.wallet.model.MoneroTxWallet; -public class TakerReservesTradeFunds extends TradeTask { +public class TakerReserveTradeFunds extends TradeTask { - public TakerReservesTradeFunds(TaskRunner taskHandler, Trade trade) { + public TakerReserveTradeFunds(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); } diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/TakerSendsInitTradeRequestToArbitrator.java b/core/src/main/java/bisq/core/trade/protocol/tasks/TakerSendInitTradeRequestToArbitrator.java similarity index 97% rename from core/src/main/java/bisq/core/trade/protocol/tasks/TakerSendsInitTradeRequestToArbitrator.java rename to core/src/main/java/bisq/core/trade/protocol/tasks/TakerSendInitTradeRequestToArbitrator.java index 3480b71321..d99e69a20f 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/TakerSendsInitTradeRequestToArbitrator.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/TakerSendInitTradeRequestToArbitrator.java @@ -37,10 +37,10 @@ import bisq.common.taskrunner.TaskRunner; import lombok.extern.slf4j.Slf4j; @Slf4j -public class TakerSendsInitTradeRequestToArbitrator extends TradeTask { +public class TakerSendInitTradeRequestToArbitrator extends TradeTask { @SuppressWarnings({"unused"}) - public TakerSendsInitTradeRequestToArbitrator(TaskRunner taskHandler, Trade trade) { + public TakerSendInitTradeRequestToArbitrator(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); } diff --git a/desktop/src/main/java/bisq/desktop/main/debug/DebugView.java b/desktop/src/main/java/bisq/desktop/main/debug/DebugView.java index 2b710a60e9..042a4c77c6 100644 --- a/desktop/src/main/java/bisq/desktop/main/debug/DebugView.java +++ b/desktop/src/main/java/bisq/desktop/main/debug/DebugView.java @@ -24,20 +24,20 @@ import bisq.desktop.components.TitledGroupBg; import bisq.core.offer.availability.tasks.ProcessOfferAvailabilityResponse; import bisq.core.offer.availability.tasks.SendOfferAvailabilityRequest; import bisq.core.offer.placeoffer.tasks.AddToOfferBook; -import bisq.core.offer.placeoffer.tasks.MakerReservesOfferFunds; +import bisq.core.offer.placeoffer.tasks.MakerReserveOfferFunds; import bisq.core.offer.placeoffer.tasks.ValidateOffer; import bisq.core.trade.protocol.tasks.ApplyFilter; -import bisq.core.trade.protocol.tasks.BuyerPreparesPaymentSentMessage; -import bisq.core.trade.protocol.tasks.BuyerProcessesPaymentReceivedMessage; -import bisq.core.trade.protocol.tasks.BuyerSendsPaymentSentMessage; +import bisq.core.trade.protocol.tasks.BuyerPreparePaymentSentMessage; +import bisq.core.trade.protocol.tasks.BuyerProcessPaymentReceivedMessage; +import bisq.core.trade.protocol.tasks.BuyerSendPaymentSentMessage; import bisq.core.trade.protocol.tasks.BuyerSetupPayoutTxListener; -import bisq.core.trade.protocol.tasks.MakerSetsLockTime; -import bisq.core.trade.protocol.tasks.MaybeRemoveOpenOffer; -import bisq.core.trade.protocol.tasks.SellerPreparesPaymentReceivedMessage; -import bisq.core.trade.protocol.tasks.SellerProcessesPaymentSentMessage; -import bisq.core.trade.protocol.tasks.SellerPublishesDepositTx; -import bisq.core.trade.protocol.tasks.SellerPublishesTradeStatistics; -import bisq.core.trade.protocol.tasks.SellerSendsPaymentReceivedMessage; +import bisq.core.trade.protocol.tasks.MakerSetLockTime; +import bisq.core.trade.protocol.tasks.MakerRemoveOpenOffer; +import bisq.core.trade.protocol.tasks.SellerPreparePaymentReceivedMessage; +import bisq.core.trade.protocol.tasks.SellerProcessPaymentSentMessage; +import bisq.core.trade.protocol.tasks.SellerPublishDepositTx; +import bisq.core.trade.protocol.tasks.SellerPublishTradeStatistics; +import bisq.core.trade.protocol.tasks.SellerSendPaymentReceivedMessage; import bisq.core.trade.protocol.tasks.TakerVerifyMakerFeePayment; import bisq.core.trade.protocol.tasks.VerifyPeersAccountAgeWitness; import bisq.common.taskrunner.Task; @@ -84,7 +84,7 @@ public class DebugView extends InitializableView { addGroup("PlaceOfferProtocol", FXCollections.observableArrayList(Arrays.asList( ValidateOffer.class, - MakerReservesOfferFunds.class, + MakerReserveOfferFunds.class, AddToOfferBook.class) )); @@ -98,18 +98,18 @@ public class DebugView extends InitializableView { VerifyPeersAccountAgeWitness.class, //SellerSendsDepositTxAndDelayedPayoutTxMessage.class, - SellerPublishesDepositTx.class, - SellerPublishesTradeStatistics.class, + SellerPublishDepositTx.class, + SellerPublishTradeStatistics.class, - SellerProcessesPaymentSentMessage.class, + SellerProcessPaymentSentMessage.class, ApplyFilter.class, TakerVerifyMakerFeePayment.class, ApplyFilter.class, TakerVerifyMakerFeePayment.class, - SellerPreparesPaymentReceivedMessage.class, + SellerPreparePaymentReceivedMessage.class, //SellerBroadcastPayoutTx.class, // TODO (woodser): removed from main pipeline; debug view? - SellerSendsPaymentReceivedMessage.class + SellerSendPaymentReceivedMessage.class ) )); @@ -117,16 +117,16 @@ public class DebugView extends InitializableView { FXCollections.observableArrayList(Arrays.asList( ApplyFilter.class, VerifyPeersAccountAgeWitness.class, - MakerSetsLockTime.class, + MakerSetLockTime.class, - MaybeRemoveOpenOffer.class, + MakerRemoveOpenOffer.class, ApplyFilter.class, - BuyerPreparesPaymentSentMessage.class, + BuyerPreparePaymentSentMessage.class, BuyerSetupPayoutTxListener.class, - BuyerSendsPaymentSentMessage.class, + BuyerSendPaymentSentMessage.class, - BuyerProcessesPaymentReceivedMessage.class + BuyerProcessPaymentReceivedMessage.class ) )); @@ -141,32 +141,32 @@ public class DebugView extends InitializableView { ApplyFilter.class, TakerVerifyMakerFeePayment.class, - BuyerPreparesPaymentSentMessage.class, + BuyerPreparePaymentSentMessage.class, BuyerSetupPayoutTxListener.class, - BuyerSendsPaymentSentMessage.class, + BuyerSendPaymentSentMessage.class, - BuyerProcessesPaymentReceivedMessage.class) + BuyerProcessPaymentReceivedMessage.class) )); addGroup("SellerAsMakerProtocol", FXCollections.observableArrayList(Arrays.asList( ApplyFilter.class, VerifyPeersAccountAgeWitness.class, - MakerSetsLockTime.class, + MakerSetLockTime.class, //SellerAsMakerProcessDepositTxMessage.class, - MaybeRemoveOpenOffer.class, + MakerRemoveOpenOffer.class, //SellerSendsDepositTxAndDelayedPayoutTxMessage.class, - SellerPublishesDepositTx.class, - SellerPublishesTradeStatistics.class, + SellerPublishDepositTx.class, + SellerPublishTradeStatistics.class, - SellerProcessesPaymentSentMessage.class, + SellerProcessPaymentSentMessage.class, ApplyFilter.class, ApplyFilter.class, - SellerPreparesPaymentReceivedMessage.class, + SellerPreparePaymentReceivedMessage.class, //SellerBroadcastPayoutTx.class, // TODO (woodser): removed from main pipeline; debug view? - SellerSendsPaymentReceivedMessage.class + SellerSendPaymentReceivedMessage.class ) )); }