From a95936297afd000f729bb129cb72b618b2cf1bd7 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 2 Apr 2015 14:02:34 +0200 Subject: [PATCH] Unify OfferTradeTask and TakerTradeTask --- .../closed/ClosedTradesViewModel.java | 8 ++-- .../pending/PendingTradesDataModel.java | 43 +++++++++-------- .../pending/PendingTradesViewModel.java | 4 +- .../trade/takeoffer/TakeOfferViewModel.java | 10 ++-- ...yerTrade.java => BuyerAsOffererTrade.java} | 23 ++++----- ...BuyerTrade.java => BuyerAsTakerTrade.java} | 22 +++++---- ...erTrade.java => SellerAsOffererTrade.java} | 18 +++---- ...llerTrade.java => SellerAsTakerTrade.java} | 20 ++++---- .../main/java/io/bitsquare/trade/Trade.java | 48 ++++++++----------- .../java/io/bitsquare/trade/TradeManager.java | 28 ++++++----- .../TradeProtocol.java} | 4 +- .../TakerTradeTask.java => TradeTask.java} | 8 ++-- .../buyer/offerer/BuyerAsOffererProtocol.java | 32 ++++++------- .../offerer/tasks/OffererCommitsPayoutTx.java | 4 +- .../tasks/OffererCreatesAndSignPayoutTx.java | 4 +- .../tasks/OffererCreatesDepositTxInputs.java | 14 +++--- ...ffererProcessPayoutTxPublishedMessage.java | 14 +++--- ...rProcessRequestDepositTxInputsMessage.java | 14 +++--- ...ProcessRequestPublishDepositTxMessage.java | 14 +++--- ...OffererSendsDepositTxPublishedMessage.java | 14 +++--- ...ffererSendsFiatTransferStartedMessage.java | 26 +++++----- ...ndsRequestSellerDepositPaymentMessage.java | 34 ++++++------- .../OffererSignsAndPublishDepositTx.java | 22 ++++----- .../OffererVerifiesAndSignsContract.java | 14 +++--- .../buyer/taker/BuyerAsTakerProtocol.java | 20 ++++---- .../taker/tasks/TakerCommitsPayoutTx.java | 4 +- .../tasks/TakerCreatesAndSignsPayoutTx.java | 4 +- .../tasks/TakerCreatesDepositTxInputs.java | 4 +- .../TakerProcessPayoutTxPublishedMessage.java | 14 +++--- ...questPublishDepositTxFromTakerMessage.java | 4 +- .../TakerSendsDepositTxPublishedMessage.java | 14 +++--- .../TakerSendsFiatTransferStartedMessage.java | 20 ++++---- ...kerSendsRequestDepositTxInputsMessage.java | 14 +++--- .../TakerSendsRequestPayDepositMessage.java | 18 +++---- ...erSendsRequestPublishDepositTxMessage.java | 14 +++--- .../tasks/TakerSignsAndPublishDepositTx.java | 14 +++--- .../tasks/TakerVerifiesAndSignsContract.java | 4 +- .../offerer/SellerAsOffererProtocol.java | 32 ++++++------- .../offerer/tasks/OffererCommitDepositTx.java | 4 +- .../tasks/OffererCreatesAndSignsContract.java | 4 +- .../OffererCreatesAndSignsDepositTx.java | 4 +- ...fererProcessDepositTxPublishedMessage.java | 14 +++--- ...ererProcessFiatTransferStartedMessage.java | 14 +++--- ...ssRequestPayDepositFromOffererMessage.java | 4 +- .../OffererSendsPayoutTxPublishedMessage.java | 14 +++--- ...questPublishDepositTxFromTakerMessage.java | 14 +++--- .../tasks/OffererSignsAndPublishPayoutTx.java | 14 +++--- .../seller/taker/SellerAsTakerProtocol.java | 26 +++++----- .../taker/tasks/TakerCommitDepositTx.java | 4 +- .../tasks/TakerCreatesAndSignContract.java | 4 +- .../tasks/TakerCreatesAndSignsDepositTx.java | 4 +- ...TakerProcessDepositTxPublishedMessage.java | 14 +++--- ...akerProcessFiatTransferStartedMessage.java | 14 +++--- ...essRequestSellerDepositPaymentMessage.java | 4 +- .../TakerSendsPayoutTxPublishedMessage.java | 14 +++--- .../tasks/TakerSignsAndPublishPayoutTx.java | 14 +++--- .../tasks/VerifyTakeOfferFeePayment.java | 4 +- .../offerer/tasks/VerifyTakerAccount.java | 18 +++---- .../taker/tasks/BroadcastTakeOfferFeeTx.java | 18 +++---- .../taker/tasks/CreateTakeOfferFeeTx.java | 14 +++--- .../taker/tasks/VerifyOfferFeePayment.java | 4 +- .../taker/tasks/VerifyOffererAccount.java | 4 +- .../trade/{ => states}/OffererState.java | 6 +-- .../trade/{ => states}/TakerState.java | 6 +-- .../TradeState.java} | 22 ++------- 65 files changed, 443 insertions(+), 459 deletions(-) rename core/src/main/java/io/bitsquare/trade/{OffererAsBuyerTrade.java => BuyerAsOffererTrade.java} (84%) rename core/src/main/java/io/bitsquare/trade/{TakerAsBuyerTrade.java => BuyerAsTakerTrade.java} (84%) rename core/src/main/java/io/bitsquare/trade/{OffererAsSellerTrade.java => SellerAsOffererTrade.java} (86%) rename core/src/main/java/io/bitsquare/trade/{TakerAsSellerTrade.java => SellerAsTakerTrade.java} (85%) rename core/src/main/java/io/bitsquare/trade/protocol/{Protocol.java => trade/TradeProtocol.java} (91%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{taker/tasks/TakerTradeTask.java => TradeTask.java} (82%) rename core/src/main/java/io/bitsquare/trade/{ => states}/OffererState.java (87%) rename core/src/main/java/io/bitsquare/trade/{ => states}/TakerState.java (88%) rename core/src/main/java/io/bitsquare/trade/{protocol/trade/offerer/tasks/OffererTradeTask.java => states/TradeState.java} (52%) diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java index d3b1b06c07..52d12b1b4b 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java @@ -20,9 +20,9 @@ package io.bitsquare.gui.main.portfolio.closed; import io.bitsquare.common.viewfx.model.ActivatableWithDataModel; import io.bitsquare.common.viewfx.model.ViewModel; import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.trade.OffererState; -import io.bitsquare.trade.TakerState; -import io.bitsquare.trade.Trade; +import io.bitsquare.trade.states.OffererState; +import io.bitsquare.trade.states.TakerState; +import io.bitsquare.trade.states.TradeState; import com.google.inject.Inject; @@ -70,7 +70,7 @@ class ClosedTradesViewModel extends ActivatableWithDataModel takerAsSellerProcessState = new SimpleObjectProperty<>(); - final ObjectProperty offererAsBuyerProcessState = new SimpleObjectProperty<>(); - final ObjectProperty takerAsBuyerProcessState = new SimpleObjectProperty<>(); - final ObjectProperty offererAsSellerProcessState = new SimpleObjectProperty<>(); + final ObjectProperty takerAsSellerProcessState = new SimpleObjectProperty<>(); + final ObjectProperty offererAsBuyerProcessState = new SimpleObjectProperty<>(); + final ObjectProperty takerAsBuyerProcessState = new SimpleObjectProperty<>(); + final ObjectProperty offererAsSellerProcessState = new SimpleObjectProperty<>(); final ObjectProperty currentTrade = new SimpleObjectProperty<>(); @@ -135,13 +136,13 @@ class PendingTradesDataModel implements Activatable, DataModel { Trade trade = item.getTrade(); isOfferer = trade.getOffer().getP2PSigPubKey().equals(user.getP2PSigPubKey()); - if (trade instanceof TakerAsSellerTrade) + if (trade instanceof SellerAsTakerTrade) takerAsSellerProcessState.bind(trade.processStateProperty()); - else if (trade instanceof OffererAsBuyerTrade) + else if (trade instanceof BuyerAsOffererTrade) offererAsBuyerProcessState.bind(trade.processStateProperty()); - else if (trade instanceof TakerAsBuyerTrade) + else if (trade instanceof BuyerAsTakerTrade) takerAsBuyerProcessState.bind(trade.processStateProperty()); - else if (trade instanceof OffererAsSellerTrade) + else if (trade instanceof SellerAsOffererTrade) offererAsSellerProcessState.bind(trade.processStateProperty()); if (trade.getDepositTx() != null) @@ -150,17 +151,17 @@ class PendingTradesDataModel implements Activatable, DataModel { } void fiatPaymentStarted() { - if (getTrade() instanceof OffererAsBuyerTrade) - ((OffererAsBuyerTrade) getTrade()).onFiatPaymentStarted(); - else if (getTrade() instanceof TakerAsBuyerTrade) - ((TakerAsBuyerTrade) getTrade()).onFiatPaymentStarted(); + if (getTrade() instanceof BuyerAsOffererTrade) + ((BuyerAsOffererTrade) getTrade()).onFiatPaymentStarted(); + else if (getTrade() instanceof BuyerAsTakerTrade) + ((BuyerAsTakerTrade) getTrade()).onFiatPaymentStarted(); } void fiatPaymentReceived() { - if (getTrade() instanceof TakerAsSellerTrade) - ((TakerAsSellerTrade) getTrade()).onFiatPaymentReceived(); - else if (getTrade() instanceof OffererAsSellerTrade) - ((OffererAsSellerTrade) getTrade()).onFiatPaymentReceived(); + if (getTrade() instanceof SellerAsTakerTrade) + ((SellerAsTakerTrade) getTrade()).onFiatPaymentReceived(); + else if (getTrade() instanceof SellerAsOffererTrade) + ((SellerAsOffererTrade) getTrade()).onFiatPaymentReceived(); } void withdraw(String toAddress) { @@ -262,7 +263,7 @@ class PendingTradesDataModel implements Activatable, DataModel { Trade trade = selectedItem.getTrade(); Coin amountToWithdraw = trade.getSecurityDeposit(); assert trade.getTradeAmount() != null; - if (trade instanceof OffererAsBuyerTrade || trade instanceof TakerAsBuyerTrade) + if (trade instanceof BuyerAsOffererTrade || trade instanceof BuyerAsTakerTrade) amountToWithdraw = amountToWithdraw.add(trade.getTradeAmount()); return amountToWithdraw; } diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java index 39ffdc4fd4..a925a073e0 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java @@ -27,8 +27,8 @@ import io.bitsquare.gui.main.portfolio.closed.ClosedTradesView; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.validation.BtcAddressValidator; import io.bitsquare.locale.BSResources; -import io.bitsquare.trade.OffererState; -import io.bitsquare.trade.TakerState; +import io.bitsquare.trade.states.OffererState; +import io.bitsquare.trade.states.TakerState; import org.bitcoinj.core.Coin; import org.bitcoinj.utils.Fiat; diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java b/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java index 7dd5152e51..7eccd24f05 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java +++ b/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java @@ -26,9 +26,9 @@ import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.locale.BSResources; import io.bitsquare.locale.CurrencyUtil; import io.bitsquare.offer.Offer; -import io.bitsquare.trade.TakerAsBuyerTrade; -import io.bitsquare.trade.TakerAsSellerTrade; -import io.bitsquare.trade.TakerState; +import io.bitsquare.trade.BuyerAsTakerTrade; +import io.bitsquare.trade.SellerAsTakerTrade; +import io.bitsquare.trade.states.TakerState; import org.bitcoinj.core.Address; import org.bitcoinj.core.Coin; @@ -234,7 +234,7 @@ class TakeOfferViewModel extends ActivatableWithDataModel im if (trade.getErrorMessage() != null) msg = "\nError message: " + trade.getErrorMessage(); - if (trade instanceof TakerAsBuyerTrade) { + if (trade instanceof BuyerAsTakerTrade) { switch ((TakerState.ProcessState) newValue) { case TAKE_OFFER_FEE_TX_CREATED: break; @@ -266,7 +266,7 @@ class TakeOfferViewModel extends ActivatableWithDataModel im break; } } - else if (trade instanceof TakerAsSellerTrade) { + else if (trade instanceof SellerAsTakerTrade) { switch ((TakerState.ProcessState) newValue) { case TAKE_OFFER_FEE_TX_CREATED: break; diff --git a/core/src/main/java/io/bitsquare/trade/OffererAsBuyerTrade.java b/core/src/main/java/io/bitsquare/trade/BuyerAsOffererTrade.java similarity index 84% rename from core/src/main/java/io/bitsquare/trade/OffererAsBuyerTrade.java rename to core/src/main/java/io/bitsquare/trade/BuyerAsOffererTrade.java index 6451ed22ce..f7e893d439 100644 --- a/core/src/main/java/io/bitsquare/trade/OffererAsBuyerTrade.java +++ b/core/src/main/java/io/bitsquare/trade/BuyerAsOffererTrade.java @@ -20,6 +20,8 @@ package io.bitsquare.trade; import io.bitsquare.offer.Offer; import io.bitsquare.storage.Storage; import io.bitsquare.trade.protocol.trade.buyer.offerer.BuyerAsOffererProtocol; +import io.bitsquare.trade.states.OffererState; +import io.bitsquare.trade.states.TradeState; import java.io.IOException; import java.io.ObjectInputStream; @@ -28,23 +30,18 @@ import java.io.Serializable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffererAsBuyerTrade extends Trade implements Serializable { +public class BuyerAsOffererTrade extends Trade implements Serializable { // That object is saved to disc. We need to take care of changes to not break deserialization. private static final long serialVersionUID = 1L; - transient private static final Logger log = LoggerFactory.getLogger(OffererAsBuyerTrade.class); - - - /////////////////////////////////////////////////////////////////////////////////////////// - // Enum - /////////////////////////////////////////////////////////////////////////////////////////// + transient private static final Logger log = LoggerFactory.getLogger(BuyerAsOffererTrade.class); /////////////////////////////////////////////////////////////////////////////////////////// // Constructor, initialization /////////////////////////////////////////////////////////////////////////////////////////// - public OffererAsBuyerTrade(Offer offer, Storage storage) { + public BuyerAsOffererTrade(Offer offer, Storage storage) { super(offer, storage); log.trace("Created by constructor"); } @@ -59,7 +56,7 @@ public class OffererAsBuyerTrade extends Trade implements Serializable { @Override protected void createProtocol() { - protocol = new BuyerAsOffererProtocol(this); + tradeProtocol = new BuyerAsOffererProtocol(this); } @Override @@ -75,8 +72,8 @@ public class OffererAsBuyerTrade extends Trade implements Serializable { /////////////////////////////////////////////////////////////////////////////////////////// public void onFiatPaymentStarted() { - assert protocol instanceof BuyerAsOffererProtocol; - ((BuyerAsOffererProtocol) protocol).onFiatPaymentStarted(); + assert tradeProtocol instanceof BuyerAsOffererProtocol; + ((BuyerAsOffererProtocol) tradeProtocol).onFiatPaymentStarted(); } @@ -85,7 +82,7 @@ public class OffererAsBuyerTrade extends Trade implements Serializable { /////////////////////////////////////////////////////////////////////////////////////////// @Override - public void setProcessState(Trade.ProcessState processState) { + public void setProcessState(TradeState.ProcessState processState) { super.setProcessState(processState); switch ((OffererState.ProcessState) processState) { @@ -97,7 +94,7 @@ public class OffererAsBuyerTrade extends Trade implements Serializable { } @Override - public void setLifeCycleState(Trade.LifeCycleState lifeCycleState) { + public void setLifeCycleState(TradeState.LifeCycleState lifeCycleState) { super.setLifeCycleState(lifeCycleState); switch ((OffererState.LifeCycleState) lifeCycleState) { diff --git a/core/src/main/java/io/bitsquare/trade/TakerAsBuyerTrade.java b/core/src/main/java/io/bitsquare/trade/BuyerAsTakerTrade.java similarity index 84% rename from core/src/main/java/io/bitsquare/trade/TakerAsBuyerTrade.java rename to core/src/main/java/io/bitsquare/trade/BuyerAsTakerTrade.java index a3e6158b49..482e2c05bc 100644 --- a/core/src/main/java/io/bitsquare/trade/TakerAsBuyerTrade.java +++ b/core/src/main/java/io/bitsquare/trade/BuyerAsTakerTrade.java @@ -21,6 +21,8 @@ import io.bitsquare.offer.Offer; import io.bitsquare.p2p.Peer; import io.bitsquare.storage.Storage; import io.bitsquare.trade.protocol.trade.buyer.taker.BuyerAsTakerProtocol; +import io.bitsquare.trade.states.TakerState; +import io.bitsquare.trade.states.TradeState; import org.bitcoinj.core.Coin; @@ -30,18 +32,18 @@ import java.io.Serializable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerAsBuyerTrade extends Trade implements Serializable { +public class BuyerAsTakerTrade extends Trade implements Serializable { // That object is saved to disc. We need to take care of changes to not break deserialization. private static final long serialVersionUID = 1L; - transient private static final Logger log = LoggerFactory.getLogger(TakerAsBuyerTrade.class); + transient private static final Logger log = LoggerFactory.getLogger(BuyerAsTakerTrade.class); /////////////////////////////////////////////////////////////////////////////////////////// // Constructor, initialization /////////////////////////////////////////////////////////////////////////////////////////// - public TakerAsBuyerTrade(Offer offer, Coin tradeAmount, Peer tradingPeer, + public BuyerAsTakerTrade(Offer offer, Coin tradeAmount, Peer tradingPeer, Storage storage) { super(offer, tradeAmount, tradingPeer, storage); log.trace("Created by constructor"); @@ -64,7 +66,7 @@ public class TakerAsBuyerTrade extends Trade implements Serializable { @Override public void createProtocol() { - protocol = new BuyerAsTakerProtocol(this); + tradeProtocol = new BuyerAsTakerProtocol(this); } @@ -74,13 +76,13 @@ public class TakerAsBuyerTrade extends Trade implements Serializable { @Override public void takeAvailableOffer() { - assert protocol instanceof BuyerAsTakerProtocol; - ((BuyerAsTakerProtocol) protocol).takeAvailableOffer(); + assert tradeProtocol instanceof BuyerAsTakerProtocol; + ((BuyerAsTakerProtocol) tradeProtocol).takeAvailableOffer(); } public void onFiatPaymentStarted() { - assert protocol instanceof BuyerAsTakerProtocol; - ((BuyerAsTakerProtocol) protocol).onFiatPaymentStarted(); + assert tradeProtocol instanceof BuyerAsTakerProtocol; + ((BuyerAsTakerProtocol) tradeProtocol).onFiatPaymentStarted(); } @@ -89,7 +91,7 @@ public class TakerAsBuyerTrade extends Trade implements Serializable { /////////////////////////////////////////////////////////////////////////////////////////// @Override - public void setProcessState(Trade.ProcessState processState) { + public void setProcessState(TradeState.ProcessState processState) { super.setProcessState(processState); switch ((TakerState.ProcessState) processState) { @@ -101,7 +103,7 @@ public class TakerAsBuyerTrade extends Trade implements Serializable { } @Override - public void setLifeCycleState(Trade.LifeCycleState lifeCycleState) { + public void setLifeCycleState(TradeState.LifeCycleState lifeCycleState) { super.setLifeCycleState(lifeCycleState); switch ((TakerState.LifeCycleState) lifeCycleState) { diff --git a/core/src/main/java/io/bitsquare/trade/OffererAsSellerTrade.java b/core/src/main/java/io/bitsquare/trade/SellerAsOffererTrade.java similarity index 86% rename from core/src/main/java/io/bitsquare/trade/OffererAsSellerTrade.java rename to core/src/main/java/io/bitsquare/trade/SellerAsOffererTrade.java index d9d324c69b..5a997010e4 100644 --- a/core/src/main/java/io/bitsquare/trade/OffererAsSellerTrade.java +++ b/core/src/main/java/io/bitsquare/trade/SellerAsOffererTrade.java @@ -20,6 +20,8 @@ package io.bitsquare.trade; import io.bitsquare.offer.Offer; import io.bitsquare.storage.Storage; import io.bitsquare.trade.protocol.trade.seller.offerer.SellerAsOffererProtocol; +import io.bitsquare.trade.states.OffererState; +import io.bitsquare.trade.states.TradeState; import java.io.IOException; import java.io.ObjectInputStream; @@ -28,18 +30,18 @@ import java.io.Serializable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffererAsSellerTrade extends Trade implements Serializable { +public class SellerAsOffererTrade extends Trade implements Serializable { // That object is saved to disc. We need to take care of changes to not break deserialization. private static final long serialVersionUID = 1L; - transient private static final Logger log = LoggerFactory.getLogger(OffererAsSellerTrade.class); + transient private static final Logger log = LoggerFactory.getLogger(SellerAsOffererTrade.class); /////////////////////////////////////////////////////////////////////////////////////////// // Constructor, initialization /////////////////////////////////////////////////////////////////////////////////////////// - public OffererAsSellerTrade(Offer offer, Storage storage) { + public SellerAsOffererTrade(Offer offer, Storage storage) { super(offer, storage); log.trace("Created by constructor"); } @@ -54,7 +56,7 @@ public class OffererAsSellerTrade extends Trade implements Serializable { @Override protected void createProtocol() { - protocol = new SellerAsOffererProtocol(this); + tradeProtocol = new SellerAsOffererProtocol(this); } @Override @@ -70,8 +72,8 @@ public class OffererAsSellerTrade extends Trade implements Serializable { /////////////////////////////////////////////////////////////////////////////////////////// public void onFiatPaymentReceived() { - assert protocol instanceof SellerAsOffererProtocol; - ((SellerAsOffererProtocol) protocol).onFiatPaymentReceived(); + assert tradeProtocol instanceof SellerAsOffererProtocol; + ((SellerAsOffererProtocol) tradeProtocol).onFiatPaymentReceived(); } @@ -80,7 +82,7 @@ public class OffererAsSellerTrade extends Trade implements Serializable { /////////////////////////////////////////////////////////////////////////////////////////// @Override - public void setProcessState(Trade.ProcessState processState) { + public void setProcessState(TradeState.ProcessState processState) { super.setProcessState(processState); switch ((OffererState.ProcessState) processState) { @@ -92,7 +94,7 @@ public class OffererAsSellerTrade extends Trade implements Serializable { } @Override - public void setLifeCycleState(Trade.LifeCycleState lifeCycleState) { + public void setLifeCycleState(TradeState.LifeCycleState lifeCycleState) { super.setLifeCycleState(lifeCycleState); switch ((OffererState.LifeCycleState) lifeCycleState) { diff --git a/core/src/main/java/io/bitsquare/trade/TakerAsSellerTrade.java b/core/src/main/java/io/bitsquare/trade/SellerAsTakerTrade.java similarity index 85% rename from core/src/main/java/io/bitsquare/trade/TakerAsSellerTrade.java rename to core/src/main/java/io/bitsquare/trade/SellerAsTakerTrade.java index 0caed82aec..69f272d545 100644 --- a/core/src/main/java/io/bitsquare/trade/TakerAsSellerTrade.java +++ b/core/src/main/java/io/bitsquare/trade/SellerAsTakerTrade.java @@ -21,6 +21,8 @@ import io.bitsquare.offer.Offer; import io.bitsquare.p2p.Peer; import io.bitsquare.storage.Storage; import io.bitsquare.trade.protocol.trade.seller.taker.SellerAsTakerProtocol; +import io.bitsquare.trade.states.TakerState; +import io.bitsquare.trade.states.TradeState; import org.bitcoinj.core.Coin; @@ -30,7 +32,7 @@ import java.io.Serializable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerAsSellerTrade extends Trade implements Serializable { +public class SellerAsTakerTrade extends Trade implements Serializable { // That object is saved to disc. We need to take care of changes to not break deserialization. private static final long serialVersionUID = 1L; @@ -41,7 +43,7 @@ public class TakerAsSellerTrade extends Trade implements Serializable { // Constructor, initialization /////////////////////////////////////////////////////////////////////////////////////////// - public TakerAsSellerTrade(Offer offer, Coin tradeAmount, Peer tradingPeer, + public SellerAsTakerTrade(Offer offer, Coin tradeAmount, Peer tradingPeer, Storage storage) { super(offer, tradeAmount, tradingPeer, storage); log.trace("Created by constructor"); @@ -64,7 +66,7 @@ public class TakerAsSellerTrade extends Trade implements Serializable { @Override public void createProtocol() { - protocol = new SellerAsTakerProtocol(this); + tradeProtocol = new SellerAsTakerProtocol(this); } @@ -74,13 +76,13 @@ public class TakerAsSellerTrade extends Trade implements Serializable { @Override public void takeAvailableOffer() { - assert protocol instanceof SellerAsTakerProtocol; - ((SellerAsTakerProtocol) protocol).takeAvailableOffer(); + assert tradeProtocol instanceof SellerAsTakerProtocol; + ((SellerAsTakerProtocol) tradeProtocol).takeAvailableOffer(); } public void onFiatPaymentReceived() { - assert protocol instanceof SellerAsTakerProtocol; - ((SellerAsTakerProtocol) protocol).onFiatPaymentReceived(); + assert tradeProtocol instanceof SellerAsTakerProtocol; + ((SellerAsTakerProtocol) tradeProtocol).onFiatPaymentReceived(); } @@ -89,7 +91,7 @@ public class TakerAsSellerTrade extends Trade implements Serializable { /////////////////////////////////////////////////////////////////////////////////////////// @Override - public void setProcessState(Trade.ProcessState processState) { + public void setProcessState(TradeState.ProcessState processState) { TakerState.ProcessState state = (TakerState.ProcessState) processState; this.processState = processState; processStateProperty.set(processState); @@ -103,7 +105,7 @@ public class TakerAsSellerTrade extends Trade implements Serializable { } @Override - public void setLifeCycleState(Trade.LifeCycleState lifeCycleState) { + public void setLifeCycleState(TradeState.LifeCycleState lifeCycleState) { TakerState.LifeCycleState state = (TakerState.LifeCycleState) lifeCycleState; switch (state) { case FAILED: diff --git a/core/src/main/java/io/bitsquare/trade/Trade.java b/core/src/main/java/io/bitsquare/trade/Trade.java index 5562891e52..9ccdedcf91 100644 --- a/core/src/main/java/io/bitsquare/trade/Trade.java +++ b/core/src/main/java/io/bitsquare/trade/Trade.java @@ -28,8 +28,9 @@ import io.bitsquare.p2p.MailboxMessage; import io.bitsquare.p2p.MessageService; import io.bitsquare.p2p.Peer; import io.bitsquare.storage.Storage; -import io.bitsquare.trade.protocol.Protocol; +import io.bitsquare.trade.protocol.trade.TradeProtocol; import io.bitsquare.trade.protocol.trade.shared.models.ProcessModel; +import io.bitsquare.trade.states.TradeState; import io.bitsquare.user.User; import org.bitcoinj.core.Coin; @@ -68,6 +69,7 @@ abstract public class Trade extends Model implements Serializable { private static final long serialVersionUID = 1L; private transient static final Logger log = LoggerFactory.getLogger(Trade.class); + // Mutable protected Coin tradeAmount; protected Peer tradingPeer; @@ -75,27 +77,15 @@ abstract public class Trade extends Model implements Serializable { transient protected ObjectProperty tradeVolumeProperty; - /////////////////////////////////////////////////////////////////////////////////////////// - // Interfaces - /////////////////////////////////////////////////////////////////////////////////////////// - - public interface LifeCycleState { - } - - public interface ProcessState { - } - - /////////////////////////////////////////////////////////////////////////////////////////// // Fields /////////////////////////////////////////////////////////////////////////////////////////// // Transient/Immutable - transient protected ObjectProperty processStateProperty; - transient protected ObjectProperty lifeCycleStateProperty; - + transient protected ObjectProperty processStateProperty; + transient protected ObjectProperty lifeCycleStateProperty; transient private Storage storage; - transient protected Protocol protocol; + transient protected TradeProtocol tradeProtocol; // Immutable protected final Offer offer; @@ -103,8 +93,8 @@ abstract public class Trade extends Model implements Serializable { protected final ProcessModel processModel; // Mutable - protected ProcessState processState; - protected LifeCycleState lifeCycleState; + protected TradeState.ProcessState processState; + protected TradeState.LifeCycleState lifeCycleState; private MailboxMessage mailboxMessage; protected Transaction depositTx; private Contract contract; @@ -173,7 +163,7 @@ abstract public class Trade extends Model implements Serializable { createProtocol(); if (mailboxMessage != null) - protocol.setMailboxMessage(mailboxMessage); + tradeProtocol.setMailboxMessage(mailboxMessage); } protected void initStateProperties() { @@ -195,16 +185,16 @@ abstract public class Trade extends Model implements Serializable { } public void disposeProtocol() { - if (protocol != null) { - protocol.cleanup(); - protocol = null; + if (tradeProtocol != null) { + tradeProtocol.cleanup(); + tradeProtocol = null; } } public void setMailboxMessage(MailboxMessage mailboxMessage) { this.mailboxMessage = mailboxMessage; - if (protocol != null) - protocol.setMailboxMessage(mailboxMessage); + if (tradeProtocol != null) + tradeProtocol.setMailboxMessage(mailboxMessage); storage.queueUpForSave(); } @@ -213,13 +203,13 @@ abstract public class Trade extends Model implements Serializable { this.storage = storage; } - public void setProcessState(Trade.ProcessState processState) { + public void setProcessState(TradeState.ProcessState processState) { this.processState = processState; processStateProperty.set(processState); storage.queueUpForSave(); } - public void setLifeCycleState(Trade.LifeCycleState lifeCycleState) { + public void setLifeCycleState(TradeState.LifeCycleState lifeCycleState) { this.lifeCycleState = lifeCycleState; lifeCycleStateProperty.set(lifeCycleState); storage.queueUpForSave(); @@ -351,11 +341,11 @@ abstract public class Trade extends Model implements Serializable { return null; } - public ReadOnlyObjectProperty processStateProperty() { + public ReadOnlyObjectProperty processStateProperty() { return processStateProperty; } - public ReadOnlyObjectProperty lifeCycleStateProperty() { + public ReadOnlyObjectProperty lifeCycleStateProperty() { return lifeCycleStateProperty; } @@ -430,7 +420,7 @@ abstract public class Trade extends Model implements Serializable { @Override public String toString() { - return ", protocol=" + protocol + + return ", protocol=" + tradeProtocol + ", offer=" + offer + ", date=" + date + ", processModel=" + processModel + diff --git a/core/src/main/java/io/bitsquare/trade/TradeManager.java b/core/src/main/java/io/bitsquare/trade/TradeManager.java index 0290e864f7..0189aac617 100644 --- a/core/src/main/java/io/bitsquare/trade/TradeManager.java +++ b/core/src/main/java/io/bitsquare/trade/TradeManager.java @@ -43,6 +43,8 @@ import io.bitsquare.trade.protocol.availability.CheckOfferAvailabilityProtocol; import io.bitsquare.trade.protocol.placeoffer.PlaceOfferModel; import io.bitsquare.trade.protocol.placeoffer.PlaceOfferProtocol; import io.bitsquare.trade.protocol.trade.messages.TradeMessage; +import io.bitsquare.trade.states.OffererState; +import io.bitsquare.trade.states.TakerState; import io.bitsquare.user.AccountSettings; import io.bitsquare.user.User; @@ -168,9 +170,9 @@ public class TradeManager { // continue the trade, but that might fail. boolean failed = false; - if (trade instanceof TakerAsSellerTrade) + if (trade instanceof SellerAsTakerTrade) failed = trade.lifeCycleState == TakerState.LifeCycleState.FAILED; - else if (trade instanceof TakerAsBuyerTrade) + else if (trade instanceof BuyerAsTakerTrade) failed = trade.lifeCycleState == TakerState.LifeCycleState.FAILED; if (failed) { @@ -278,9 +280,9 @@ public class TradeManager { private void handlePlaceOfferResult(Transaction transaction, Offer offer, TransactionResultHandler resultHandler) { Trade trade; if (offer.getDirection() == Offer.Direction.BUY) - trade = new OffererAsBuyerTrade(offer, openOfferTradesStorage); + trade = new BuyerAsOffererTrade(offer, openOfferTradesStorage); else - trade = new OffererAsSellerTrade(offer, openOfferTradesStorage); + trade = new SellerAsOffererTrade(offer, openOfferTradesStorage); openOfferTrades.add(trade); initTrade(trade); @@ -319,9 +321,9 @@ public class TradeManager { openOfferTrades.remove(trade); if (isCancelRequest) { - if (trade instanceof OffererAsBuyerTrade) + if (trade instanceof BuyerAsOffererTrade) trade.setLifeCycleState(OffererState.LifeCycleState.OFFER_CANCELED); - else if (trade instanceof OffererAsSellerTrade) + else if (trade instanceof SellerAsOffererTrade) trade.setLifeCycleState(OffererState.LifeCycleState.OFFER_CANCELED); closedTrades.add(trade); trade.disposeProtocol(); @@ -379,9 +381,9 @@ public class TradeManager { if (offer.getState() == Offer.State.AVAILABLE) { Trade trade; if (offer.getDirection() == Offer.Direction.BUY) - trade = new TakerAsSellerTrade(offer, amount, model.getPeer(), pendingTradesStorage); + trade = new SellerAsTakerTrade(offer, amount, model.getPeer(), pendingTradesStorage); else - trade = new TakerAsBuyerTrade(offer, amount, model.getPeer(), pendingTradesStorage); + trade = new BuyerAsTakerTrade(offer, amount, model.getPeer(), pendingTradesStorage); initTrade(trade); pendingTrades.add(trade); @@ -402,7 +404,7 @@ public class TradeManager { // TODO handle overpaid securityDeposit Coin amountToWithdraw = trade.getSecurityDeposit(); assert trade.getTradeAmount() != null; - if (trade instanceof OffererAsBuyerTrade || trade instanceof TakerAsBuyerTrade) + if (trade instanceof BuyerAsOffererTrade || trade instanceof BuyerAsTakerTrade) amountToWithdraw = amountToWithdraw.add(trade.getTradeAmount()); FutureCallback callback = new FutureCallback() { @@ -410,13 +412,13 @@ public class TradeManager { public void onSuccess(@javax.annotation.Nullable Transaction transaction) { if (transaction != null) { log.info("onWithdraw onSuccess tx ID:" + transaction.getHashAsString()); - if (trade instanceof OffererAsBuyerTrade) + if (trade instanceof BuyerAsOffererTrade) trade.setLifeCycleState(OffererState.LifeCycleState.COMPLETED); - else if (trade instanceof TakerAsSellerTrade) + else if (trade instanceof SellerAsTakerTrade) trade.setLifeCycleState(TakerState.LifeCycleState.COMPLETED); - else if (trade instanceof OffererAsSellerTrade) + else if (trade instanceof SellerAsOffererTrade) trade.setLifeCycleState(OffererState.LifeCycleState.COMPLETED); - else if (trade instanceof TakerAsBuyerTrade) + else if (trade instanceof BuyerAsTakerTrade) trade.setLifeCycleState(TakerState.LifeCycleState.COMPLETED); pendingTrades.remove(trade); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/Protocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java similarity index 91% rename from core/src/main/java/io/bitsquare/trade/protocol/Protocol.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java index 4f083b56a5..fa86d95140 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/Protocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java @@ -15,11 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol; +package io.bitsquare.trade.protocol.trade; import io.bitsquare.p2p.MailboxMessage; -public interface Protocol { +public interface TradeProtocol { void cleanup(); void setMailboxMessage(MailboxMessage mailboxMessage); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerTradeTask.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeTask.java similarity index 82% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerTradeTask.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/TradeTask.java index 885e199e92..df4e9daf10 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerTradeTask.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeTask.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +package io.bitsquare.trade.protocol.trade; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; @@ -25,12 +25,12 @@ import io.bitsquare.trade.protocol.trade.shared.models.ProcessModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerTradeTask extends Task { - private static final Logger log = LoggerFactory.getLogger(TakerTradeTask.class); +public class TradeTask extends Task { + private static final Logger log = LoggerFactory.getLogger(TradeTask.class); protected final ProcessModel processModel; protected final Trade trade; - public TakerTradeTask(TaskRunner taskHandler, Trade trade) { + public TradeTask(TaskRunner taskHandler, Trade trade) { super(taskHandler, trade); this.trade = trade; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/BuyerAsOffererProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/BuyerAsOffererProtocol.java index 35feee1e0a..66ced29168 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/BuyerAsOffererProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/BuyerAsOffererProtocol.java @@ -23,11 +23,10 @@ import io.bitsquare.p2p.Message; import io.bitsquare.p2p.MessageHandler; import io.bitsquare.p2p.Peer; import io.bitsquare.p2p.listener.SendMessageListener; -import io.bitsquare.trade.OffererAsBuyerTrade; -import io.bitsquare.trade.OffererState; -import io.bitsquare.trade.protocol.Protocol; +import io.bitsquare.trade.BuyerAsOffererTrade; import io.bitsquare.trade.protocol.availability.messages.ReportOfferAvailabilityMessage; import io.bitsquare.trade.protocol.availability.messages.RequestIsOfferAvailableMessage; +import io.bitsquare.trade.protocol.trade.TradeProtocol; import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererCommitsPayoutTx; import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererCreatesAndSignPayoutTx; import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererCreatesDepositTxInputs; @@ -46,27 +45,28 @@ import io.bitsquare.trade.protocol.trade.messages.TradeMessage; import io.bitsquare.trade.protocol.trade.shared.models.ProcessModel; import io.bitsquare.trade.protocol.trade.shared.offerer.tasks.VerifyTakeOfferFeePayment; import io.bitsquare.trade.protocol.trade.shared.offerer.tasks.VerifyTakerAccount; +import io.bitsquare.trade.states.OffererState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static io.bitsquare.util.Validator.*; -public class BuyerAsOffererProtocol implements Protocol { +public class BuyerAsOffererProtocol implements TradeProtocol { private static final Logger log = LoggerFactory.getLogger(BuyerAsOffererProtocol.class); private MessageHandler messageHandler; - private final OffererAsBuyerTrade offererAsBuyerTrade; + private final BuyerAsOffererTrade buyerAsOffererTrade; private final ProcessModel processModel; /////////////////////////////////////////////////////////////////////////////////////////// // Constructor /////////////////////////////////////////////////////////////////////////////////////////// - public BuyerAsOffererProtocol(OffererAsBuyerTrade model) { + public BuyerAsOffererProtocol(BuyerAsOffererTrade model) { log.debug("New OffererProtocol " + this); - this.offererAsBuyerTrade = model; - processModel = offererAsBuyerTrade.getProcessModel(); + this.buyerAsOffererTrade = model; + processModel = buyerAsOffererTrade.getProcessModel(); messageHandler = this::handleMessage; processModel.getMessageService().addMessageHandler(messageHandler); @@ -110,7 +110,7 @@ public class BuyerAsOffererProtocol implements Protocol { // to take the // offer // at the same time - boolean isOfferOpen = offererAsBuyerTrade.lifeCycleStateProperty().get() == OffererState.LifeCycleState.OFFER_OPEN; + boolean isOfferOpen = buyerAsOffererTrade.lifeCycleStateProperty().get() == OffererState.LifeCycleState.OFFER_OPEN; ReportOfferAvailabilityMessage reportOfferAvailabilityMessage = new ReportOfferAvailabilityMessage(processModel.getId(), isOfferOpen); processModel.getMessageService().sendMessage(sender, reportOfferAvailabilityMessage, new SendMessageListener() { @Override @@ -135,11 +135,11 @@ public class BuyerAsOffererProtocol implements Protocol { private void handleRequestDepositTxInputsMessage(RequestDepositTxInputsMessage tradeMessage, Peer taker) { checkTradeId(processModel.getId(), tradeMessage); processModel.setTradeMessage(tradeMessage); - offererAsBuyerTrade.setTradingPeer(taker); + buyerAsOffererTrade.setTradingPeer(taker); - offererAsBuyerTrade.setLifeCycleState(OffererState.LifeCycleState.OFFER_RESERVED); + buyerAsOffererTrade.setLifeCycleState(OffererState.LifeCycleState.OFFER_RESERVED); - TaskRunner taskRunner = new TaskRunner<>(offererAsBuyerTrade, + TaskRunner taskRunner = new TaskRunner<>(buyerAsOffererTrade, () -> log.debug("taskRunner at handleRequestDepositTxInputsMessage completed"), this::handleTaskRunnerFault); taskRunner.addTasks( @@ -153,7 +153,7 @@ public class BuyerAsOffererProtocol implements Protocol { private void handleRequestPublishDepositTxMessage(RequestPublishDepositTxMessage tradeMessage) { processModel.setTradeMessage(tradeMessage); - TaskRunner taskRunner = new TaskRunner<>(offererAsBuyerTrade, + TaskRunner taskRunner = new TaskRunner<>(buyerAsOffererTrade, () -> log.debug("taskRunner at handleRequestPublishDepositTxMessage completed"), this::handleTaskRunnerFault); taskRunner.addTasks( @@ -173,7 +173,7 @@ public class BuyerAsOffererProtocol implements Protocol { // User clicked the "bank transfer started" button public void onFiatPaymentStarted() { - TaskRunner taskRunner = new TaskRunner<>(offererAsBuyerTrade, + TaskRunner taskRunner = new TaskRunner<>(buyerAsOffererTrade, () -> log.debug("taskRunner at handleBankTransferStartedUIEvent completed"), this::handleTaskRunnerFault); taskRunner.addTasks( @@ -192,7 +192,7 @@ public class BuyerAsOffererProtocol implements Protocol { private void handlePayoutTxPublishedMessage(PayoutTxPublishedMessage tradeMessage) { processModel.setTradeMessage(tradeMessage); - TaskRunner taskRunner = new TaskRunner<>(offererAsBuyerTrade, + TaskRunner taskRunner = new TaskRunner<>(buyerAsOffererTrade, () -> { log.debug("taskRunner at handlePayoutTxPublishedMessage completed"); // we are done! @@ -216,7 +216,7 @@ public class BuyerAsOffererProtocol implements Protocol { TradeMessage tradeMessage = (TradeMessage) message; nonEmptyStringOf(tradeMessage.tradeId); - if (tradeMessage.tradeId.equals(offererAsBuyerTrade.getId())) { + if (tradeMessage.tradeId.equals(buyerAsOffererTrade.getId())) { if (tradeMessage instanceof RequestIsOfferAvailableMessage) { handleRequestIsOfferAvailableMessage((RequestIsOfferAvailableMessage) tradeMessage, sender); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererCommitsPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererCommitsPayoutTx.java index 8104c91888..0a6b45d222 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererCommitsPayoutTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererCommitsPayoutTx.java @@ -19,14 +19,14 @@ package io.bitsquare.trade.protocol.trade.buyer.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; import org.bitcoinj.core.Transaction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffererCommitsPayoutTx extends OffererTradeTask { +public class OffererCommitsPayoutTx extends TradeTask { private static final Logger log = LoggerFactory.getLogger(OffererCommitsPayoutTx.class); public OffererCommitsPayoutTx(TaskRunner taskHandler, Trade trade) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererCreatesAndSignPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererCreatesAndSignPayoutTx.java index 90209adbf3..ca8a3c9acd 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererCreatesAndSignPayoutTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererCreatesAndSignPayoutTx.java @@ -19,14 +19,14 @@ package io.bitsquare.trade.protocol.trade.buyer.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; import org.bitcoinj.core.Coin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffererCreatesAndSignPayoutTx extends OffererTradeTask { +public class OffererCreatesAndSignPayoutTx extends TradeTask { private static final Logger log = LoggerFactory.getLogger(OffererCreatesAndSignPayoutTx.class); public OffererCreatesAndSignPayoutTx(TaskRunner taskHandler, Trade trade) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererCreatesDepositTxInputs.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererCreatesDepositTxInputs.java index cfe2233742..fcf240ee03 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererCreatesDepositTxInputs.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererCreatesDepositTxInputs.java @@ -20,18 +20,18 @@ package io.bitsquare.trade.protocol.trade.buyer.offerer.tasks; import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.TradeWalletService; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.OffererAsBuyerTrade; -import io.bitsquare.trade.OffererAsSellerTrade; -import io.bitsquare.trade.OffererState; +import io.bitsquare.trade.BuyerAsOffererTrade; +import io.bitsquare.trade.SellerAsOffererTrade; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; +import io.bitsquare.trade.states.OffererState; import org.bitcoinj.core.Coin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffererCreatesDepositTxInputs extends OffererTradeTask { +public class OffererCreatesDepositTxInputs extends TradeTask { private static final Logger log = LoggerFactory.getLogger(OffererCreatesDepositTxInputs.class); public OffererCreatesDepositTxInputs(TaskRunner taskHandler, Trade trade) { @@ -54,10 +54,10 @@ public class OffererCreatesDepositTxInputs extends OffererTradeTask { t.printStackTrace(); trade.setThrowable(t); - if (trade instanceof OffererAsBuyerTrade) { + if (trade instanceof BuyerAsOffererTrade) { trade.setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); } - else if (trade instanceof OffererAsSellerTrade) { + else if (trade instanceof SellerAsOffererTrade) { trade.setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererProcessPayoutTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererProcessPayoutTxPublishedMessage.java index a7c9292a4d..f51cc5e73a 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererProcessPayoutTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererProcessPayoutTxPublishedMessage.java @@ -18,12 +18,12 @@ package io.bitsquare.trade.protocol.trade.buyer.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.OffererAsBuyerTrade; -import io.bitsquare.trade.OffererAsSellerTrade; -import io.bitsquare.trade.OffererState; +import io.bitsquare.trade.BuyerAsOffererTrade; +import io.bitsquare.trade.SellerAsOffererTrade; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; +import io.bitsquare.trade.states.OffererState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; import static com.google.common.base.Preconditions.checkNotNull; import static io.bitsquare.util.Validator.checkTradeId; -public class OffererProcessPayoutTxPublishedMessage extends OffererTradeTask { +public class OffererProcessPayoutTxPublishedMessage extends TradeTask { private static final Logger log = LoggerFactory.getLogger(OffererProcessPayoutTxPublishedMessage.class); public OffererProcessPayoutTxPublishedMessage(TaskRunner taskHandler, Trade trade) { @@ -47,9 +47,9 @@ public class OffererProcessPayoutTxPublishedMessage extends OffererTradeTask { trade.setPayoutTx(checkNotNull(message.payoutTx)); - if (trade instanceof OffererAsBuyerTrade) + if (trade instanceof BuyerAsOffererTrade) trade.setProcessState(OffererState.ProcessState.PAYOUT_PUBLISHED); - else if (trade instanceof OffererAsSellerTrade) + else if (trade instanceof SellerAsOffererTrade) trade.setProcessState(OffererState.ProcessState.PAYOUT_PUBLISHED); complete(); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererProcessRequestDepositTxInputsMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererProcessRequestDepositTxInputsMessage.java index 211a4d8bea..648be2a938 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererProcessRequestDepositTxInputsMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererProcessRequestDepositTxInputsMessage.java @@ -18,12 +18,12 @@ package io.bitsquare.trade.protocol.trade.buyer.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.OffererAsBuyerTrade; -import io.bitsquare.trade.OffererAsSellerTrade; -import io.bitsquare.trade.OffererState; +import io.bitsquare.trade.BuyerAsOffererTrade; +import io.bitsquare.trade.SellerAsOffererTrade; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.RequestDepositTxInputsMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; +import io.bitsquare.trade.states.OffererState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; import static com.google.common.base.Preconditions.checkNotNull; import static io.bitsquare.util.Validator.*; -public class OffererProcessRequestDepositTxInputsMessage extends OffererTradeTask { +public class OffererProcessRequestDepositTxInputsMessage extends TradeTask { private static final Logger log = LoggerFactory.getLogger(OffererProcessRequestDepositTxInputsMessage.class); public OffererProcessRequestDepositTxInputsMessage(TaskRunner taskHandler, Trade trade) { @@ -54,9 +54,9 @@ public class OffererProcessRequestDepositTxInputsMessage extends OffererTradeTas t.printStackTrace(); trade.setThrowable(t); - if (trade instanceof OffererAsBuyerTrade) + if (trade instanceof BuyerAsOffererTrade) trade.setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); - else if (trade instanceof OffererAsSellerTrade) + else if (trade instanceof SellerAsOffererTrade) trade.setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); failed(t); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererProcessRequestPublishDepositTxMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererProcessRequestPublishDepositTxMessage.java index 1e7cd05118..9895d5eb80 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererProcessRequestPublishDepositTxMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererProcessRequestPublishDepositTxMessage.java @@ -18,12 +18,12 @@ package io.bitsquare.trade.protocol.trade.buyer.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.OffererAsBuyerTrade; -import io.bitsquare.trade.OffererAsSellerTrade; -import io.bitsquare.trade.OffererState; +import io.bitsquare.trade.BuyerAsOffererTrade; +import io.bitsquare.trade.SellerAsOffererTrade; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.RequestPublishDepositTxMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; +import io.bitsquare.trade.states.OffererState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; import static com.google.common.base.Preconditions.*; import static io.bitsquare.util.Validator.*; -public class OffererProcessRequestPublishDepositTxMessage extends OffererTradeTask { +public class OffererProcessRequestPublishDepositTxMessage extends TradeTask { private static final Logger log = LoggerFactory.getLogger(OffererProcessRequestPublishDepositTxMessage.class); public OffererProcessRequestPublishDepositTxMessage(TaskRunner taskHandler, Trade trade) { @@ -61,9 +61,9 @@ public class OffererProcessRequestPublishDepositTxMessage extends OffererTradeTa t.printStackTrace(); trade.setThrowable(t); - if (trade instanceof OffererAsBuyerTrade) + if (trade instanceof BuyerAsOffererTrade) trade.setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); - else if (trade instanceof OffererAsSellerTrade) + else if (trade instanceof SellerAsOffererTrade) trade.setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); failed(t); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSendsDepositTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSendsDepositTxPublishedMessage.java index f53db503e7..af4cea293c 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSendsDepositTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSendsDepositTxPublishedMessage.java @@ -19,17 +19,17 @@ package io.bitsquare.trade.protocol.trade.buyer.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; -import io.bitsquare.trade.OffererAsBuyerTrade; -import io.bitsquare.trade.OffererAsSellerTrade; -import io.bitsquare.trade.OffererState; +import io.bitsquare.trade.BuyerAsOffererTrade; +import io.bitsquare.trade.SellerAsOffererTrade; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; +import io.bitsquare.trade.states.OffererState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffererSendsDepositTxPublishedMessage extends OffererTradeTask { +public class OffererSendsDepositTxPublishedMessage extends TradeTask { private static final Logger log = LoggerFactory.getLogger(OffererSendsDepositTxPublishedMessage.class); public OffererSendsDepositTxPublishedMessage(TaskRunner taskHandler, Trade trade) { @@ -53,9 +53,9 @@ public class OffererSendsDepositTxPublishedMessage extends OffererTradeTask { appendToErrorMessage("Sending DepositTxPublishedMessage failed"); trade.setErrorMessage(errorMessage); - if (trade instanceof OffererAsBuyerTrade) + if (trade instanceof BuyerAsOffererTrade) trade.setProcessState(OffererState.ProcessState.MESSAGE_SENDING_FAILED); - else if (trade instanceof OffererAsSellerTrade) + else if (trade instanceof SellerAsOffererTrade) trade.setProcessState(OffererState.ProcessState.MESSAGE_SENDING_FAILED); failed(); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSendsFiatTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSendsFiatTransferStartedMessage.java index 4316e08e03..8531a4c81a 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSendsFiatTransferStartedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSendsFiatTransferStartedMessage.java @@ -19,17 +19,17 @@ package io.bitsquare.trade.protocol.trade.buyer.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; -import io.bitsquare.trade.OffererAsBuyerTrade; -import io.bitsquare.trade.OffererAsSellerTrade; -import io.bitsquare.trade.OffererState; +import io.bitsquare.trade.BuyerAsOffererTrade; +import io.bitsquare.trade.SellerAsOffererTrade; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; +import io.bitsquare.trade.states.OffererState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffererSendsFiatTransferStartedMessage extends OffererTradeTask { +public class OffererSendsFiatTransferStartedMessage extends TradeTask { private static final Logger log = LoggerFactory.getLogger(OffererSendsFiatTransferStartedMessage.class); public OffererSendsFiatTransferStartedMessage(TaskRunner taskHandler, Trade trade) { @@ -53,11 +53,11 @@ public class OffererSendsFiatTransferStartedMessage extends OffererTradeTask { public void handleResult() { log.trace("Sending FiatTransferStartedMessage succeeded."); - if (trade instanceof OffererAsBuyerTrade) { - ((OffererAsBuyerTrade) trade).setProcessState(OffererState.ProcessState.FIAT_PAYMENT_STARTED); + if (trade instanceof BuyerAsOffererTrade) { + ((BuyerAsOffererTrade) trade).setProcessState(OffererState.ProcessState.FIAT_PAYMENT_STARTED); } - else if (trade instanceof OffererAsSellerTrade) { - ((OffererAsSellerTrade) trade).setProcessState(OffererState.ProcessState.FIAT_PAYMENT_STARTED); + else if (trade instanceof SellerAsOffererTrade) { + ((SellerAsOffererTrade) trade).setProcessState(OffererState.ProcessState.FIAT_PAYMENT_STARTED); } complete(); @@ -68,11 +68,11 @@ public class OffererSendsFiatTransferStartedMessage extends OffererTradeTask { appendToErrorMessage("Sending FiatTransferStartedMessage failed"); trade.setErrorMessage(errorMessage); - if (trade instanceof OffererAsBuyerTrade) { - ((OffererAsBuyerTrade) trade).setProcessState(OffererState.ProcessState.MESSAGE_SENDING_FAILED); + if (trade instanceof BuyerAsOffererTrade) { + ((BuyerAsOffererTrade) trade).setProcessState(OffererState.ProcessState.MESSAGE_SENDING_FAILED); } - else if (trade instanceof OffererAsSellerTrade) { - ((OffererAsSellerTrade) trade).setProcessState(OffererState.ProcessState.MESSAGE_SENDING_FAILED); + else if (trade instanceof SellerAsOffererTrade) { + ((SellerAsOffererTrade) trade).setProcessState(OffererState.ProcessState.MESSAGE_SENDING_FAILED); } failed(); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSendsRequestSellerDepositPaymentMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSendsRequestSellerDepositPaymentMessage.java index 830daa0186..9dc0d0e634 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSendsRequestSellerDepositPaymentMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSendsRequestSellerDepositPaymentMessage.java @@ -19,17 +19,17 @@ package io.bitsquare.trade.protocol.trade.buyer.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; -import io.bitsquare.trade.OffererAsBuyerTrade; -import io.bitsquare.trade.OffererAsSellerTrade; -import io.bitsquare.trade.OffererState; +import io.bitsquare.trade.BuyerAsOffererTrade; +import io.bitsquare.trade.SellerAsOffererTrade; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.RequestPayDepositMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; +import io.bitsquare.trade.states.OffererState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffererSendsRequestSellerDepositPaymentMessage extends OffererTradeTask { +public class OffererSendsRequestSellerDepositPaymentMessage extends TradeTask { private static final Logger log = LoggerFactory.getLogger(OffererSendsRequestSellerDepositPaymentMessage.class); public OffererSendsRequestSellerDepositPaymentMessage(TaskRunner taskHandler, Trade trade) { @@ -60,13 +60,13 @@ public class OffererSendsRequestSellerDepositPaymentMessage extends OffererTrade public void handleFault() { appendToErrorMessage("Sending RequestTakerDepositPaymentMessage failed"); trade.setErrorMessage(errorMessage); - if (trade instanceof OffererAsBuyerTrade) { - ((OffererAsBuyerTrade) trade).setProcessState(OffererState.ProcessState.MESSAGE_SENDING_FAILED); - ((OffererAsBuyerTrade) trade).setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); + if (trade instanceof BuyerAsOffererTrade) { + ((BuyerAsOffererTrade) trade).setProcessState(OffererState.ProcessState.MESSAGE_SENDING_FAILED); + ((BuyerAsOffererTrade) trade).setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); } - else if (trade instanceof OffererAsSellerTrade) { - ((OffererAsSellerTrade) trade).setProcessState(OffererState.ProcessState.MESSAGE_SENDING_FAILED); - ((OffererAsSellerTrade) trade).setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); + else if (trade instanceof SellerAsOffererTrade) { + ((SellerAsOffererTrade) trade).setProcessState(OffererState.ProcessState.MESSAGE_SENDING_FAILED); + ((SellerAsOffererTrade) trade).setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); } failed(); @@ -76,13 +76,13 @@ public class OffererSendsRequestSellerDepositPaymentMessage extends OffererTrade t.printStackTrace(); trade.setThrowable(t); - if (trade instanceof OffererAsBuyerTrade) { - ((OffererAsBuyerTrade) trade).setProcessState(OffererState.ProcessState.MESSAGE_SENDING_FAILED); - ((OffererAsSellerTrade) trade).setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); + if (trade instanceof BuyerAsOffererTrade) { + ((BuyerAsOffererTrade) trade).setProcessState(OffererState.ProcessState.MESSAGE_SENDING_FAILED); + ((SellerAsOffererTrade) trade).setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); } - else if (trade instanceof OffererAsSellerTrade) { - ((OffererAsSellerTrade) trade).setProcessState(OffererState.ProcessState.MESSAGE_SENDING_FAILED); - ((OffererAsSellerTrade) trade).setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); + else if (trade instanceof SellerAsOffererTrade) { + ((SellerAsOffererTrade) trade).setProcessState(OffererState.ProcessState.MESSAGE_SENDING_FAILED); + ((SellerAsOffererTrade) trade).setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); } failed(t); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSignsAndPublishDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSignsAndPublishDepositTx.java index dcf8bdba37..768e240833 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSignsAndPublishDepositTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSignsAndPublishDepositTx.java @@ -19,11 +19,11 @@ package io.bitsquare.trade.protocol.trade.buyer.offerer.tasks; import io.bitsquare.btc.FeePolicy; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.OffererAsBuyerTrade; -import io.bitsquare.trade.OffererAsSellerTrade; -import io.bitsquare.trade.OffererState; +import io.bitsquare.trade.BuyerAsOffererTrade; +import io.bitsquare.trade.SellerAsOffererTrade; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; +import io.bitsquare.trade.states.OffererState; import org.bitcoinj.core.Coin; import org.bitcoinj.core.Transaction; @@ -35,7 +35,7 @@ import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffererSignsAndPublishDepositTx extends OffererTradeTask { +public class OffererSignsAndPublishDepositTx extends TradeTask { private static final Logger log = LoggerFactory.getLogger(OffererSignsAndPublishDepositTx.class); public OffererSignsAndPublishDepositTx(TaskRunner taskHandler, Trade trade) { @@ -63,11 +63,11 @@ public class OffererSignsAndPublishDepositTx extends OffererTradeTask { trade.setDepositTx(transaction); - if (trade instanceof OffererAsBuyerTrade) { + if (trade instanceof BuyerAsOffererTrade) { trade.setProcessState(OffererState.ProcessState.DEPOSIT_PUBLISHED); trade.setLifeCycleState(OffererState.LifeCycleState.PENDING); } - else if (trade instanceof OffererAsSellerTrade) { + else if (trade instanceof SellerAsOffererTrade) { trade.setProcessState(OffererState.ProcessState.DEPOSIT_PUBLISHED); trade.setLifeCycleState(OffererState.LifeCycleState.PENDING); } @@ -80,9 +80,9 @@ public class OffererSignsAndPublishDepositTx extends OffererTradeTask { t.printStackTrace(); trade.setThrowable(t); - if (trade instanceof OffererAsBuyerTrade) + if (trade instanceof BuyerAsOffererTrade) trade.setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); - else if (trade instanceof OffererAsSellerTrade) + else if (trade instanceof SellerAsOffererTrade) trade.setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); failed(t); @@ -92,9 +92,9 @@ public class OffererSignsAndPublishDepositTx extends OffererTradeTask { t.printStackTrace(); trade.setThrowable(t); - if (trade instanceof OffererAsBuyerTrade) + if (trade instanceof BuyerAsOffererTrade) trade.setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); - else if (trade instanceof OffererAsSellerTrade) + else if (trade instanceof SellerAsOffererTrade) trade.setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); failed(t); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererVerifiesAndSignsContract.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererVerifiesAndSignsContract.java index 5ba5491d0a..80f4679b1c 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererVerifiesAndSignsContract.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererVerifiesAndSignsContract.java @@ -18,18 +18,18 @@ package io.bitsquare.trade.protocol.trade.buyer.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; +import io.bitsquare.trade.BuyerAsOffererTrade; import io.bitsquare.trade.Contract; -import io.bitsquare.trade.OffererAsBuyerTrade; -import io.bitsquare.trade.OffererAsSellerTrade; -import io.bitsquare.trade.OffererState; +import io.bitsquare.trade.SellerAsOffererTrade; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; +import io.bitsquare.trade.states.OffererState; import io.bitsquare.util.Utilities; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffererVerifiesAndSignsContract extends OffererTradeTask { +public class OffererVerifiesAndSignsContract extends TradeTask { private static final Logger log = LoggerFactory.getLogger(OffererVerifiesAndSignsContract.class); public OffererVerifiesAndSignsContract(TaskRunner taskHandler, Trade trade) { @@ -63,9 +63,9 @@ public class OffererVerifiesAndSignsContract extends OffererTradeTask { t.printStackTrace(); trade.setThrowable(t); - if (trade instanceof OffererAsBuyerTrade) + if (trade instanceof BuyerAsOffererTrade) trade.setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); - else if (trade instanceof OffererAsSellerTrade) + else if (trade instanceof SellerAsOffererTrade) trade.setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); failed(t); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/BuyerAsTakerProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/BuyerAsTakerProtocol.java index 67cf538f12..71752df940 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/BuyerAsTakerProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/BuyerAsTakerProtocol.java @@ -22,8 +22,8 @@ import io.bitsquare.p2p.MailboxMessage; import io.bitsquare.p2p.Message; import io.bitsquare.p2p.MessageHandler; import io.bitsquare.p2p.Peer; -import io.bitsquare.trade.TakerAsBuyerTrade; -import io.bitsquare.trade.protocol.Protocol; +import io.bitsquare.trade.BuyerAsTakerTrade; +import io.bitsquare.trade.protocol.trade.TradeProtocol; import io.bitsquare.trade.protocol.trade.buyer.taker.tasks.TakerCommitsPayoutTx; import io.bitsquare.trade.protocol.trade.buyer.taker.tasks.TakerCreatesAndSignsPayoutTx; import io.bitsquare.trade.protocol.trade.buyer.taker.tasks.TakerCreatesDepositTxInputs; @@ -48,10 +48,10 @@ import org.slf4j.LoggerFactory; import static io.bitsquare.util.Validator.nonEmptyStringOf; -public class BuyerAsTakerProtocol implements Protocol { +public class BuyerAsTakerProtocol implements TradeProtocol { private static final Logger log = LoggerFactory.getLogger(BuyerAsTakerProtocol.class); - private final TakerAsBuyerTrade takerAsBuyerTrade; + private final BuyerAsTakerTrade buyerAsTakerTrade; private final ProcessModel processModel; private final MessageHandler messageHandler; @@ -60,9 +60,9 @@ public class BuyerAsTakerProtocol implements Protocol { // Constructor /////////////////////////////////////////////////////////////////////////////////////////// - public BuyerAsTakerProtocol(TakerAsBuyerTrade trade) { + public BuyerAsTakerProtocol(BuyerAsTakerTrade trade) { log.debug("New SellerAsTakerProtocol " + this); - this.takerAsBuyerTrade = trade; + this.buyerAsTakerTrade = trade; processModel = trade.getProcessModel(); messageHandler = this::handleMessage; @@ -94,7 +94,7 @@ public class BuyerAsTakerProtocol implements Protocol { } public void takeAvailableOffer() { - TaskRunner taskRunner = new TaskRunner<>(takerAsBuyerTrade, + TaskRunner taskRunner = new TaskRunner<>(buyerAsTakerTrade, () -> log.debug("taskRunner at takeAvailableOffer completed"), this::handleTaskRunnerFault); @@ -115,7 +115,7 @@ public class BuyerAsTakerProtocol implements Protocol { private void handle(RequestPublishDepositTxMessage tradeMessage) { processModel.setTradeMessage(tradeMessage); - TaskRunner taskRunner = new TaskRunner<>(takerAsBuyerTrade, + TaskRunner taskRunner = new TaskRunner<>(buyerAsTakerTrade, () -> log.debug("taskRunner at handleRequestPublishDepositTxMessage completed"), this::handleTaskRunnerFault); taskRunner.addTasks( @@ -135,7 +135,7 @@ public class BuyerAsTakerProtocol implements Protocol { // User clicked the "bank transfer started" button public void onFiatPaymentStarted() { - TaskRunner taskRunner = new TaskRunner<>(takerAsBuyerTrade, + TaskRunner taskRunner = new TaskRunner<>(buyerAsTakerTrade, () -> log.debug("taskRunner at onFiatPaymentStarted completed"), this::handleTaskRunnerFault); taskRunner.addTasks( @@ -154,7 +154,7 @@ public class BuyerAsTakerProtocol implements Protocol { private void handle(PayoutTxPublishedMessage tradeMessage) { processModel.setTradeMessage(tradeMessage); - TaskRunner taskRunner = new TaskRunner<>(takerAsBuyerTrade, + TaskRunner taskRunner = new TaskRunner<>(buyerAsTakerTrade, () -> { log.debug("taskRunner at handlePayoutTxPublishedMessage completed"); // we are done! diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerCommitsPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerCommitsPayoutTx.java index a833e5ad13..03bd398ddc 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerCommitsPayoutTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerCommitsPayoutTx.java @@ -19,14 +19,14 @@ package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; import org.bitcoinj.core.Transaction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerCommitsPayoutTx extends TakerTradeTask { +public class TakerCommitsPayoutTx extends TradeTask { private static final Logger log = LoggerFactory.getLogger(TakerCommitsPayoutTx.class); public TakerCommitsPayoutTx(TaskRunner taskHandler, Trade trade) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerCreatesAndSignsPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerCreatesAndSignsPayoutTx.java index c189de727d..e9e59a8325 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerCreatesAndSignsPayoutTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerCreatesAndSignsPayoutTx.java @@ -19,14 +19,14 @@ package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; import org.bitcoinj.core.Coin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerCreatesAndSignsPayoutTx extends TakerTradeTask { +public class TakerCreatesAndSignsPayoutTx extends TradeTask { private static final Logger log = LoggerFactory.getLogger(TakerCreatesAndSignsPayoutTx.class); public TakerCreatesAndSignsPayoutTx(TaskRunner taskHandler, Trade trade) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerCreatesDepositTxInputs.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerCreatesDepositTxInputs.java index fc7ede7080..56d88fd112 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerCreatesDepositTxInputs.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerCreatesDepositTxInputs.java @@ -21,14 +21,14 @@ import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.TradeWalletService; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; import org.bitcoinj.core.Coin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerCreatesDepositTxInputs extends TakerTradeTask { +public class TakerCreatesDepositTxInputs extends TradeTask { private static final Logger log = LoggerFactory.getLogger(TakerCreatesDepositTxInputs.class); public TakerCreatesDepositTxInputs(TaskRunner taskHandler, Trade trade) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerProcessPayoutTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerProcessPayoutTxPublishedMessage.java index f4becfc6a5..8f29d92e92 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerProcessPayoutTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerProcessPayoutTxPublishedMessage.java @@ -18,12 +18,12 @@ package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.TakerAsBuyerTrade; -import io.bitsquare.trade.TakerAsSellerTrade; -import io.bitsquare.trade.TakerState; +import io.bitsquare.trade.BuyerAsTakerTrade; +import io.bitsquare.trade.SellerAsTakerTrade; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; +import io.bitsquare.trade.states.TakerState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; import static com.google.common.base.Preconditions.checkNotNull; import static io.bitsquare.util.Validator.checkTradeId; -public class TakerProcessPayoutTxPublishedMessage extends TakerTradeTask { +public class TakerProcessPayoutTxPublishedMessage extends TradeTask { private static final Logger log = LoggerFactory.getLogger(TakerProcessPayoutTxPublishedMessage.class); public TakerProcessPayoutTxPublishedMessage(TaskRunner taskHandler, Trade trade) { @@ -47,9 +47,9 @@ public class TakerProcessPayoutTxPublishedMessage extends TakerTradeTask { trade.setPayoutTx(checkNotNull(message.payoutTx)); - if (trade instanceof TakerAsBuyerTrade) + if (trade instanceof BuyerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.PAYOUT_PUBLISHED); - else if (trade instanceof TakerAsSellerTrade) + else if (trade instanceof SellerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.PAYOUT_PUBLISHED); complete(); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerProcessRequestPublishDepositTxFromTakerMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerProcessRequestPublishDepositTxFromTakerMessage.java index 57fcc17068..ba2f6b20ae 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerProcessRequestPublishDepositTxFromTakerMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerProcessRequestPublishDepositTxFromTakerMessage.java @@ -19,8 +19,8 @@ package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.RequestPublishDepositTxFromTakerMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; import static com.google.common.base.Preconditions.*; import static io.bitsquare.util.Validator.*; -public class TakerProcessRequestPublishDepositTxFromTakerMessage extends TakerTradeTask { +public class TakerProcessRequestPublishDepositTxFromTakerMessage extends TradeTask { private static final Logger log = LoggerFactory.getLogger(TakerProcessRequestPublishDepositTxFromTakerMessage.class); public TakerProcessRequestPublishDepositTxFromTakerMessage(TaskRunner taskHandler, Trade trade) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsDepositTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsDepositTxPublishedMessage.java index 3447d4d515..31f9928b8a 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsDepositTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsDepositTxPublishedMessage.java @@ -19,17 +19,17 @@ package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; -import io.bitsquare.trade.TakerAsBuyerTrade; -import io.bitsquare.trade.TakerAsSellerTrade; -import io.bitsquare.trade.TakerState; +import io.bitsquare.trade.BuyerAsTakerTrade; +import io.bitsquare.trade.SellerAsTakerTrade; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; +import io.bitsquare.trade.states.TakerState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerSendsDepositTxPublishedMessage extends TakerTradeTask { +public class TakerSendsDepositTxPublishedMessage extends TradeTask { private static final Logger log = LoggerFactory.getLogger(TakerSendsDepositTxPublishedMessage.class); public TakerSendsDepositTxPublishedMessage(TaskRunner taskHandler, Trade trade) { @@ -53,9 +53,9 @@ public class TakerSendsDepositTxPublishedMessage extends TakerTradeTask { appendToErrorMessage("Sending DepositTxPublishedMessage failed"); trade.setErrorMessage(errorMessage); - if (trade instanceof TakerAsBuyerTrade) + if (trade instanceof BuyerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.MESSAGE_SENDING_FAILED); - else if (trade instanceof TakerAsSellerTrade) + else if (trade instanceof SellerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.MESSAGE_SENDING_FAILED); failed(); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsFiatTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsFiatTransferStartedMessage.java index 02328a5992..743deb55df 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsFiatTransferStartedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsFiatTransferStartedMessage.java @@ -19,17 +19,17 @@ package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; -import io.bitsquare.trade.TakerAsBuyerTrade; -import io.bitsquare.trade.TakerAsSellerTrade; -import io.bitsquare.trade.TakerState; +import io.bitsquare.trade.BuyerAsTakerTrade; +import io.bitsquare.trade.SellerAsTakerTrade; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; +import io.bitsquare.trade.states.TakerState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerSendsFiatTransferStartedMessage extends TakerTradeTask { +public class TakerSendsFiatTransferStartedMessage extends TradeTask { private static final Logger log = LoggerFactory.getLogger(TakerSendsFiatTransferStartedMessage.class); public TakerSendsFiatTransferStartedMessage(TaskRunner taskHandler, Trade trade) { @@ -53,10 +53,10 @@ public class TakerSendsFiatTransferStartedMessage extends TakerTradeTask { public void handleResult() { log.trace("Sending FiatTransferStartedMessage succeeded."); - if (trade instanceof TakerAsBuyerTrade) { + if (trade instanceof BuyerAsTakerTrade) { trade.setProcessState(TakerState.ProcessState.FIAT_PAYMENT_STARTED); } - else if (trade instanceof TakerAsSellerTrade) { + else if (trade instanceof SellerAsTakerTrade) { trade.setProcessState(TakerState.ProcessState.FIAT_PAYMENT_STARTED); } @@ -68,10 +68,10 @@ public class TakerSendsFiatTransferStartedMessage extends TakerTradeTask { appendToErrorMessage("Sending FiatTransferStartedMessage failed"); trade.setErrorMessage(errorMessage); - if (trade instanceof TakerAsBuyerTrade) { - ((TakerAsBuyerTrade) trade).setProcessState(TakerState.ProcessState.MESSAGE_SENDING_FAILED); + if (trade instanceof BuyerAsTakerTrade) { + ((BuyerAsTakerTrade) trade).setProcessState(TakerState.ProcessState.MESSAGE_SENDING_FAILED); } - else if (trade instanceof TakerAsSellerTrade) { + else if (trade instanceof SellerAsTakerTrade) { trade.setProcessState(TakerState.ProcessState.MESSAGE_SENDING_FAILED); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsRequestDepositTxInputsMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsRequestDepositTxInputsMessage.java index 69fd426218..31317ba76b 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsRequestDepositTxInputsMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsRequestDepositTxInputsMessage.java @@ -19,19 +19,19 @@ package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; -import io.bitsquare.trade.TakerAsBuyerTrade; -import io.bitsquare.trade.TakerAsSellerTrade; -import io.bitsquare.trade.TakerState; +import io.bitsquare.trade.BuyerAsTakerTrade; +import io.bitsquare.trade.SellerAsTakerTrade; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.RequestDepositTxInputsMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; +import io.bitsquare.trade.states.TakerState; import javafx.application.Platform; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerSendsRequestDepositTxInputsMessage extends TakerTradeTask { +public class TakerSendsRequestDepositTxInputsMessage extends TradeTask { private static final Logger log = LoggerFactory.getLogger(TakerSendsRequestDepositTxInputsMessage.class); public TakerSendsRequestDepositTxInputsMessage(TaskRunner taskHandler, Trade trade) { @@ -73,9 +73,9 @@ public class TakerSendsRequestDepositTxInputsMessage extends TakerTradeTask { trade.setErrorMessage(errorMessage); - if (trade instanceof TakerAsBuyerTrade) + if (trade instanceof BuyerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.MESSAGE_SENDING_FAILED); - else if (trade instanceof TakerAsSellerTrade) + else if (trade instanceof SellerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.MESSAGE_SENDING_FAILED); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsRequestPayDepositMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsRequestPayDepositMessage.java index 38d1ccc817..d53a26807e 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsRequestPayDepositMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsRequestPayDepositMessage.java @@ -19,17 +19,17 @@ package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; -import io.bitsquare.trade.TakerAsBuyerTrade; -import io.bitsquare.trade.TakerAsSellerTrade; -import io.bitsquare.trade.TakerState; +import io.bitsquare.trade.BuyerAsTakerTrade; +import io.bitsquare.trade.SellerAsTakerTrade; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.RequestPayDepositFromOffererMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; +import io.bitsquare.trade.states.TakerState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerSendsRequestPayDepositMessage extends TakerTradeTask { +public class TakerSendsRequestPayDepositMessage extends TradeTask { private static final Logger log = LoggerFactory.getLogger(TakerSendsRequestPayDepositMessage.class); public TakerSendsRequestPayDepositMessage(TaskRunner taskHandler, Trade trade) { @@ -61,9 +61,9 @@ public class TakerSendsRequestPayDepositMessage extends TakerTradeTask { public void handleFault() { appendToErrorMessage("Sending RequestTakerDepositPaymentMessage failed"); trade.setErrorMessage(errorMessage); - if (trade instanceof TakerAsBuyerTrade) + if (trade instanceof BuyerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.MESSAGE_SENDING_FAILED); - else if (trade instanceof TakerAsSellerTrade) + else if (trade instanceof SellerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.MESSAGE_SENDING_FAILED); failed(); @@ -73,10 +73,10 @@ public class TakerSendsRequestPayDepositMessage extends TakerTradeTask { t.printStackTrace(); trade.setThrowable(t); - if (trade instanceof TakerAsBuyerTrade) { + if (trade instanceof BuyerAsTakerTrade) { trade.setProcessState(TakerState.ProcessState.MESSAGE_SENDING_FAILED); } - else if (trade instanceof TakerAsSellerTrade) { + else if (trade instanceof SellerAsTakerTrade) { trade.setProcessState(TakerState.ProcessState.MESSAGE_SENDING_FAILED); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsRequestPublishDepositTxMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsRequestPublishDepositTxMessage.java index 69e9fe9ee3..da8ba869ad 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsRequestPublishDepositTxMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsRequestPublishDepositTxMessage.java @@ -19,17 +19,17 @@ package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; -import io.bitsquare.trade.TakerAsBuyerTrade; -import io.bitsquare.trade.TakerAsSellerTrade; -import io.bitsquare.trade.TakerState; +import io.bitsquare.trade.BuyerAsTakerTrade; +import io.bitsquare.trade.SellerAsTakerTrade; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.RequestPublishDepositTxMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; +import io.bitsquare.trade.states.TakerState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerSendsRequestPublishDepositTxMessage extends TakerTradeTask { +public class TakerSendsRequestPublishDepositTxMessage extends TradeTask { private static final Logger log = LoggerFactory.getLogger(TakerSendsRequestPublishDepositTxMessage.class); public TakerSendsRequestPublishDepositTxMessage(TaskRunner taskHandler, Trade trade) { @@ -63,9 +63,9 @@ public class TakerSendsRequestPublishDepositTxMessage extends TakerTradeTask { appendToErrorMessage("Sending RequestOffererPublishDepositTxMessage failed"); trade.setErrorMessage(errorMessage); - if (trade instanceof TakerAsBuyerTrade) + if (trade instanceof BuyerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.MESSAGE_SENDING_FAILED); - else if (trade instanceof TakerAsSellerTrade) + else if (trade instanceof SellerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.MESSAGE_SENDING_FAILED); failed(); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSignsAndPublishDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSignsAndPublishDepositTx.java index 96ab26ba69..c3a63faf48 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSignsAndPublishDepositTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSignsAndPublishDepositTx.java @@ -19,11 +19,11 @@ package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.btc.FeePolicy; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.TakerAsBuyerTrade; -import io.bitsquare.trade.TakerAsSellerTrade; -import io.bitsquare.trade.TakerState; +import io.bitsquare.trade.BuyerAsTakerTrade; +import io.bitsquare.trade.SellerAsTakerTrade; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; +import io.bitsquare.trade.states.TakerState; import org.bitcoinj.core.Coin; import org.bitcoinj.core.Transaction; @@ -35,7 +35,7 @@ import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerSignsAndPublishDepositTx extends TakerTradeTask { +public class TakerSignsAndPublishDepositTx extends TradeTask { private static final Logger log = LoggerFactory.getLogger(TakerSignsAndPublishDepositTx.class); public TakerSignsAndPublishDepositTx(TaskRunner taskHandler, Trade trade) { @@ -63,11 +63,11 @@ public class TakerSignsAndPublishDepositTx extends TakerTradeTask { trade.setDepositTx(transaction); - if (trade instanceof TakerAsBuyerTrade) { + if (trade instanceof BuyerAsTakerTrade) { trade.setProcessState(TakerState.ProcessState.DEPOSIT_PUBLISHED); trade.setLifeCycleState(TakerState.LifeCycleState.PENDING); } - else if (trade instanceof TakerAsSellerTrade) { + else if (trade instanceof SellerAsTakerTrade) { trade.setProcessState(TakerState.ProcessState.DEPOSIT_PUBLISHED); trade.setLifeCycleState(TakerState.LifeCycleState.PENDING); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerVerifiesAndSignsContract.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerVerifiesAndSignsContract.java index 07c43f77e2..84cd946444 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerVerifiesAndSignsContract.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerVerifiesAndSignsContract.java @@ -20,13 +20,13 @@ package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Contract; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.util.Utilities; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerVerifiesAndSignsContract extends TakerTradeTask { +public class TakerVerifiesAndSignsContract extends TradeTask { private static final Logger log = LoggerFactory.getLogger(TakerVerifiesAndSignsContract.class); public TakerVerifiesAndSignsContract(TaskRunner taskHandler, Trade trade) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/SellerAsOffererProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/SellerAsOffererProtocol.java index ef295d92fb..fd72b14915 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/SellerAsOffererProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/SellerAsOffererProtocol.java @@ -23,11 +23,10 @@ import io.bitsquare.p2p.Message; import io.bitsquare.p2p.MessageHandler; import io.bitsquare.p2p.Peer; import io.bitsquare.p2p.listener.SendMessageListener; -import io.bitsquare.trade.OffererAsSellerTrade; -import io.bitsquare.trade.OffererState; -import io.bitsquare.trade.protocol.Protocol; +import io.bitsquare.trade.SellerAsOffererTrade; import io.bitsquare.trade.protocol.availability.messages.ReportOfferAvailabilityMessage; import io.bitsquare.trade.protocol.availability.messages.RequestIsOfferAvailableMessage; +import io.bitsquare.trade.protocol.trade.TradeProtocol; import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage; import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage; import io.bitsquare.trade.protocol.trade.messages.RequestPayDepositMessage; @@ -44,27 +43,28 @@ import io.bitsquare.trade.protocol.trade.seller.offerer.tasks.OffererSignsAndPub import io.bitsquare.trade.protocol.trade.shared.models.ProcessModel; import io.bitsquare.trade.protocol.trade.shared.offerer.tasks.VerifyTakeOfferFeePayment; import io.bitsquare.trade.protocol.trade.shared.offerer.tasks.VerifyTakerAccount; +import io.bitsquare.trade.states.OffererState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static io.bitsquare.util.Validator.*; -public class SellerAsOffererProtocol implements Protocol { +public class SellerAsOffererProtocol implements TradeProtocol { private static final Logger log = LoggerFactory.getLogger(SellerAsOffererProtocol.class); private final MessageHandler messageHandler; - private final OffererAsSellerTrade offererAsSellerTrade; + private final SellerAsOffererTrade sellerAsOffererTrade; private final ProcessModel processModel; /////////////////////////////////////////////////////////////////////////////////////////// // Constructor /////////////////////////////////////////////////////////////////////////////////////////// - public SellerAsOffererProtocol(OffererAsSellerTrade model) { + public SellerAsOffererProtocol(SellerAsOffererTrade model) { log.debug("New OffererProtocol " + this); - this.offererAsSellerTrade = model; - processModel = offererAsSellerTrade.getProcessModel(); + this.sellerAsOffererTrade = model; + processModel = sellerAsOffererTrade.getProcessModel(); messageHandler = this::handleMessage; processModel.getMessageService().addMessageHandler(messageHandler); @@ -108,7 +108,7 @@ public class SellerAsOffererProtocol implements Protocol { // to take the // offer // at the same time - boolean isOfferOpen = offererAsSellerTrade.lifeCycleStateProperty().get() == OffererState.LifeCycleState.OFFER_OPEN; + boolean isOfferOpen = sellerAsOffererTrade.lifeCycleStateProperty().get() == OffererState.LifeCycleState.OFFER_OPEN; ReportOfferAvailabilityMessage reportOfferAvailabilityMessage = new ReportOfferAvailabilityMessage(processModel.getId(), isOfferOpen); processModel.getMessageService().sendMessage(sender, reportOfferAvailabilityMessage, new SendMessageListener() { @@ -138,9 +138,9 @@ public class SellerAsOffererProtocol implements Protocol { private void handle(RequestPayDepositMessage tradeMessage, Peer sender) { processModel.setTradeMessage(tradeMessage); - offererAsSellerTrade.setTradingPeer(sender); + sellerAsOffererTrade.setTradingPeer(sender); - TaskRunner taskRunner = new TaskRunner<>(offererAsSellerTrade, + TaskRunner taskRunner = new TaskRunner<>(sellerAsOffererTrade, () -> log.debug("taskRunner at handleTakerDepositPaymentRequestMessage completed"), this::handleTaskRunnerFault); @@ -157,7 +157,7 @@ public class SellerAsOffererProtocol implements Protocol { private void handle(DepositTxPublishedMessage tradeMessage) { processModel.setTradeMessage(tradeMessage); - TaskRunner taskRunner = new TaskRunner<>(offererAsSellerTrade, + TaskRunner taskRunner = new TaskRunner<>(sellerAsOffererTrade, () -> log.debug("taskRunner at handleDepositTxPublishedMessage completed"), this::handleTaskRunnerFault); @@ -171,7 +171,7 @@ public class SellerAsOffererProtocol implements Protocol { private void handle(FiatTransferStartedMessage tradeMessage) { processModel.setTradeMessage(tradeMessage); - TaskRunner taskRunner = new TaskRunner<>(offererAsSellerTrade, + TaskRunner taskRunner = new TaskRunner<>(sellerAsOffererTrade, () -> log.debug("taskRunner at handleFiatTransferStartedMessage completed"), this::handleTaskRunnerFault); @@ -186,9 +186,9 @@ public class SellerAsOffererProtocol implements Protocol { // User clicked the "bank transfer received" button, so we release the funds for pay out public void onFiatPaymentReceived() { - offererAsSellerTrade.setProcessState(OffererState.ProcessState.FIAT_PAYMENT_RECEIVED); + sellerAsOffererTrade.setProcessState(OffererState.ProcessState.FIAT_PAYMENT_RECEIVED); - TaskRunner taskRunner = new TaskRunner<>(offererAsSellerTrade, + TaskRunner taskRunner = new TaskRunner<>(sellerAsOffererTrade, () -> { log.debug("taskRunner at handleFiatReceivedUIEvent completed"); @@ -215,7 +215,7 @@ public class SellerAsOffererProtocol implements Protocol { if (message instanceof TradeMessage) { TradeMessage tradeMessage = (TradeMessage) message; nonEmptyStringOf(tradeMessage.tradeId); - if (tradeMessage.tradeId.equals(offererAsSellerTrade.getId())) { + if (tradeMessage.tradeId.equals(sellerAsOffererTrade.getId())) { if (tradeMessage instanceof RequestIsOfferAvailableMessage) { handle((RequestIsOfferAvailableMessage) tradeMessage, sender); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererCommitDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererCommitDepositTx.java index 038867526a..542a9d0db7 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererCommitDepositTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererCommitDepositTx.java @@ -19,14 +19,14 @@ package io.bitsquare.trade.protocol.trade.seller.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; import org.bitcoinj.core.Transaction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffererCommitDepositTx extends OffererTradeTask { +public class OffererCommitDepositTx extends TradeTask { private static final Logger log = LoggerFactory.getLogger(OffererCommitDepositTx.class); public OffererCommitDepositTx(TaskRunner taskHandler, Trade trade) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererCreatesAndSignsContract.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererCreatesAndSignsContract.java index 9a2c23c1d2..76dbbf27a9 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererCreatesAndSignsContract.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererCreatesAndSignsContract.java @@ -20,13 +20,13 @@ package io.bitsquare.trade.protocol.trade.seller.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Contract; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.util.Utilities; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffererCreatesAndSignsContract extends OffererTradeTask { +public class OffererCreatesAndSignsContract extends TradeTask { private static final Logger log = LoggerFactory.getLogger(OffererCreatesAndSignsContract.class); public OffererCreatesAndSignsContract(TaskRunner taskHandler, Trade trade) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererCreatesAndSignsDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererCreatesAndSignsDepositTx.java index 1b609796f5..9d4a1b5e95 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererCreatesAndSignsDepositTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererCreatesAndSignsDepositTx.java @@ -21,14 +21,14 @@ import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.TradeWalletService; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; import org.bitcoinj.core.Coin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffererCreatesAndSignsDepositTx extends OffererTradeTask { +public class OffererCreatesAndSignsDepositTx extends TradeTask { private static final Logger log = LoggerFactory.getLogger(OffererCreatesAndSignsDepositTx.class); public OffererCreatesAndSignsDepositTx(TaskRunner taskHandler, Trade trade) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererProcessDepositTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererProcessDepositTxPublishedMessage.java index d6b80b4843..a0de965977 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererProcessDepositTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererProcessDepositTxPublishedMessage.java @@ -18,12 +18,12 @@ package io.bitsquare.trade.protocol.trade.seller.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.OffererAsBuyerTrade; -import io.bitsquare.trade.OffererAsSellerTrade; -import io.bitsquare.trade.OffererState; +import io.bitsquare.trade.BuyerAsOffererTrade; +import io.bitsquare.trade.SellerAsOffererTrade; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; +import io.bitsquare.trade.states.OffererState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; import static com.google.common.base.Preconditions.checkNotNull; import static io.bitsquare.util.Validator.checkTradeId; -public class OffererProcessDepositTxPublishedMessage extends OffererTradeTask { +public class OffererProcessDepositTxPublishedMessage extends TradeTask { private static final Logger log = LoggerFactory.getLogger(OffererProcessDepositTxPublishedMessage.class); public OffererProcessDepositTxPublishedMessage(TaskRunner taskHandler, Trade trade) { @@ -47,9 +47,9 @@ public class OffererProcessDepositTxPublishedMessage extends OffererTradeTask { trade.setDepositTx(checkNotNull(message.depositTx)); - if (trade instanceof OffererAsBuyerTrade) + if (trade instanceof BuyerAsOffererTrade) trade.setProcessState(OffererState.ProcessState.DEPOSIT_PUBLISHED); - else if (trade instanceof OffererAsSellerTrade) + else if (trade instanceof SellerAsOffererTrade) trade.setProcessState(OffererState.ProcessState.DEPOSIT_PUBLISHED); complete(); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererProcessFiatTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererProcessFiatTransferStartedMessage.java index 13c7277b67..6cb30ca3b9 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererProcessFiatTransferStartedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererProcessFiatTransferStartedMessage.java @@ -18,12 +18,12 @@ package io.bitsquare.trade.protocol.trade.seller.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.OffererAsBuyerTrade; -import io.bitsquare.trade.OffererAsSellerTrade; -import io.bitsquare.trade.OffererState; +import io.bitsquare.trade.BuyerAsOffererTrade; +import io.bitsquare.trade.SellerAsOffererTrade; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; +import io.bitsquare.trade.states.OffererState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; import static com.google.common.base.Preconditions.checkNotNull; import static io.bitsquare.util.Validator.*; -public class OffererProcessFiatTransferStartedMessage extends OffererTradeTask { +public class OffererProcessFiatTransferStartedMessage extends TradeTask { private static final Logger log = LoggerFactory.getLogger(OffererProcessFiatTransferStartedMessage.class); public OffererProcessFiatTransferStartedMessage(TaskRunner taskHandler, Trade trade) { @@ -50,9 +50,9 @@ public class OffererProcessFiatTransferStartedMessage extends OffererTradeTask { processModel.tradingPeer.setPayoutAmount(positiveCoinOf(nonZeroCoinOf(message.buyerPayoutAmount))); processModel.tradingPeer.setPayoutAddressString(nonEmptyStringOf(message.buyerPayoutAddress)); - if (trade instanceof OffererAsBuyerTrade) + if (trade instanceof BuyerAsOffererTrade) trade.setProcessState(OffererState.ProcessState.FIAT_PAYMENT_STARTED); - else if (trade instanceof OffererAsSellerTrade) + else if (trade instanceof SellerAsOffererTrade) trade.setProcessState(OffererState.ProcessState.FIAT_PAYMENT_STARTED); complete(); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererProcessRequestPayDepositFromOffererMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererProcessRequestPayDepositFromOffererMessage.java index 67de742ae6..13c5f604a4 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererProcessRequestPayDepositFromOffererMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererProcessRequestPayDepositFromOffererMessage.java @@ -19,8 +19,8 @@ package io.bitsquare.trade.protocol.trade.seller.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.RequestPayDepositFromOffererMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; import static com.google.common.base.Preconditions.*; import static io.bitsquare.util.Validator.*; -public class OffererProcessRequestPayDepositFromOffererMessage extends OffererTradeTask { +public class OffererProcessRequestPayDepositFromOffererMessage extends TradeTask { private static final Logger log = LoggerFactory.getLogger(OffererProcessRequestPayDepositFromOffererMessage.class); public OffererProcessRequestPayDepositFromOffererMessage(TaskRunner taskHandler, Trade trade) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererSendsPayoutTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererSendsPayoutTxPublishedMessage.java index 527dfa74ff..350c86e2b3 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererSendsPayoutTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererSendsPayoutTxPublishedMessage.java @@ -19,17 +19,17 @@ package io.bitsquare.trade.protocol.trade.seller.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; -import io.bitsquare.trade.OffererAsBuyerTrade; -import io.bitsquare.trade.OffererAsSellerTrade; -import io.bitsquare.trade.OffererState; +import io.bitsquare.trade.BuyerAsOffererTrade; +import io.bitsquare.trade.SellerAsOffererTrade; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; +import io.bitsquare.trade.states.OffererState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffererSendsPayoutTxPublishedMessage extends OffererTradeTask { +public class OffererSendsPayoutTxPublishedMessage extends TradeTask { private static final Logger log = LoggerFactory.getLogger(OffererSendsPayoutTxPublishedMessage.class); public OffererSendsPayoutTxPublishedMessage(TaskRunner taskHandler, Trade trade) { @@ -56,9 +56,9 @@ public class OffererSendsPayoutTxPublishedMessage extends OffererTradeTask { appendToErrorMessage("Sending PayoutTxPublishedMessage failed"); trade.setErrorMessage(errorMessage); - if (trade instanceof OffererAsBuyerTrade) + if (trade instanceof BuyerAsOffererTrade) trade.setProcessState(OffererState.ProcessState.MESSAGE_SENDING_FAILED); - else if (trade instanceof OffererAsSellerTrade) + else if (trade instanceof SellerAsOffererTrade) trade.setProcessState(OffererState.ProcessState.MESSAGE_SENDING_FAILED); failed(); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererSendsRequestPublishDepositTxFromTakerMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererSendsRequestPublishDepositTxFromTakerMessage.java index 4f96f682cc..9228e31b05 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererSendsRequestPublishDepositTxFromTakerMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererSendsRequestPublishDepositTxFromTakerMessage.java @@ -19,17 +19,17 @@ package io.bitsquare.trade.protocol.trade.seller.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; -import io.bitsquare.trade.OffererAsBuyerTrade; -import io.bitsquare.trade.OffererAsSellerTrade; -import io.bitsquare.trade.OffererState; +import io.bitsquare.trade.BuyerAsOffererTrade; +import io.bitsquare.trade.SellerAsOffererTrade; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.RequestPublishDepositTxFromTakerMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; +import io.bitsquare.trade.states.OffererState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffererSendsRequestPublishDepositTxFromTakerMessage extends OffererTradeTask { +public class OffererSendsRequestPublishDepositTxFromTakerMessage extends TradeTask { private static final Logger log = LoggerFactory.getLogger(OffererSendsRequestPublishDepositTxFromTakerMessage.class); public OffererSendsRequestPublishDepositTxFromTakerMessage(TaskRunner taskHandler, Trade trade) { @@ -64,9 +64,9 @@ public class OffererSendsRequestPublishDepositTxFromTakerMessage extends Offerer appendToErrorMessage("Sending RequestOffererPublishDepositTxMessage failed"); trade.setErrorMessage(errorMessage); - if (trade instanceof OffererAsBuyerTrade) + if (trade instanceof BuyerAsOffererTrade) trade.setProcessState(OffererState.ProcessState.MESSAGE_SENDING_FAILED); - else if (trade instanceof OffererAsSellerTrade) + else if (trade instanceof SellerAsOffererTrade) trade.setProcessState(OffererState.ProcessState.MESSAGE_SENDING_FAILED); failed(); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererSignsAndPublishPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererSignsAndPublishPayoutTx.java index 0c2658df63..71d982345f 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererSignsAndPublishPayoutTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererSignsAndPublishPayoutTx.java @@ -18,11 +18,11 @@ package io.bitsquare.trade.protocol.trade.seller.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.OffererAsBuyerTrade; -import io.bitsquare.trade.OffererAsSellerTrade; -import io.bitsquare.trade.OffererState; +import io.bitsquare.trade.BuyerAsOffererTrade; +import io.bitsquare.trade.SellerAsOffererTrade; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; +import io.bitsquare.trade.states.OffererState; import org.bitcoinj.core.Transaction; @@ -33,7 +33,7 @@ import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffererSignsAndPublishPayoutTx extends OffererTradeTask { +public class OffererSignsAndPublishPayoutTx extends TradeTask { private static final Logger log = LoggerFactory.getLogger(OffererSignsAndPublishPayoutTx.class); public OffererSignsAndPublishPayoutTx(TaskRunner taskHandler, Trade trade) { @@ -58,9 +58,9 @@ public class OffererSignsAndPublishPayoutTx extends OffererTradeTask { public void onSuccess(Transaction transaction) { processModel.setPayoutTx(transaction); - if (trade instanceof OffererAsBuyerTrade) + if (trade instanceof BuyerAsOffererTrade) trade.setProcessState(OffererState.ProcessState.PAYOUT_PUBLISHED); - else if (trade instanceof OffererAsSellerTrade) + else if (trade instanceof SellerAsOffererTrade) trade.setProcessState(OffererState.ProcessState.PAYOUT_PUBLISHED); complete(); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/SellerAsTakerProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/SellerAsTakerProtocol.java index f4ad449bb0..4daf542c7f 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/SellerAsTakerProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/SellerAsTakerProtocol.java @@ -22,10 +22,9 @@ import io.bitsquare.p2p.MailboxMessage; import io.bitsquare.p2p.Message; import io.bitsquare.p2p.MessageHandler; import io.bitsquare.p2p.Peer; -import io.bitsquare.trade.TakerAsSellerTrade; -import io.bitsquare.trade.TakerState; +import io.bitsquare.trade.SellerAsTakerTrade; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.Protocol; +import io.bitsquare.trade.protocol.trade.TradeProtocol; import io.bitsquare.trade.protocol.trade.buyer.taker.tasks.TakerSendsRequestDepositTxInputsMessage; import io.bitsquare.trade.protocol.trade.buyer.taker.tasks.TakerSendsRequestPublishDepositTxMessage; import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage; @@ -45,16 +44,17 @@ import io.bitsquare.trade.protocol.trade.shared.taker.tasks.BroadcastTakeOfferFe import io.bitsquare.trade.protocol.trade.shared.taker.tasks.CreateTakeOfferFeeTx; import io.bitsquare.trade.protocol.trade.shared.taker.tasks.VerifyOfferFeePayment; import io.bitsquare.trade.protocol.trade.shared.taker.tasks.VerifyOffererAccount; +import io.bitsquare.trade.states.TakerState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static io.bitsquare.util.Validator.nonEmptyStringOf; -public class SellerAsTakerProtocol implements Protocol { +public class SellerAsTakerProtocol implements TradeProtocol { private static final Logger log = LoggerFactory.getLogger(SellerAsTakerProtocol.class); - private final TakerAsSellerTrade takerAsSellerTrade; + private final SellerAsTakerTrade sellerAsTakerTrade; private final ProcessModel processModel; private final MessageHandler messageHandler; @@ -63,9 +63,9 @@ public class SellerAsTakerProtocol implements Protocol { // Constructor /////////////////////////////////////////////////////////////////////////////////////////// - public SellerAsTakerProtocol(TakerAsSellerTrade trade) { + public SellerAsTakerProtocol(SellerAsTakerTrade trade) { log.debug("New SellerAsTakerProtocol " + this); - this.takerAsSellerTrade = trade; + this.sellerAsTakerTrade = trade; processModel = trade.getProcessModel(); messageHandler = this::handleMessage; @@ -97,7 +97,7 @@ public class SellerAsTakerProtocol implements Protocol { } public void takeAvailableOffer() { - TaskRunner taskRunner = new TaskRunner<>(takerAsSellerTrade, + TaskRunner taskRunner = new TaskRunner<>(sellerAsTakerTrade, () -> log.debug("taskRunner at takeAvailableOffer completed"), this::handleTaskRunnerFault); @@ -117,7 +117,7 @@ public class SellerAsTakerProtocol implements Protocol { private void handleRequestTakerDepositPaymentMessage(RequestPayDepositMessage tradeMessage) { processModel.setTradeMessage(tradeMessage); - TaskRunner taskRunner = new TaskRunner<>(takerAsSellerTrade, + TaskRunner taskRunner = new TaskRunner<>(sellerAsTakerTrade, () -> log.debug("taskRunner at handleTakerDepositPaymentRequestMessage completed"), this::handleTaskRunnerFault); @@ -134,7 +134,7 @@ public class SellerAsTakerProtocol implements Protocol { private void handleDepositTxPublishedMessage(DepositTxPublishedMessage tradeMessage) { processModel.setTradeMessage(tradeMessage); - TaskRunner taskRunner = new TaskRunner<>(takerAsSellerTrade, + TaskRunner taskRunner = new TaskRunner<>(sellerAsTakerTrade, () -> log.debug("taskRunner at handleDepositTxPublishedMessage completed"), this::handleTaskRunnerFault); @@ -148,7 +148,7 @@ public class SellerAsTakerProtocol implements Protocol { private void handleFiatTransferStartedMessage(FiatTransferStartedMessage tradeMessage) { processModel.setTradeMessage(tradeMessage); - TaskRunner taskRunner = new TaskRunner<>(takerAsSellerTrade, + TaskRunner taskRunner = new TaskRunner<>(sellerAsTakerTrade, () -> log.debug("taskRunner at handleFiatTransferStartedMessage completed"), this::handleTaskRunnerFault); @@ -163,9 +163,9 @@ public class SellerAsTakerProtocol implements Protocol { // User clicked the "bank transfer received" button, so we release the funds for pay out public void onFiatPaymentReceived() { - takerAsSellerTrade.setProcessState(TakerState.ProcessState.FIAT_PAYMENT_RECEIVED); + sellerAsTakerTrade.setProcessState(TakerState.ProcessState.FIAT_PAYMENT_RECEIVED); - TaskRunner taskRunner = new TaskRunner<>(takerAsSellerTrade, + TaskRunner taskRunner = new TaskRunner<>(sellerAsTakerTrade, () -> { log.debug("taskRunner at handleFiatReceivedUIEvent completed"); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerCommitDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerCommitDepositTx.java index 4d03a2cb31..184de6445e 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerCommitDepositTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerCommitDepositTx.java @@ -19,14 +19,14 @@ package io.bitsquare.trade.protocol.trade.seller.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; import org.bitcoinj.core.Transaction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerCommitDepositTx extends TakerTradeTask { +public class TakerCommitDepositTx extends TradeTask { private static final Logger log = LoggerFactory.getLogger(TakerCommitDepositTx.class); public TakerCommitDepositTx(TaskRunner taskHandler, Trade trade) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerCreatesAndSignContract.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerCreatesAndSignContract.java index e8fac8be29..43f3bf73ec 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerCreatesAndSignContract.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerCreatesAndSignContract.java @@ -20,13 +20,13 @@ package io.bitsquare.trade.protocol.trade.seller.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Contract; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.util.Utilities; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerCreatesAndSignContract extends TakerTradeTask { +public class TakerCreatesAndSignContract extends TradeTask { private static final Logger log = LoggerFactory.getLogger(TakerCreatesAndSignContract.class); public TakerCreatesAndSignContract(TaskRunner taskHandler, Trade trade) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerCreatesAndSignsDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerCreatesAndSignsDepositTx.java index 25f23d5410..d56c2e5170 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerCreatesAndSignsDepositTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerCreatesAndSignsDepositTx.java @@ -21,14 +21,14 @@ import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.TradeWalletService; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; import org.bitcoinj.core.Coin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerCreatesAndSignsDepositTx extends TakerTradeTask { +public class TakerCreatesAndSignsDepositTx extends TradeTask { private static final Logger log = LoggerFactory.getLogger(TakerCreatesAndSignsDepositTx.class); public TakerCreatesAndSignsDepositTx(TaskRunner taskHandler, Trade trade) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerProcessDepositTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerProcessDepositTxPublishedMessage.java index 7cff5824e3..d6ea92806c 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerProcessDepositTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerProcessDepositTxPublishedMessage.java @@ -18,12 +18,12 @@ package io.bitsquare.trade.protocol.trade.seller.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.TakerAsBuyerTrade; -import io.bitsquare.trade.TakerAsSellerTrade; -import io.bitsquare.trade.TakerState; +import io.bitsquare.trade.BuyerAsTakerTrade; +import io.bitsquare.trade.SellerAsTakerTrade; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; +import io.bitsquare.trade.states.TakerState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; import static com.google.common.base.Preconditions.checkNotNull; import static io.bitsquare.util.Validator.checkTradeId; -public class TakerProcessDepositTxPublishedMessage extends TakerTradeTask { +public class TakerProcessDepositTxPublishedMessage extends TradeTask { private static final Logger log = LoggerFactory.getLogger(TakerProcessDepositTxPublishedMessage.class); public TakerProcessDepositTxPublishedMessage(TaskRunner taskHandler, Trade trade) { @@ -47,9 +47,9 @@ public class TakerProcessDepositTxPublishedMessage extends TakerTradeTask { trade.setDepositTx(checkNotNull(message.depositTx)); - if (trade instanceof TakerAsBuyerTrade) + if (trade instanceof BuyerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.DEPOSIT_PUBLISHED); - else if (trade instanceof TakerAsSellerTrade) + else if (trade instanceof SellerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.DEPOSIT_PUBLISHED); complete(); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerProcessFiatTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerProcessFiatTransferStartedMessage.java index ed69f72580..45fec4b8e4 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerProcessFiatTransferStartedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerProcessFiatTransferStartedMessage.java @@ -18,12 +18,12 @@ package io.bitsquare.trade.protocol.trade.seller.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.TakerAsBuyerTrade; -import io.bitsquare.trade.TakerAsSellerTrade; -import io.bitsquare.trade.TakerState; +import io.bitsquare.trade.BuyerAsTakerTrade; +import io.bitsquare.trade.SellerAsTakerTrade; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; +import io.bitsquare.trade.states.TakerState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; import static com.google.common.base.Preconditions.checkNotNull; import static io.bitsquare.util.Validator.*; -public class TakerProcessFiatTransferStartedMessage extends TakerTradeTask { +public class TakerProcessFiatTransferStartedMessage extends TradeTask { private static final Logger log = LoggerFactory.getLogger(TakerProcessFiatTransferStartedMessage.class); public TakerProcessFiatTransferStartedMessage(TaskRunner taskHandler, Trade trade) { @@ -50,9 +50,9 @@ public class TakerProcessFiatTransferStartedMessage extends TakerTradeTask { processModel.setPayoutAmount(positiveCoinOf(nonZeroCoinOf(message.sellerPayoutAmount))); processModel.tradingPeer.setPayoutAddressString(nonEmptyStringOf(message.buyerPayoutAddress)); - if (trade instanceof TakerAsBuyerTrade) + if (trade instanceof BuyerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.FIAT_PAYMENT_STARTED); - else if (trade instanceof TakerAsSellerTrade) + else if (trade instanceof SellerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.FIAT_PAYMENT_STARTED); complete(); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerProcessRequestSellerDepositPaymentMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerProcessRequestSellerDepositPaymentMessage.java index 9082a56507..62aae644e0 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerProcessRequestSellerDepositPaymentMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerProcessRequestSellerDepositPaymentMessage.java @@ -19,8 +19,8 @@ package io.bitsquare.trade.protocol.trade.seller.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.RequestPayDepositMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; import static com.google.common.base.Preconditions.*; import static io.bitsquare.util.Validator.*; -public class TakerProcessRequestSellerDepositPaymentMessage extends TakerTradeTask { +public class TakerProcessRequestSellerDepositPaymentMessage extends TradeTask { private static final Logger log = LoggerFactory.getLogger(TakerProcessRequestSellerDepositPaymentMessage.class); public TakerProcessRequestSellerDepositPaymentMessage(TaskRunner taskHandler, Trade trade) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerSendsPayoutTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerSendsPayoutTxPublishedMessage.java index 6c9fdd15bd..4225309759 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerSendsPayoutTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerSendsPayoutTxPublishedMessage.java @@ -19,17 +19,17 @@ package io.bitsquare.trade.protocol.trade.seller.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; -import io.bitsquare.trade.TakerAsBuyerTrade; -import io.bitsquare.trade.TakerAsSellerTrade; -import io.bitsquare.trade.TakerState; +import io.bitsquare.trade.BuyerAsTakerTrade; +import io.bitsquare.trade.SellerAsTakerTrade; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.TradeTask; import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; +import io.bitsquare.trade.states.TakerState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerSendsPayoutTxPublishedMessage extends TakerTradeTask { +public class TakerSendsPayoutTxPublishedMessage extends TradeTask { private static final Logger log = LoggerFactory.getLogger(TakerSendsPayoutTxPublishedMessage.class); public TakerSendsPayoutTxPublishedMessage(TaskRunner taskHandler, Trade trade) { @@ -56,9 +56,9 @@ public class TakerSendsPayoutTxPublishedMessage extends TakerTradeTask { appendToErrorMessage("Sending PayoutTxPublishedMessage failed"); trade.setErrorMessage(errorMessage); - if (trade instanceof TakerAsBuyerTrade) + if (trade instanceof BuyerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.MESSAGE_SENDING_FAILED); - else if (trade instanceof TakerAsSellerTrade) + else if (trade instanceof SellerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.MESSAGE_SENDING_FAILED); failed(); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerSignsAndPublishPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerSignsAndPublishPayoutTx.java index 5562471eea..ad4397289d 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerSignsAndPublishPayoutTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerSignsAndPublishPayoutTx.java @@ -18,11 +18,11 @@ package io.bitsquare.trade.protocol.trade.seller.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.TakerAsBuyerTrade; -import io.bitsquare.trade.TakerAsSellerTrade; -import io.bitsquare.trade.TakerState; +import io.bitsquare.trade.BuyerAsTakerTrade; +import io.bitsquare.trade.SellerAsTakerTrade; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; +import io.bitsquare.trade.states.TakerState; import org.bitcoinj.core.Transaction; @@ -33,7 +33,7 @@ import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerSignsAndPublishPayoutTx extends TakerTradeTask { +public class TakerSignsAndPublishPayoutTx extends TradeTask { private static final Logger log = LoggerFactory.getLogger(TakerSignsAndPublishPayoutTx.class); public TakerSignsAndPublishPayoutTx(TaskRunner taskHandler, Trade trade) { @@ -58,9 +58,9 @@ public class TakerSignsAndPublishPayoutTx extends TakerTradeTask { public void onSuccess(Transaction transaction) { processModel.setPayoutTx(transaction); - if (trade instanceof TakerAsBuyerTrade) + if (trade instanceof BuyerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.PAYOUT_PUBLISHED); - else if (trade instanceof TakerAsSellerTrade) + else if (trade instanceof SellerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.PAYOUT_PUBLISHED); complete(); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/offerer/tasks/VerifyTakeOfferFeePayment.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/offerer/tasks/VerifyTakeOfferFeePayment.java index 64906d8b17..b1a9e1b222 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/offerer/tasks/VerifyTakeOfferFeePayment.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/offerer/tasks/VerifyTakeOfferFeePayment.java @@ -19,12 +19,12 @@ package io.bitsquare.trade.protocol.trade.shared.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class VerifyTakeOfferFeePayment extends OffererTradeTask { +public class VerifyTakeOfferFeePayment extends TradeTask { private static final Logger log = LoggerFactory.getLogger(VerifyTakeOfferFeePayment.class); public VerifyTakeOfferFeePayment(TaskRunner taskHandler, Trade trade) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/offerer/tasks/VerifyTakerAccount.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/offerer/tasks/VerifyTakerAccount.java index cefb0dba9b..c759143a6b 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/offerer/tasks/VerifyTakerAccount.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/offerer/tasks/VerifyTakerAccount.java @@ -18,16 +18,16 @@ package io.bitsquare.trade.protocol.trade.shared.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.OffererAsBuyerTrade; -import io.bitsquare.trade.OffererAsSellerTrade; -import io.bitsquare.trade.OffererState; +import io.bitsquare.trade.BuyerAsOffererTrade; +import io.bitsquare.trade.SellerAsOffererTrade; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; +import io.bitsquare.trade.states.OffererState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class VerifyTakerAccount extends OffererTradeTask { +public class VerifyTakerAccount extends TradeTask { private static final Logger log = LoggerFactory.getLogger(VerifyTakerAccount.class); public VerifyTakerAccount(TaskRunner taskHandler, Trade trade) { @@ -53,18 +53,18 @@ public class VerifyTakerAccount extends OffererTradeTask { else { failed("Account registration validation for peer failed."); - if (trade instanceof OffererAsBuyerTrade) + if (trade instanceof BuyerAsOffererTrade) trade.setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); - else if (trade instanceof OffererAsSellerTrade) + else if (trade instanceof SellerAsOffererTrade) trade.setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); } } catch (Throwable t) { t.printStackTrace(); trade.setThrowable(t); - if (trade instanceof OffererAsBuyerTrade) + if (trade instanceof BuyerAsOffererTrade) trade.setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); - else if (trade instanceof OffererAsSellerTrade) + else if (trade instanceof SellerAsOffererTrade) trade.setLifeCycleState(OffererState.LifeCycleState.OFFER_OPEN); failed(t); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/BroadcastTakeOfferFeeTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/BroadcastTakeOfferFeeTx.java index 8052076025..6cb3166a09 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/BroadcastTakeOfferFeeTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/BroadcastTakeOfferFeeTx.java @@ -18,11 +18,11 @@ package io.bitsquare.trade.protocol.trade.shared.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.TakerAsBuyerTrade; -import io.bitsquare.trade.TakerAsSellerTrade; -import io.bitsquare.trade.TakerState; +import io.bitsquare.trade.BuyerAsTakerTrade; +import io.bitsquare.trade.SellerAsTakerTrade; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; +import io.bitsquare.trade.states.TakerState; import org.bitcoinj.core.Transaction; @@ -33,7 +33,7 @@ import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class BroadcastTakeOfferFeeTx extends TakerTradeTask { +public class BroadcastTakeOfferFeeTx extends TradeTask { private static final Logger log = LoggerFactory.getLogger(BroadcastTakeOfferFeeTx.class); public BroadcastTakeOfferFeeTx(TaskRunner taskHandler, Trade trade) { @@ -49,9 +49,9 @@ public class BroadcastTakeOfferFeeTx extends TakerTradeTask { public void onSuccess(Transaction transaction) { log.debug("Take offer fee published successfully. Transaction ID = " + transaction.getHashAsString()); - if (trade instanceof TakerAsBuyerTrade) + if (trade instanceof BuyerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.TAKE_OFFER_FEE_PUBLISHED); - else if (trade instanceof TakerAsSellerTrade) + else if (trade instanceof SellerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.TAKE_OFFER_FEE_PUBLISHED); complete(); } @@ -62,9 +62,9 @@ public class BroadcastTakeOfferFeeTx extends TakerTradeTask { appendToErrorMessage("Take offer fee payment failed. Maybe your network connection was lost. Please try again."); trade.setErrorMessage(errorMessage); - if (trade instanceof TakerAsBuyerTrade) + if (trade instanceof BuyerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.TAKE_OFFER_FEE_PUBLISH_FAILED); - else if (trade instanceof TakerAsSellerTrade) + else if (trade instanceof SellerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.TAKE_OFFER_FEE_PUBLISH_FAILED); failed(t); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/CreateTakeOfferFeeTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/CreateTakeOfferFeeTx.java index e51d5ac5b5..48a95dbab0 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/CreateTakeOfferFeeTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/CreateTakeOfferFeeTx.java @@ -18,18 +18,18 @@ package io.bitsquare.trade.protocol.trade.shared.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.TakerAsBuyerTrade; -import io.bitsquare.trade.TakerAsSellerTrade; -import io.bitsquare.trade.TakerState; +import io.bitsquare.trade.BuyerAsTakerTrade; +import io.bitsquare.trade.SellerAsTakerTrade; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; +import io.bitsquare.trade.states.TakerState; import org.bitcoinj.core.Transaction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class CreateTakeOfferFeeTx extends TakerTradeTask { +public class CreateTakeOfferFeeTx extends TradeTask { private static final Logger log = LoggerFactory.getLogger(CreateTakeOfferFeeTx.class); public CreateTakeOfferFeeTx(TaskRunner taskHandler, Trade trade) { @@ -43,9 +43,9 @@ public class CreateTakeOfferFeeTx extends TakerTradeTask { processModel.setTakeOfferFeeTx(createTakeOfferFeeTx); - if (trade instanceof TakerAsBuyerTrade) + if (trade instanceof BuyerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.TAKE_OFFER_FEE_TX_CREATED); - else if (trade instanceof TakerAsSellerTrade) + else if (trade instanceof SellerAsTakerTrade) trade.setProcessState(TakerState.ProcessState.TAKE_OFFER_FEE_TX_CREATED); complete(); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/VerifyOfferFeePayment.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/VerifyOfferFeePayment.java index 3b97a11d21..469724b0de 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/VerifyOfferFeePayment.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/VerifyOfferFeePayment.java @@ -19,12 +19,12 @@ package io.bitsquare.trade.protocol.trade.shared.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class VerifyOfferFeePayment extends TakerTradeTask { +public class VerifyOfferFeePayment extends TradeTask { private static final Logger log = LoggerFactory.getLogger(VerifyOfferFeePayment.class); public VerifyOfferFeePayment(TaskRunner taskHandler, Trade trade) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/VerifyOffererAccount.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/VerifyOffererAccount.java index 9b6e6f5cfa..1003a410c6 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/VerifyOffererAccount.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/VerifyOffererAccount.java @@ -19,12 +19,12 @@ package io.bitsquare.trade.protocol.trade.shared.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; +import io.bitsquare.trade.protocol.trade.TradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class VerifyOffererAccount extends TakerTradeTask { +public class VerifyOffererAccount extends TradeTask { private static final Logger log = LoggerFactory.getLogger(VerifyOffererAccount.class); public VerifyOffererAccount(TaskRunner taskHandler, Trade trade) { diff --git a/core/src/main/java/io/bitsquare/trade/OffererState.java b/core/src/main/java/io/bitsquare/trade/states/OffererState.java similarity index 87% rename from core/src/main/java/io/bitsquare/trade/OffererState.java rename to core/src/main/java/io/bitsquare/trade/states/OffererState.java index 90742b2830..2dc3fae771 100644 --- a/core/src/main/java/io/bitsquare/trade/OffererState.java +++ b/core/src/main/java/io/bitsquare/trade/states/OffererState.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade; +package io.bitsquare.trade.states; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory; public class OffererState { private static final Logger log = LoggerFactory.getLogger(OffererState.class); - public enum LifeCycleState implements Trade.LifeCycleState { + public enum LifeCycleState implements TradeState.LifeCycleState { OFFER_OPEN, OFFER_RESERVED, OFFER_CANCELED, @@ -32,7 +32,7 @@ public class OffererState { FAILED } - public enum ProcessState implements Trade.ProcessState { + public enum ProcessState implements TradeState.ProcessState { UNDEFINED, DEPOSIT_PUBLISHED, DEPOSIT_CONFIRMED, diff --git a/core/src/main/java/io/bitsquare/trade/TakerState.java b/core/src/main/java/io/bitsquare/trade/states/TakerState.java similarity index 88% rename from core/src/main/java/io/bitsquare/trade/TakerState.java rename to core/src/main/java/io/bitsquare/trade/states/TakerState.java index 6e0454e069..c1fb15e9fb 100644 --- a/core/src/main/java/io/bitsquare/trade/TakerState.java +++ b/core/src/main/java/io/bitsquare/trade/states/TakerState.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade; +package io.bitsquare.trade.states; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,13 +23,13 @@ import org.slf4j.LoggerFactory; public class TakerState { private static final Logger log = LoggerFactory.getLogger(TakerState.class); - public enum LifeCycleState implements Trade.LifeCycleState { + public enum LifeCycleState implements TradeState.LifeCycleState { PENDING, COMPLETED, FAILED } - public enum ProcessState implements Trade.ProcessState { + public enum ProcessState implements TradeState.ProcessState { UNDEFINED, TAKE_OFFER_FEE_TX_CREATED, TAKE_OFFER_FEE_PUBLISHED, diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererTradeTask.java b/core/src/main/java/io/bitsquare/trade/states/TradeState.java similarity index 52% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererTradeTask.java rename to core/src/main/java/io/bitsquare/trade/states/TradeState.java index 8328cc5fb9..c6965858d8 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererTradeTask.java +++ b/core/src/main/java/io/bitsquare/trade/states/TradeState.java @@ -15,29 +15,17 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; - -import io.bitsquare.common.taskrunner.Task; -import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.shared.models.ProcessModel; +package io.bitsquare.trade.states; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffererTradeTask extends Task { - private static final Logger log = LoggerFactory.getLogger(OffererTradeTask.class); - protected final ProcessModel processModel; - protected final Trade trade; +public class TradeState { + private static final Logger log = LoggerFactory.getLogger(TradeState.class); - public OffererTradeTask(TaskRunner taskHandler, Trade trade) { - super(taskHandler, trade); - - this.trade = trade; - processModel = trade.getProcessModel(); + public interface LifeCycleState { } - @Override - protected void doRun() { + public interface ProcessState { } }