From 8fdcab213b1416c789f81fbf7195d19994ea93ae Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 2 Apr 2015 13:10:15 +0200 Subject: [PATCH] Remove Offer and Taker Trade models --- .../pending/PendingTradesListItem.java | 14 +- .../bitsquare/trade/OffererAsBuyerTrade.java | 7 +- .../bitsquare/trade/OffererAsSellerTrade.java | 6 +- .../java/io/bitsquare/trade/OffererTrade.java | 166 ------------------ .../io/bitsquare/trade/TakerAsBuyerTrade.java | 6 +- .../bitsquare/trade/TakerAsSellerTrade.java | 6 +- .../java/io/bitsquare/trade/TakerTrade.java | 152 ---------------- .../main/java/io/bitsquare/trade/Trade.java | 90 ++++++++-- .../java/io/bitsquare/trade/TradeManager.java | 18 +- .../handlers/TakeOfferResultHandler.java | 4 +- .../buyer/offerer/BuyerAsOffererProtocol.java | 2 +- .../offerer/tasks/OffererCommitsPayoutTx.java | 4 +- .../tasks/OffererCreatesAndSignPayoutTx.java | 4 +- .../tasks/OffererCreatesDepositTxInputs.java | 4 +- ...ffererProcessPayoutTxPublishedMessage.java | 4 +- ...rProcessRequestDepositTxInputsMessage.java | 4 +- ...ProcessRequestPublishDepositTxMessage.java | 4 +- ...OffererSendsDepositTxPublishedMessage.java | 4 +- ...ffererSendsFiatTransferStartedMessage.java | 4 +- ...ndsRequestSellerDepositPaymentMessage.java | 4 +- .../OffererSignsAndPublishDepositTx.java | 4 +- .../OffererVerifiesAndSignsContract.java | 4 +- .../buyer/taker/BuyerAsTakerProtocol.java | 2 +- .../taker/tasks/TakerCommitsPayoutTx.java | 4 +- .../tasks/TakerCreatesAndSignsPayoutTx.java | 4 +- .../tasks/TakerCreatesDepositTxInputs.java | 4 +- .../TakerProcessPayoutTxPublishedMessage.java | 4 +- ...questPublishDepositTxFromTakerMessage.java | 4 +- .../TakerSendsDepositTxPublishedMessage.java | 4 +- .../TakerSendsFiatTransferStartedMessage.java | 4 +- ...kerSendsRequestDepositTxInputsMessage.java | 4 +- .../TakerSendsRequestPayDepositMessage.java | 4 +- ...erSendsRequestPublishDepositTxMessage.java | 4 +- .../tasks/TakerSignsAndPublishDepositTx.java | 4 +- .../tasks/TakerVerifiesAndSignsContract.java | 4 +- .../trade/offerer/tasks/OffererTradeTask.java | 10 +- .../offerer/SellerAsOffererProtocol.java | 2 +- .../offerer/tasks/OffererCommitDepositTx.java | 4 +- .../tasks/OffererCreatesAndSignsContract.java | 4 +- .../OffererCreatesAndSignsDepositTx.java | 4 +- ...fererProcessDepositTxPublishedMessage.java | 4 +- ...ererProcessFiatTransferStartedMessage.java | 4 +- ...ssRequestPayDepositFromOffererMessage.java | 4 +- .../OffererSendsPayoutTxPublishedMessage.java | 4 +- ...questPublishDepositTxFromTakerMessage.java | 4 +- .../tasks/OffererSignsAndPublishPayoutTx.java | 4 +- .../seller/taker/SellerAsTakerProtocol.java | 8 +- .../taker/tasks/TakerCommitDepositTx.java | 4 +- .../tasks/TakerCreatesAndSignContract.java | 4 +- .../tasks/TakerCreatesAndSignsDepositTx.java | 4 +- ...TakerProcessDepositTxPublishedMessage.java | 4 +- ...akerProcessFiatTransferStartedMessage.java | 4 +- ...essRequestSellerDepositPaymentMessage.java | 4 +- .../TakerSendsPayoutTxPublishedMessage.java | 4 +- .../tasks/TakerSignsAndPublishPayoutTx.java | 4 +- .../{ => shared/models}/ProcessModel.java | 3 +- .../tasks/VerifyTakeOfferFeePayment.java | 4 +- .../offerer/tasks/VerifyTakerAccount.java | 10 +- .../taker/tasks/BroadcastTakeOfferFeeTx.java | 4 +- .../taker/tasks/CreateTakeOfferFeeTx.java | 4 +- .../taker/tasks/VerifyOfferFeePayment.java | 4 +- .../taker/tasks/VerifyOffererAccount.java | 4 +- .../trade/taker/tasks/TakerTradeTask.java | 10 +- 63 files changed, 223 insertions(+), 473 deletions(-) delete mode 100644 core/src/main/java/io/bitsquare/trade/OffererTrade.java delete mode 100644 core/src/main/java/io/bitsquare/trade/TakerTrade.java rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => shared/models}/ProcessModel.java (98%) diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesListItem.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesListItem.java index 4b01e2d501..870992fdb0 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesListItem.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesListItem.java @@ -17,8 +17,6 @@ package io.bitsquare.gui.main.portfolio.pending; -import io.bitsquare.trade.OffererTrade; -import io.bitsquare.trade.TakerTrade; import io.bitsquare.trade.Trade; import org.bitcoinj.core.Coin; @@ -53,17 +51,17 @@ public class PendingTradesListItem { } public ReadOnlyObjectProperty tradeAmountProperty() { - if (trade instanceof TakerTrade) - return ((TakerTrade) trade).tradeAmountProperty(); + if (trade instanceof Trade) + return trade.tradeAmountProperty(); else - return ((OffererTrade) trade).tradeAmountProperty(); + return trade.tradeAmountProperty(); } public ReadOnlyObjectProperty tradeVolumeProperty() { - if (trade instanceof TakerTrade) - return ((TakerTrade) trade).tradeVolumeProperty(); + if (trade instanceof Trade) + return trade.tradeVolumeProperty(); else - return ((OffererTrade) trade).tradeVolumeProperty(); + return trade.tradeVolumeProperty(); } public Date getDate() { diff --git a/core/src/main/java/io/bitsquare/trade/OffererAsBuyerTrade.java b/core/src/main/java/io/bitsquare/trade/OffererAsBuyerTrade.java index 65aa16b925..02dc366b3a 100644 --- a/core/src/main/java/io/bitsquare/trade/OffererAsBuyerTrade.java +++ b/core/src/main/java/io/bitsquare/trade/OffererAsBuyerTrade.java @@ -28,7 +28,7 @@ import java.io.Serializable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffererAsBuyerTrade extends OffererTrade implements Serializable { +public class OffererAsBuyerTrade 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; @@ -39,7 +39,7 @@ public class OffererAsBuyerTrade extends OffererTrade implements Serializable { // Enum /////////////////////////////////////////////////////////////////////////////////////////// - public enum LifeCycleState implements OffererTrade.LifeCycleState { + public enum LifeCycleState implements Trade.LifeCycleState { OFFER_OPEN, OFFER_RESERVED, OFFER_CANCELED, @@ -48,7 +48,7 @@ public class OffererAsBuyerTrade extends OffererTrade implements Serializable { FAILED } - public enum ProcessState implements OffererTrade.ProcessState { + public enum ProcessState implements Trade.ProcessState { UNDEFINED, DEPOSIT_PUBLISHED, DEPOSIT_CONFIRMED, @@ -132,6 +132,7 @@ public class OffererAsBuyerTrade extends OffererTrade implements Serializable { } } + @Override public void setThrowable(Throwable throwable) { super.setThrowable(throwable); diff --git a/core/src/main/java/io/bitsquare/trade/OffererAsSellerTrade.java b/core/src/main/java/io/bitsquare/trade/OffererAsSellerTrade.java index 5dd005643f..a9189ba4f2 100644 --- a/core/src/main/java/io/bitsquare/trade/OffererAsSellerTrade.java +++ b/core/src/main/java/io/bitsquare/trade/OffererAsSellerTrade.java @@ -28,7 +28,7 @@ import java.io.Serializable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffererAsSellerTrade extends OffererTrade implements Serializable { +public class OffererAsSellerTrade 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; @@ -39,7 +39,7 @@ public class OffererAsSellerTrade extends OffererTrade implements Serializable { // Enum /////////////////////////////////////////////////////////////////////////////////////////// - public enum LifeCycleState implements OffererTrade.LifeCycleState { + public enum LifeCycleState implements Trade.LifeCycleState { OFFER_OPEN, OFFER_RESERVED, OFFER_CANCELED, @@ -48,7 +48,7 @@ public class OffererAsSellerTrade extends OffererTrade implements Serializable { FAILED } - public enum ProcessState implements OffererTrade.ProcessState { + public enum ProcessState implements Trade.ProcessState { UNDEFINED, DEPOSIT_PUBLISHED, DEPOSIT_CONFIRMED, diff --git a/core/src/main/java/io/bitsquare/trade/OffererTrade.java b/core/src/main/java/io/bitsquare/trade/OffererTrade.java deleted file mode 100644 index 5522f1e47a..0000000000 --- a/core/src/main/java/io/bitsquare/trade/OffererTrade.java +++ /dev/null @@ -1,166 +0,0 @@ -/* - * This file is part of Bitsquare. - * - * Bitsquare is free software: you can redistribute it and/or modify it - * under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at - * your option) any later version. - * - * Bitsquare is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public - * License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Bitsquare. If not, see . - */ - -package io.bitsquare.trade; - -import io.bitsquare.offer.Offer; -import io.bitsquare.p2p.Peer; -import io.bitsquare.storage.Storage; -import io.bitsquare.trade.protocol.trade.ProcessModel; - -import org.bitcoinj.core.Coin; -import org.bitcoinj.utils.Fiat; - -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.Serializable; - -import javax.annotation.Nullable; - -import javafx.beans.property.ObjectProperty; -import javafx.beans.property.ReadOnlyObjectProperty; -import javafx.beans.property.SimpleObjectProperty; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public abstract class OffererTrade 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(OffererTrade.class); - - - /////////////////////////////////////////////////////////////////////////////////////////// - // Enum - /////////////////////////////////////////////////////////////////////////////////////////// - - public interface LifeCycleState extends Trade.LifeCycleState { - } - - public interface ProcessState extends Trade.ProcessState { - } - - - /////////////////////////////////////////////////////////////////////////////////////////// - // Fields - /////////////////////////////////////////////////////////////////////////////////////////// - - // Mutable - protected Coin tradeAmount; - protected Peer tradingPeer; - transient protected ObjectProperty tradeAmountProperty; - transient protected ObjectProperty tradeVolumeProperty; - - - /////////////////////////////////////////////////////////////////////////////////////////// - // Constructor, initialization - /////////////////////////////////////////////////////////////////////////////////////////// - - protected OffererTrade(Offer offer, Storage storage) { - super(offer, storage); - log.trace("Created by constructor"); - - initStates(); - initStateProperties(); - tradeAmountProperty = new SimpleObjectProperty<>(); - tradeVolumeProperty = new SimpleObjectProperty<>(); - } - - private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { - in.defaultReadObject(); - log.trace("Created from serialized form."); - - initStateProperties(); - initAmountProperty(); - } - - @Override - public ProcessModel createProcessModel() { - return new ProcessModel(); - } - - - /////////////////////////////////////////////////////////////////////////////////////////// - // Getter/Setter for Mutable objects - /////////////////////////////////////////////////////////////////////////////////////////// - - public ProcessModel getProcessModel() { - return processModel; - } - - public void setTradingPeer(Peer tradingPeer) { - this.tradingPeer = tradingPeer; - } - - @Nullable - public Peer getTradingPeer() { - return tradingPeer; - } - - public void setTradeAmount(Coin tradeAmount) { - this.tradeAmount = tradeAmount; - tradeAmountProperty.set(tradeAmount); - tradeVolumeProperty.set(getTradeVolume()); - } - - @Nullable - @Override - public Coin getTradeAmount() { - return tradeAmount; - } - - @Nullable - @Override - public Fiat getTradeVolume() { - if (tradeAmount != null) - return offer.getVolumeByAmount(tradeAmount); - else - return null; - } - - public ReadOnlyObjectProperty tradeAmountProperty() { - return tradeAmountProperty; - } - - public ReadOnlyObjectProperty tradeVolumeProperty() { - return tradeVolumeProperty; - } - - /////////////////////////////////////////////////////////////////////////////////////////// - // Protected - /////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void initAmountProperty() { - tradeAmountProperty = new SimpleObjectProperty<>(); - tradeVolumeProperty = new SimpleObjectProperty<>(); - - if (tradeAmount != null) { - tradeAmountProperty.set(tradeAmount); - tradeVolumeProperty.set(getTradeVolume()); - } - } - - @Override - public String toString() { - return "OffererTrade{" + - "tradeAmount=" + tradeAmount + - ", tradingPeer=" + tradingPeer + - super.toString(); - } -} diff --git a/core/src/main/java/io/bitsquare/trade/TakerAsBuyerTrade.java b/core/src/main/java/io/bitsquare/trade/TakerAsBuyerTrade.java index f40513a84c..a2d6f7d261 100644 --- a/core/src/main/java/io/bitsquare/trade/TakerAsBuyerTrade.java +++ b/core/src/main/java/io/bitsquare/trade/TakerAsBuyerTrade.java @@ -30,7 +30,7 @@ import java.io.Serializable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerAsBuyerTrade extends TakerTrade implements Serializable { +public class TakerAsBuyerTrade 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,13 +41,13 @@ public class TakerAsBuyerTrade extends TakerTrade implements Serializable { // Enum /////////////////////////////////////////////////////////////////////////////////////////// - public enum LifeCycleState implements TakerTrade.LifeCycleState { + public enum LifeCycleState implements Trade.LifeCycleState { PENDING, COMPLETED, FAILED } - public enum ProcessState implements TakerTrade.ProcessState { + public enum ProcessState implements Trade.ProcessState { UNDEFINED, TAKE_OFFER_FEE_TX_CREATED, TAKE_OFFER_FEE_PUBLISHED, diff --git a/core/src/main/java/io/bitsquare/trade/TakerAsSellerTrade.java b/core/src/main/java/io/bitsquare/trade/TakerAsSellerTrade.java index 1e2a27ab98..a026b96f5b 100644 --- a/core/src/main/java/io/bitsquare/trade/TakerAsSellerTrade.java +++ b/core/src/main/java/io/bitsquare/trade/TakerAsSellerTrade.java @@ -30,7 +30,7 @@ import java.io.Serializable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerAsSellerTrade extends TakerTrade implements Serializable { +public class TakerAsSellerTrade 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,13 +41,13 @@ public class TakerAsSellerTrade extends TakerTrade implements Serializable { // Enum /////////////////////////////////////////////////////////////////////////////////////////// - public enum LifeCycleState implements TakerTrade.LifeCycleState { + public enum LifeCycleState implements Trade.LifeCycleState { PENDING, COMPLETED, FAILED } - public enum ProcessState implements TakerTrade.ProcessState { + public enum ProcessState implements Trade.ProcessState { UNDEFINED, TAKE_OFFER_FEE_TX_CREATED, TAKE_OFFER_FEE_PUBLISHED, diff --git a/core/src/main/java/io/bitsquare/trade/TakerTrade.java b/core/src/main/java/io/bitsquare/trade/TakerTrade.java deleted file mode 100644 index 0341082fca..0000000000 --- a/core/src/main/java/io/bitsquare/trade/TakerTrade.java +++ /dev/null @@ -1,152 +0,0 @@ -/* - * This file is part of Bitsquare. - * - * Bitsquare is free software: you can redistribute it and/or modify it - * under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at - * your option) any later version. - * - * Bitsquare is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public - * License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Bitsquare. If not, see . - */ - -package io.bitsquare.trade; - -import io.bitsquare.offer.Offer; -import io.bitsquare.p2p.Peer; -import io.bitsquare.storage.Storage; -import io.bitsquare.trade.protocol.trade.ProcessModel; - -import org.bitcoinj.core.Coin; -import org.bitcoinj.utils.Fiat; - -import java.io.IOException; -import java.io.Serializable; - -import javafx.beans.property.ObjectProperty; -import javafx.beans.property.ReadOnlyObjectProperty; -import javafx.beans.property.SimpleObjectProperty; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public abstract class TakerTrade 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(TakerTrade.class); - - - /////////////////////////////////////////////////////////////////////////////////////////// - // Enum - /////////////////////////////////////////////////////////////////////////////////////////// - - public interface LifeCycleState extends Trade.LifeCycleState { - } - - public interface ProcessState extends Trade.ProcessState { - } - - - /////////////////////////////////////////////////////////////////////////////////////////// - // Fields - /////////////////////////////////////////////////////////////////////////////////////////// - - // Immutable - protected final Coin tradeAmount; - protected final Peer tradingPeer; - transient protected ObjectProperty tradeAmountProperty; - transient protected ObjectProperty tradeVolumeProperty; - - - /////////////////////////////////////////////////////////////////////////////////////////// - // Constructor, initialization - /////////////////////////////////////////////////////////////////////////////////////////// - - protected TakerTrade(Offer offer, Coin tradeAmount, Peer tradingPeer, - Storage storage) { - super(offer, storage); - log.trace("Created by constructor"); - - this.tradeAmount = tradeAmount; - this.tradingPeer = tradingPeer; - - initStates(); - initStateProperties(); - initAmountProperty(); - } - - private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException { - in.defaultReadObject(); - log.trace("Created from serialized form."); - - initStateProperties(); - initAmountProperty(); - } - - @Override - public ProcessModel createProcessModel() { - return new ProcessModel(); - } - - - /////////////////////////////////////////////////////////////////////////////////////////// - // API - /////////////////////////////////////////////////////////////////////////////////////////// - - abstract public void takeAvailableOffer(); - - - /////////////////////////////////////////////////////////////////////////////////////////// - // Getter only - /////////////////////////////////////////////////////////////////////////////////////////// - - @Override - public Coin getTradeAmount() { - return tradeAmount; - } - - @Override - public Fiat getTradeVolume() { - return offer.getVolumeByAmount(tradeAmount); - } - - public Peer getTradingPeer() { - return tradingPeer; - } - - public ProcessModel getProcessModel() { - return processModel; - } - - public ReadOnlyObjectProperty tradeAmountProperty() { - return tradeAmountProperty; - } - - public ReadOnlyObjectProperty tradeVolumeProperty() { - return tradeVolumeProperty; - } - - /////////////////////////////////////////////////////////////////////////////////////////// - // Protected - /////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void initAmountProperty() { - tradeAmountProperty = new SimpleObjectProperty<>(tradeAmount); - tradeVolumeProperty = new SimpleObjectProperty<>(getTradeVolume()); - } - - @Override - public String toString() { - return "TakerTrade{" + - "tradeAmount=" + tradeAmount + - ", tradingPeer=" + tradingPeer + - super.toString(); - } -} diff --git a/core/src/main/java/io/bitsquare/trade/Trade.java b/core/src/main/java/io/bitsquare/trade/Trade.java index 756e25dee4..5562891e52 100644 --- a/core/src/main/java/io/bitsquare/trade/Trade.java +++ b/core/src/main/java/io/bitsquare/trade/Trade.java @@ -26,9 +26,10 @@ import io.bitsquare.crypto.SignatureService; import io.bitsquare.offer.Offer; 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.ProcessModel; +import io.bitsquare.trade.protocol.trade.shared.models.ProcessModel; import io.bitsquare.user.User; import org.bitcoinj.core.Coin; @@ -67,6 +68,11 @@ 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; + transient protected ObjectProperty tradeAmountProperty; + transient protected ObjectProperty tradeVolumeProperty; /////////////////////////////////////////////////////////////////////////////////////////// @@ -123,11 +129,28 @@ abstract public class Trade extends Model implements Serializable { date = new Date(); processModel = createProcessModel(); + tradeVolumeProperty = new SimpleObjectProperty<>(); + tradeAmountProperty = new SimpleObjectProperty<>(); + + initStates(); + initStateProperties(); + } + + // taker + protected Trade(Offer offer, Coin tradeAmount, Peer tradingPeer, + Storage storage) { + + this(offer, storage); + this.tradeAmount = tradeAmount; + this.tradingPeer = tradingPeer; } private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { in.defaultReadObject(); log.trace("Created from serialized form."); + + initStateProperties(); + initAmountProperty(); } public void init(MessageService messageService, @@ -153,6 +176,11 @@ abstract public class Trade extends Model implements Serializable { protocol.setMailboxMessage(mailboxMessage); } + protected void initStateProperties() { + processStateProperty = new SimpleObjectProperty<>(processState); + lifeCycleStateProperty = new SimpleObjectProperty<>(lifeCycleState); + } + // The deserialized tx has not actual confidence data, so we need to get the fresh one from the wallet. public void updateDepositTxFromWallet(TradeWalletService tradeWalletService) { @@ -217,20 +245,36 @@ abstract public class Trade extends Model implements Serializable { } } + // taker only + public void takeAvailableOffer() { + } abstract protected void createProtocol(); - abstract protected void initAmountProperty(); + public ReadOnlyObjectProperty tradeAmountProperty() { + return tradeAmountProperty; + } + + public ReadOnlyObjectProperty tradeVolumeProperty() { + return tradeVolumeProperty; + } + + protected void initAmountProperty() { + tradeAmountProperty = new SimpleObjectProperty<>(); + tradeVolumeProperty = new SimpleObjectProperty<>(); + + if (tradeAmount != null) { + tradeAmountProperty.set(tradeAmount); + tradeVolumeProperty.set(getTradeVolume()); + } + } abstract protected void handleConfidenceResult(); abstract protected void initStates(); - abstract protected ProcessModel createProcessModel(); - - protected void initStateProperties() { - processStateProperty = new SimpleObjectProperty<>(processState); - lifeCycleStateProperty = new SimpleObjectProperty<>(lifeCycleState); + public ProcessModel createProcessModel() { + return new ProcessModel(); } @@ -275,11 +319,37 @@ abstract public class Trade extends Model implements Serializable { return offer.getSecurityDeposit(); } - @Nullable - abstract public Coin getTradeAmount(); + public ProcessModel getProcessModel() { + return processModel; + } + + public void setTradingPeer(Peer tradingPeer) { + this.tradingPeer = tradingPeer; + } @Nullable - abstract public Fiat getTradeVolume(); + public Peer getTradingPeer() { + return tradingPeer; + } + + public void setTradeAmount(Coin tradeAmount) { + this.tradeAmount = tradeAmount; + tradeAmountProperty.set(tradeAmount); + tradeVolumeProperty.set(getTradeVolume()); + } + + @Nullable + public Coin getTradeAmount() { + return tradeAmount; + } + + @Nullable + public Fiat getTradeVolume() { + if (tradeAmount != null) + return offer.getVolumeByAmount(tradeAmount); + else + return null; + } public ReadOnlyObjectProperty processStateProperty() { return processStateProperty; diff --git a/core/src/main/java/io/bitsquare/trade/TradeManager.java b/core/src/main/java/io/bitsquare/trade/TradeManager.java index 9bec883e4c..69d44bf23b 100644 --- a/core/src/main/java/io/bitsquare/trade/TradeManager.java +++ b/core/src/main/java/io/bitsquare/trade/TradeManager.java @@ -91,7 +91,7 @@ public class TradeManager { private final Map checkOfferAvailabilityProtocolMap = new HashMap<>(); private final Storage pendingTradesStorage; private final Storage openOfferTradesStorage; - private final TradeList openOfferTrades; + private final TradeList openOfferTrades; private final TradeList pendingTrades; private final TradeList closedTrades; @@ -150,7 +150,7 @@ public class TradeManager { // When all services are initialized we create the protocols for our open offers and persisted pendingTrades // OffererAsBuyerProtocol listens for take offer requests, so we need to instantiate it early. public void onAllServicesInitialized() { - for (OffererTrade offererTrade : openOfferTrades) { + for (Trade offererTrade : openOfferTrades) { Offer offer = offererTrade.getOffer(); // We add own offers to offerbook when we go online again offerBookService.addOffer(offer, @@ -228,7 +228,7 @@ public class TradeManager { log.debug("shutDown"); shutDownRequested = true; // we remove own offers form offerbook when we go offline - for (OffererTrade offererTrade : openOfferTrades) { + for (Trade offererTrade : openOfferTrades) { Offer offer = offererTrade.getOffer(); offerBookService.removeOfferAtShutDown(offer); } @@ -276,7 +276,7 @@ public class TradeManager { } private void handlePlaceOfferResult(Transaction transaction, Offer offer, TransactionResultHandler resultHandler) { - OffererTrade offererTrade; + Trade offererTrade; if (offer.getDirection() == Offer.Direction.BUY) offererTrade = new OffererAsBuyerTrade(offer, openOfferTradesStorage); else @@ -288,7 +288,7 @@ public class TradeManager { resultHandler.handleResult(transaction); } - private void setupDepositPublishedListener(OffererTrade offererTrade) { + private void setupDepositPublishedListener(Trade offererTrade) { offererTrade.processStateProperty().addListener((ov, oldValue, newValue) -> { log.debug("setupDepositPublishedListener state = " + newValue); if (newValue == OffererAsBuyerTrade.ProcessState.DEPOSIT_PUBLISHED || newValue == OffererAsSellerTrade.ProcessState.DEPOSIT_PUBLISHED) { @@ -313,9 +313,9 @@ public class TradeManager { offerBookService.removeOffer(offer, () -> { offer.setState(Offer.State.REMOVED); - Optional offererTradeOptional = openOfferTrades.stream().filter(e -> e.getId().equals(offer.getId())).findAny(); + Optional offererTradeOptional = openOfferTrades.stream().filter(e -> e.getId().equals(offer.getId())).findAny(); if (offererTradeOptional.isPresent()) { - OffererTrade offererTrade = offererTradeOptional.get(); + Trade offererTrade = offererTradeOptional.get(); openOfferTrades.remove(offererTrade); if (isCancelRequest) { @@ -377,7 +377,7 @@ public class TradeManager { takeOfferResultHandler) { disposeCheckOfferAvailabilityRequest(offer); if (offer.getState() == Offer.State.AVAILABLE) { - TakerTrade takerTrade; + Trade takerTrade; if (offer.getDirection() == Offer.Direction.BUY) takerTrade = new TakerAsSellerTrade(offer, amount, model.getPeer(), pendingTradesStorage); else @@ -456,7 +456,7 @@ public class TradeManager { // Getters /////////////////////////////////////////////////////////////////////////////////////////// - public ObservableList getOpenOfferTrades() { + public ObservableList getOpenOfferTrades() { return openOfferTrades.getObservableList(); } diff --git a/core/src/main/java/io/bitsquare/trade/handlers/TakeOfferResultHandler.java b/core/src/main/java/io/bitsquare/trade/handlers/TakeOfferResultHandler.java index 8802bf73b1..89884e20b5 100644 --- a/core/src/main/java/io/bitsquare/trade/handlers/TakeOfferResultHandler.java +++ b/core/src/main/java/io/bitsquare/trade/handlers/TakeOfferResultHandler.java @@ -17,9 +17,9 @@ package io.bitsquare.trade.handlers; -import io.bitsquare.trade.TakerTrade; +import io.bitsquare.trade.Trade; public interface TakeOfferResultHandler { - void handleResult(TakerTrade trade); + void handleResult(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 4bf7572d60..b22bc0bfb4 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 @@ -27,7 +27,6 @@ import io.bitsquare.trade.OffererAsBuyerTrade; import io.bitsquare.trade.protocol.Protocol; import io.bitsquare.trade.protocol.availability.messages.ReportOfferAvailabilityMessage; import io.bitsquare.trade.protocol.availability.messages.RequestIsOfferAvailableMessage; -import io.bitsquare.trade.protocol.trade.ProcessModel; 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; @@ -43,6 +42,7 @@ import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage; import io.bitsquare.trade.protocol.trade.messages.RequestDepositTxInputsMessage; import io.bitsquare.trade.protocol.trade.messages.RequestPublishDepositTxMessage; 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; 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 8f1e3011bd..c841d7be38 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 @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.buyer.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.OffererTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.bitcoinj.core.Transaction; @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; public class OffererCommitsPayoutTx extends OffererTradeTask { private static final Logger log = LoggerFactory.getLogger(OffererCommitsPayoutTx.class); - public OffererCommitsPayoutTx(TaskRunner taskHandler, OffererTrade offererTrade) { + public OffererCommitsPayoutTx(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); } 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 d340b6472f..cb6814830c 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 @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.buyer.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.OffererTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.bitcoinj.core.Coin; @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; public class OffererCreatesAndSignPayoutTx extends OffererTradeTask { private static final Logger log = LoggerFactory.getLogger(OffererCreatesAndSignPayoutTx.class); - public OffererCreatesAndSignPayoutTx(TaskRunner taskHandler, OffererTrade offererTrade) { + public OffererCreatesAndSignPayoutTx(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); } 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 f959129a2a..fea020974b 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 @@ -22,7 +22,7 @@ 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.OffererTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.bitcoinj.core.Coin; @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; public class OffererCreatesDepositTxInputs extends OffererTradeTask { private static final Logger log = LoggerFactory.getLogger(OffererCreatesDepositTxInputs.class); - public OffererCreatesDepositTxInputs(TaskRunner taskHandler, OffererTrade offererTrade) { + public OffererCreatesDepositTxInputs(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); } 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 592ee7043c..033799b121 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 @@ -20,7 +20,7 @@ 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.OffererTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage; import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; @@ -33,7 +33,7 @@ import static io.bitsquare.util.Validator.checkTradeId; public class OffererProcessPayoutTxPublishedMessage extends OffererTradeTask { private static final Logger log = LoggerFactory.getLogger(OffererProcessPayoutTxPublishedMessage.class); - public OffererProcessPayoutTxPublishedMessage(TaskRunner taskHandler, OffererTrade offererTrade) { + public OffererProcessPayoutTxPublishedMessage(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); } 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 92b497a5bf..338450c2dc 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 @@ -20,7 +20,7 @@ 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.OffererTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.RequestDepositTxInputsMessage; import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; @@ -33,7 +33,7 @@ import static io.bitsquare.util.Validator.*; public class OffererProcessRequestDepositTxInputsMessage extends OffererTradeTask { private static final Logger log = LoggerFactory.getLogger(OffererProcessRequestDepositTxInputsMessage.class); - public OffererProcessRequestDepositTxInputsMessage(TaskRunner taskHandler, OffererTrade offererTrade) { + public OffererProcessRequestDepositTxInputsMessage(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); } 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 0bec11fee7..d6a8426b4e 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 @@ -20,7 +20,7 @@ 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.OffererTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.RequestPublishDepositTxMessage; import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; @@ -33,7 +33,7 @@ import static io.bitsquare.util.Validator.*; public class OffererProcessRequestPublishDepositTxMessage extends OffererTradeTask { private static final Logger log = LoggerFactory.getLogger(OffererProcessRequestPublishDepositTxMessage.class); - public OffererProcessRequestPublishDepositTxMessage(TaskRunner taskHandler, OffererTrade offererTrade) { + public OffererProcessRequestPublishDepositTxMessage(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); } 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 050479d2e3..6338167ca6 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 @@ -21,7 +21,7 @@ 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.OffererTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage; import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; public class OffererSendsDepositTxPublishedMessage extends OffererTradeTask { private static final Logger log = LoggerFactory.getLogger(OffererSendsDepositTxPublishedMessage.class); - public OffererSendsDepositTxPublishedMessage(TaskRunner taskHandler, OffererTrade offererTrade) { + public OffererSendsDepositTxPublishedMessage(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); } 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 12264d6f04..ebd0bd9209 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 @@ -21,7 +21,7 @@ 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.OffererTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage; import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; public class OffererSendsFiatTransferStartedMessage extends OffererTradeTask { private static final Logger log = LoggerFactory.getLogger(OffererSendsFiatTransferStartedMessage.class); - public OffererSendsFiatTransferStartedMessage(TaskRunner taskHandler, OffererTrade offererTrade) { + public OffererSendsFiatTransferStartedMessage(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); } 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 643722eaa9..f235157ea4 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 @@ -21,7 +21,7 @@ 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.OffererTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.RequestPayDepositMessage; import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; public class OffererSendsRequestSellerDepositPaymentMessage extends OffererTradeTask { private static final Logger log = LoggerFactory.getLogger(OffererSendsRequestSellerDepositPaymentMessage.class); - public OffererSendsRequestSellerDepositPaymentMessage(TaskRunner taskHandler, OffererTrade offererTrade) { + public OffererSendsRequestSellerDepositPaymentMessage(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); } 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 a59b6745c1..84df7972b1 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 @@ -21,7 +21,7 @@ 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.OffererTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.bitcoinj.core.Coin; @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; public class OffererSignsAndPublishDepositTx extends OffererTradeTask { private static final Logger log = LoggerFactory.getLogger(OffererSignsAndPublishDepositTx.class); - public OffererSignsAndPublishDepositTx(TaskRunner taskHandler, OffererTrade offererTrade) { + public OffererSignsAndPublishDepositTx(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); } 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 dd176a4932..a843a1696f 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 @@ -21,7 +21,7 @@ import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Contract; import io.bitsquare.trade.OffererAsBuyerTrade; import io.bitsquare.trade.OffererAsSellerTrade; -import io.bitsquare.trade.OffererTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import io.bitsquare.util.Utilities; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; public class OffererVerifiesAndSignsContract extends OffererTradeTask { private static final Logger log = LoggerFactory.getLogger(OffererVerifiesAndSignsContract.class); - public OffererVerifiesAndSignsContract(TaskRunner taskHandler, OffererTrade offererTrade) { + public OffererVerifiesAndSignsContract(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); } 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 33f841646c..c5b05d13dc 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 @@ -24,7 +24,6 @@ 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.protocol.trade.ProcessModel; 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; @@ -38,6 +37,7 @@ import io.bitsquare.trade.protocol.trade.buyer.taker.tasks.TakerVerifiesAndSigns import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage; import io.bitsquare.trade.protocol.trade.messages.RequestPublishDepositTxMessage; import io.bitsquare.trade.protocol.trade.messages.TradeMessage; +import io.bitsquare.trade.protocol.trade.shared.models.ProcessModel; import io.bitsquare.trade.protocol.trade.shared.taker.tasks.BroadcastTakeOfferFeeTx; import io.bitsquare.trade.protocol.trade.shared.taker.tasks.CreateTakeOfferFeeTx; import io.bitsquare.trade.protocol.trade.shared.taker.tasks.VerifyOfferFeePayment; 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 5bc63373c7..d34c948dcf 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 @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.bitcoinj.core.Transaction; @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; public class TakerCommitsPayoutTx extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(TakerCommitsPayoutTx.class); - public TakerCommitsPayoutTx(TaskRunner taskHandler, TakerTrade takerTrade) { + public TakerCommitsPayoutTx(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } 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 2ca2e45394..c88656dfb1 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 @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.bitcoinj.core.Coin; @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; public class TakerCreatesAndSignsPayoutTx extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(TakerCreatesAndSignsPayoutTx.class); - public TakerCreatesAndSignsPayoutTx(TaskRunner taskHandler, TakerTrade takerTrade) { + public TakerCreatesAndSignsPayoutTx(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } 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 d715b5a125..f08b2185b5 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 @@ -20,7 +20,7 @@ package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.TradeWalletService; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.bitcoinj.core.Coin; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; public class TakerCreatesDepositTxInputs extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(TakerCreatesDepositTxInputs.class); - public TakerCreatesDepositTxInputs(TaskRunner taskHandler, TakerTrade takerTrade) { + public TakerCreatesDepositTxInputs(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } 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 7275dcf207..58c8591935 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 @@ -20,7 +20,7 @@ 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.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; @@ -33,7 +33,7 @@ import static io.bitsquare.util.Validator.checkTradeId; public class TakerProcessPayoutTxPublishedMessage extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(TakerProcessPayoutTxPublishedMessage.class); - public TakerProcessPayoutTxPublishedMessage(TaskRunner taskHandler, TakerTrade takerTrade) { + public TakerProcessPayoutTxPublishedMessage(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } 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 502f058654..c16dde9785 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 @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.RequestPublishDepositTxFromTakerMessage; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; @@ -31,7 +31,7 @@ import static io.bitsquare.util.Validator.*; public class TakerProcessRequestPublishDepositTxFromTakerMessage extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(TakerProcessRequestPublishDepositTxFromTakerMessage.class); - public TakerProcessRequestPublishDepositTxFromTakerMessage(TaskRunner taskHandler, TakerTrade takerTrade) { + public TakerProcessRequestPublishDepositTxFromTakerMessage(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } 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 d4488b6b94..6cbbc31dda 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 @@ -21,7 +21,7 @@ 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.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; public class TakerSendsDepositTxPublishedMessage extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(TakerSendsDepositTxPublishedMessage.class); - public TakerSendsDepositTxPublishedMessage(TaskRunner taskHandler, TakerTrade takerTrade) { + public TakerSendsDepositTxPublishedMessage(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } 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 8ed68ddfa1..d65eebe6db 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 @@ -21,7 +21,7 @@ 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.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; public class TakerSendsFiatTransferStartedMessage extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(TakerSendsFiatTransferStartedMessage.class); - public TakerSendsFiatTransferStartedMessage(TaskRunner taskHandler, TakerTrade takerTrade) { + public TakerSendsFiatTransferStartedMessage(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } 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 1bcd0dc712..0bd1378853 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 @@ -21,7 +21,7 @@ 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.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.RequestDepositTxInputsMessage; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; public class TakerSendsRequestDepositTxInputsMessage extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(TakerSendsRequestDepositTxInputsMessage.class); - public TakerSendsRequestDepositTxInputsMessage(TaskRunner taskHandler, TakerTrade takerTrade) { + public TakerSendsRequestDepositTxInputsMessage(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } 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 fe56264972..f8fe459e71 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 @@ -21,7 +21,7 @@ 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.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.RequestPayDepositFromOffererMessage; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; public class TakerSendsRequestPayDepositMessage extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(TakerSendsRequestPayDepositMessage.class); - public TakerSendsRequestPayDepositMessage(TaskRunner taskHandler, TakerTrade takerTrade) { + public TakerSendsRequestPayDepositMessage(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } 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 8ad62d689b..964d82d392 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 @@ -21,7 +21,7 @@ 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.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.RequestPublishDepositTxMessage; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; public class TakerSendsRequestPublishDepositTxMessage extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(TakerSendsRequestPublishDepositTxMessage.class); - public TakerSendsRequestPublishDepositTxMessage(TaskRunner taskHandler, TakerTrade takerTrade) { + public TakerSendsRequestPublishDepositTxMessage(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } 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 91433309fc..b9dab9125e 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 @@ -21,7 +21,7 @@ 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.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.bitcoinj.core.Coin; @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; public class TakerSignsAndPublishDepositTx extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(TakerSignsAndPublishDepositTx.class); - public TakerSignsAndPublishDepositTx(TaskRunner taskHandler, TakerTrade takerTrade) { + public TakerSignsAndPublishDepositTx(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } 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 9ce81f7535..f5de63dfcc 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 @@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Contract; -import io.bitsquare.trade.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import io.bitsquare.util.Utilities; @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; public class TakerVerifiesAndSignsContract extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(TakerVerifiesAndSignsContract.class); - public TakerVerifiesAndSignsContract(TaskRunner taskHandler, TakerTrade takerTrade) { + public TakerVerifiesAndSignsContract(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererTradeTask.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererTradeTask.java index 040dc3b6ba..56c293c70a 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererTradeTask.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererTradeTask.java @@ -19,18 +19,18 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.OffererTrade; -import io.bitsquare.trade.protocol.trade.ProcessModel; +import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.shared.models.ProcessModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OffererTradeTask extends Task { +public class OffererTradeTask extends Task { private static final Logger log = LoggerFactory.getLogger(OffererTradeTask.class); protected final ProcessModel processModel; - protected final OffererTrade offererTrade; + protected final Trade offererTrade; - public OffererTradeTask(TaskRunner taskHandler, OffererTrade offererTrade) { + public OffererTradeTask(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); this.offererTrade = offererTrade; 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 25849273cc..210dff75b8 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 @@ -27,7 +27,6 @@ import io.bitsquare.trade.OffererAsSellerTrade; import io.bitsquare.trade.protocol.Protocol; import io.bitsquare.trade.protocol.availability.messages.ReportOfferAvailabilityMessage; import io.bitsquare.trade.protocol.availability.messages.RequestIsOfferAvailableMessage; -import io.bitsquare.trade.protocol.trade.ProcessModel; import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage; import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage; import io.bitsquare.trade.protocol.trade.messages.RequestPayDepositMessage; @@ -41,6 +40,7 @@ import io.bitsquare.trade.protocol.trade.seller.offerer.tasks.OffererProcessRequ import io.bitsquare.trade.protocol.trade.seller.offerer.tasks.OffererSendsPayoutTxPublishedMessage; import io.bitsquare.trade.protocol.trade.seller.offerer.tasks.OffererSendsRequestPublishDepositTxFromTakerMessage; import io.bitsquare.trade.protocol.trade.seller.offerer.tasks.OffererSignsAndPublishPayoutTx; +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; 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 a27beec008..094a81a8f8 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 @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.seller.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.OffererTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.bitcoinj.core.Transaction; @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; public class OffererCommitDepositTx extends OffererTradeTask { private static final Logger log = LoggerFactory.getLogger(OffererCommitDepositTx.class); - public OffererCommitDepositTx(TaskRunner taskHandler, OffererTrade offererTrade) { + public OffererCommitDepositTx(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); } 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 938ae40c08..9b7bd559f1 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 @@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.seller.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Contract; -import io.bitsquare.trade.OffererTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import io.bitsquare.util.Utilities; @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; public class OffererCreatesAndSignsContract extends OffererTradeTask { private static final Logger log = LoggerFactory.getLogger(OffererCreatesAndSignsContract.class); - public OffererCreatesAndSignsContract(TaskRunner taskHandler, OffererTrade offererTrade) { + public OffererCreatesAndSignsContract(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); } 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 792a7a83e5..07018162d2 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 @@ -20,7 +20,7 @@ package io.bitsquare.trade.protocol.trade.seller.offerer.tasks; import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.TradeWalletService; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.OffererTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.bitcoinj.core.Coin; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; public class OffererCreatesAndSignsDepositTx extends OffererTradeTask { private static final Logger log = LoggerFactory.getLogger(OffererCreatesAndSignsDepositTx.class); - public OffererCreatesAndSignsDepositTx(TaskRunner taskHandler, OffererTrade offererTrade) { + public OffererCreatesAndSignsDepositTx(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); } 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 9f7ba05ab3..f3d226dcc3 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 @@ -20,7 +20,7 @@ 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.OffererTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage; import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; @@ -33,7 +33,7 @@ import static io.bitsquare.util.Validator.checkTradeId; public class OffererProcessDepositTxPublishedMessage extends OffererTradeTask { private static final Logger log = LoggerFactory.getLogger(OffererProcessDepositTxPublishedMessage.class); - public OffererProcessDepositTxPublishedMessage(TaskRunner taskHandler, OffererTrade offererTrade) { + public OffererProcessDepositTxPublishedMessage(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); } 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 e13bf730a9..096662f975 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 @@ -20,7 +20,7 @@ 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.OffererTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage; import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; @@ -33,7 +33,7 @@ import static io.bitsquare.util.Validator.*; public class OffererProcessFiatTransferStartedMessage extends OffererTradeTask { private static final Logger log = LoggerFactory.getLogger(OffererProcessFiatTransferStartedMessage.class); - public OffererProcessFiatTransferStartedMessage(TaskRunner taskHandler, OffererTrade offererTrade) { + public OffererProcessFiatTransferStartedMessage(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); } 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 9aa0dd29ac..05a3270802 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 @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.seller.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.OffererTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.RequestPayDepositFromOffererMessage; import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; @@ -31,7 +31,7 @@ import static io.bitsquare.util.Validator.*; public class OffererProcessRequestPayDepositFromOffererMessage extends OffererTradeTask { private static final Logger log = LoggerFactory.getLogger(OffererProcessRequestPayDepositFromOffererMessage.class); - public OffererProcessRequestPayDepositFromOffererMessage(TaskRunner taskHandler, OffererTrade offererTrade) { + public OffererProcessRequestPayDepositFromOffererMessage(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); } 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 9999c775b0..dc12ef218f 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 @@ -21,7 +21,7 @@ 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.OffererTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage; import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; public class OffererSendsPayoutTxPublishedMessage extends OffererTradeTask { private static final Logger log = LoggerFactory.getLogger(OffererSendsPayoutTxPublishedMessage.class); - public OffererSendsPayoutTxPublishedMessage(TaskRunner taskHandler, OffererTrade offererTrade) { + public OffererSendsPayoutTxPublishedMessage(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); } 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 1755020c56..51bfc1d014 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 @@ -21,7 +21,7 @@ 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.OffererTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.RequestPublishDepositTxFromTakerMessage; import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; public class OffererSendsRequestPublishDepositTxFromTakerMessage extends OffererTradeTask { private static final Logger log = LoggerFactory.getLogger(OffererSendsRequestPublishDepositTxFromTakerMessage.class); - public OffererSendsRequestPublishDepositTxFromTakerMessage(TaskRunner taskHandler, OffererTrade offererTrade) { + public OffererSendsRequestPublishDepositTxFromTakerMessage(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); } 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 e0adca79a4..e919e814cf 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 @@ -20,7 +20,7 @@ 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.OffererTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.bitcoinj.core.Transaction; @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory; public class OffererSignsAndPublishPayoutTx extends OffererTradeTask { private static final Logger log = LoggerFactory.getLogger(OffererSignsAndPublishPayoutTx.class); - public OffererSignsAndPublishPayoutTx(TaskRunner taskHandler, OffererTrade offererTrade) { + public OffererSignsAndPublishPayoutTx(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); } 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 46c54c1925..b6a9ca63ba 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 @@ -23,9 +23,8 @@ import io.bitsquare.p2p.Message; import io.bitsquare.p2p.MessageHandler; import io.bitsquare.p2p.Peer; import io.bitsquare.trade.TakerAsSellerTrade; -import io.bitsquare.trade.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.Protocol; -import io.bitsquare.trade.protocol.trade.ProcessModel; 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; @@ -40,6 +39,7 @@ import io.bitsquare.trade.protocol.trade.seller.taker.tasks.TakerProcessFiatTran import io.bitsquare.trade.protocol.trade.seller.taker.tasks.TakerProcessRequestSellerDepositPaymentMessage; import io.bitsquare.trade.protocol.trade.seller.taker.tasks.TakerSendsPayoutTxPublishedMessage; import io.bitsquare.trade.protocol.trade.seller.taker.tasks.TakerSignsAndPublishPayoutTx; +import io.bitsquare.trade.protocol.trade.shared.models.ProcessModel; import io.bitsquare.trade.protocol.trade.shared.taker.tasks.BroadcastTakeOfferFeeTx; import io.bitsquare.trade.protocol.trade.shared.taker.tasks.CreateTakeOfferFeeTx; import io.bitsquare.trade.protocol.trade.shared.taker.tasks.VerifyOfferFeePayment; @@ -96,7 +96,7 @@ public class SellerAsTakerProtocol implements Protocol { } public void takeAvailableOffer() { - TaskRunner taskRunner = new TaskRunner<>(takerAsSellerTrade, + TaskRunner taskRunner = new TaskRunner<>(takerAsSellerTrade, () -> log.debug("taskRunner at takeAvailableOffer completed"), this::handleTaskRunnerFault); @@ -116,7 +116,7 @@ public class SellerAsTakerProtocol implements Protocol { private void handleRequestTakerDepositPaymentMessage(RequestPayDepositMessage tradeMessage) { processModel.setTradeMessage(tradeMessage); - TaskRunner taskRunner = new TaskRunner<>(takerAsSellerTrade, + TaskRunner taskRunner = new TaskRunner<>(takerAsSellerTrade, () -> log.debug("taskRunner at handleTakerDepositPaymentRequestMessage completed"), this::handleTaskRunnerFault); 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 8418244d21..e7001c5c04 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 @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.seller.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.bitcoinj.core.Transaction; @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; public class TakerCommitDepositTx extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(TakerCommitDepositTx.class); - public TakerCommitDepositTx(TaskRunner taskHandler, TakerTrade takerTrade) { + public TakerCommitDepositTx(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } 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 f0568ecaeb..e51b5fd0a7 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 @@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.seller.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Contract; -import io.bitsquare.trade.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import io.bitsquare.util.Utilities; @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; public class TakerCreatesAndSignContract extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(TakerCreatesAndSignContract.class); - public TakerCreatesAndSignContract(TaskRunner taskHandler, TakerTrade takerTrade) { + public TakerCreatesAndSignContract(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } 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 17aac25c60..04a686ea7f 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 @@ -20,7 +20,7 @@ package io.bitsquare.trade.protocol.trade.seller.taker.tasks; import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.TradeWalletService; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.bitcoinj.core.Coin; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; public class TakerCreatesAndSignsDepositTx extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(TakerCreatesAndSignsDepositTx.class); - public TakerCreatesAndSignsDepositTx(TaskRunner taskHandler, TakerTrade takerTrade) { + public TakerCreatesAndSignsDepositTx(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } 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 173ab7a3ad..e54262ff56 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 @@ -20,7 +20,7 @@ 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.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; @@ -33,7 +33,7 @@ import static io.bitsquare.util.Validator.checkTradeId; public class TakerProcessDepositTxPublishedMessage extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(TakerProcessDepositTxPublishedMessage.class); - public TakerProcessDepositTxPublishedMessage(TaskRunner taskHandler, TakerTrade takerTrade) { + public TakerProcessDepositTxPublishedMessage(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } 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 0d6faa6970..30c702541c 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 @@ -20,7 +20,7 @@ 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.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; @@ -33,7 +33,7 @@ import static io.bitsquare.util.Validator.*; public class TakerProcessFiatTransferStartedMessage extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(TakerProcessFiatTransferStartedMessage.class); - public TakerProcessFiatTransferStartedMessage(TaskRunner taskHandler, TakerTrade takerTrade) { + public TakerProcessFiatTransferStartedMessage(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } 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 bdce11545d..fcb8fd1654 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 @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.seller.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.RequestPayDepositMessage; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; @@ -31,7 +31,7 @@ import static io.bitsquare.util.Validator.*; public class TakerProcessRequestSellerDepositPaymentMessage extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(TakerProcessRequestSellerDepositPaymentMessage.class); - public TakerProcessRequestSellerDepositPaymentMessage(TaskRunner taskHandler, TakerTrade takerTrade) { + public TakerProcessRequestSellerDepositPaymentMessage(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } 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 2c22b791ac..8f1f20a732 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 @@ -21,7 +21,7 @@ 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.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; public class TakerSendsPayoutTxPublishedMessage extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(TakerSendsPayoutTxPublishedMessage.class); - public TakerSendsPayoutTxPublishedMessage(TaskRunner taskHandler, TakerTrade takerTrade) { + public TakerSendsPayoutTxPublishedMessage(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } 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 cc7bc7a6d7..bed24552b4 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 @@ -20,7 +20,7 @@ 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.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.bitcoinj.core.Transaction; @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory; public class TakerSignsAndPublishPayoutTx extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(TakerSignsAndPublishPayoutTx.class); - public TakerSignsAndPublishPayoutTx(TaskRunner taskHandler, TakerTrade takerTrade) { + public TakerSignsAndPublishPayoutTx(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/ProcessModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/models/ProcessModel.java similarity index 98% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/ProcessModel.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/shared/models/ProcessModel.java index d8b1abc26a..b920daa86b 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/ProcessModel.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/models/ProcessModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade; +package io.bitsquare.trade.protocol.trade.shared.models; import io.bitsquare.arbitration.ArbitrationRepository; import io.bitsquare.btc.AddressEntry; @@ -29,7 +29,6 @@ import io.bitsquare.offer.Offer; import io.bitsquare.p2p.MailboxMessage; import io.bitsquare.p2p.MessageService; import io.bitsquare.trade.protocol.trade.messages.TradeMessage; -import io.bitsquare.trade.protocol.trade.shared.models.TradingPeer; import io.bitsquare.user.User; import org.bitcoinj.core.Coin; 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 ed1b7a2a23..d167eb90eb 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 @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.shared.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.OffererTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.slf4j.Logger; @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; public class VerifyTakeOfferFeePayment extends OffererTradeTask { private static final Logger log = LoggerFactory.getLogger(VerifyTakeOfferFeePayment.class); - public VerifyTakeOfferFeePayment(TaskRunner taskHandler, OffererTrade offererTrade) { + public VerifyTakeOfferFeePayment(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); } 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 a284f93438..d9d6e1be54 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 @@ -20,7 +20,7 @@ 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.OffererTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.slf4j.Logger; @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; public class VerifyTakerAccount extends OffererTradeTask { private static final Logger log = LoggerFactory.getLogger(VerifyTakerAccount.class); - public VerifyTakerAccount(TaskRunner taskHandler, OffererTrade offererTrade) { + public VerifyTakerAccount(TaskRunner taskHandler, Trade offererTrade) { super(taskHandler, offererTrade); } @@ -38,10 +38,10 @@ public class VerifyTakerAccount extends OffererTradeTask { try { //TODO mocked yet if (processModel.getBlockChainService().verifyAccountRegistration()) { - if (processModel.getBlockChainService().isAccountBlackListed(processModel.tradingPeer.getAccountId(), + if (processModel.getBlockChainService().isAccountBlackListed(processModel.tradingPeer.getAccountId(), processModel - .tradingPeer - .getFiatAccount())) { + .tradingPeer + .getFiatAccount())) { log.error("Taker is blacklisted"); failed("Taker is blacklisted"); } 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 9869c8c2ca..7105717cde 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 @@ -20,7 +20,7 @@ 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.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.bitcoinj.core.Transaction; @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory; public class BroadcastTakeOfferFeeTx extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(BroadcastTakeOfferFeeTx.class); - public BroadcastTakeOfferFeeTx(TaskRunner taskHandler, TakerTrade takerTrade) { + public BroadcastTakeOfferFeeTx(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } 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 7329774473..e738643bf0 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 @@ -20,7 +20,7 @@ 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.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.bitcoinj.core.Transaction; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; public class CreateTakeOfferFeeTx extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(CreateTakeOfferFeeTx.class); - public CreateTakeOfferFeeTx(TaskRunner taskHandler, TakerTrade takerTrade) { + public CreateTakeOfferFeeTx(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } 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 d844d86219..1429ce67a2 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 @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.shared.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.slf4j.Logger; @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; public class VerifyOfferFeePayment extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(VerifyOfferFeePayment.class); - public VerifyOfferFeePayment(TaskRunner taskHandler, TakerTrade takerTrade) { + public VerifyOfferFeePayment(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } 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 db10ae9ebf..fb2396198c 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 @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.shared.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.TakerTrade; +import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.slf4j.Logger; @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; public class VerifyOffererAccount extends TakerTradeTask { private static final Logger log = LoggerFactory.getLogger(VerifyOffererAccount.class); - public VerifyOffererAccount(TaskRunner taskHandler, TakerTrade takerTrade) { + public VerifyOffererAccount(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); } 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/taker/tasks/TakerTradeTask.java index 2d15e4d3e6..cc971554fd 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/taker/tasks/TakerTradeTask.java @@ -19,18 +19,18 @@ package io.bitsquare.trade.protocol.trade.taker.tasks; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.TakerTrade; -import io.bitsquare.trade.protocol.trade.ProcessModel; +import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.shared.models.ProcessModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerTradeTask extends Task { +public class TakerTradeTask extends Task { private static final Logger log = LoggerFactory.getLogger(TakerTradeTask.class); protected final ProcessModel processModel; - protected final TakerTrade takerTrade; + protected final Trade takerTrade; - public TakerTradeTask(TaskRunner taskHandler, TakerTrade takerTrade) { + public TakerTradeTask(TaskRunner taskHandler, Trade takerTrade) { super(taskHandler, takerTrade); this.takerTrade = takerTrade;