From 34192dd808a6bf3383460119a86716aca29c304c Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 2 Apr 2015 11:54:39 +0200 Subject: [PATCH] Changed package structure for buyer/seller/offerer/taker --- .../bitsquare/gui/main/debug/DebugView.java | 58 +++++++++---------- .../bitsquare/trade/OffererAsBuyerTrade.java | 8 +-- .../bitsquare/trade/OffererAsSellerTrade.java | 8 +-- .../io/bitsquare/trade/TakerAsBuyerTrade.java | 12 ++-- .../bitsquare/trade/TakerAsSellerTrade.java | 12 ++-- .../offerer/BuyerAsOffererProtocol.java} | 34 +++++------ .../offerer/tasks/OffererCommitsPayoutTx.java | 3 +- .../tasks/OffererCreatesAndSignPayoutTx.java | 3 +- .../tasks/OffererCreatesDepositTxInputs.java | 3 +- ...ffererProcessPayoutTxPublishedMessage.java | 3 +- ...rProcessRequestDepositTxInputsMessage.java | 3 +- ...ProcessRequestPublishDepositTxMessage.java | 3 +- ...OffererSendsDepositTxPublishedMessage.java | 3 +- ...ffererSendsFiatTransferStartedMessage.java | 3 +- ...ndsRequestSellerDepositPaymentMessage.java | 3 +- .../OffererSignsAndPublishDepositTx.java | 3 +- .../OffererVerifiesAndSignsContract.java | 3 +- .../taker/BuyerAsTakerProtocol.java} | 36 ++++++------ .../taker/tasks/TakerCommitsPayoutTx.java | 3 +- .../tasks/TakerCreatesAndSignsPayoutTx.java | 3 +- .../tasks/TakerCreatesDepositTxInputs.java | 3 +- .../TakerProcessPayoutTxPublishedMessage.java | 3 +- ...questPublishDepositTxFromTakerMessage.java | 3 +- .../TakerSendsDepositTxPublishedMessage.java | 3 +- .../TakerSendsFiatTransferStartedMessage.java | 3 +- ...kerSendsRequestDepositTxInputsMessage.java | 3 +- .../TakerSendsRequestPayDepositMessage.java | 3 +- ...erSendsRequestPublishDepositTxMessage.java | 3 +- .../tasks/TakerSignsAndPublishDepositTx.java | 3 +- .../tasks/TakerVerifiesAndSignsContract.java | 3 +- .../trade/offerer/tasks/OffererTradeTask.java | 4 +- .../offerer/SellerAsOffererProtocol.java} | 32 +++++----- .../offerer/tasks/OffererCommitDepositTx.java | 3 +- .../tasks/OffererCreatesAndSignsContract.java | 3 +- .../OffererCreatesAndSignsDepositTx.java | 3 +- ...fererProcessDepositTxPublishedMessage.java | 3 +- ...ererProcessFiatTransferStartedMessage.java | 3 +- ...ssRequestPayDepositFromOffererMessage.java | 3 +- .../OffererSendsPayoutTxPublishedMessage.java | 3 +- ...questPublishDepositTxFromTakerMessage.java | 3 +- .../tasks/OffererSignsAndPublishPayoutTx.java | 3 +- .../taker/SellerAsTakerProtocol.java} | 36 ++++++------ .../taker/tasks/TakerCommitDepositTx.java | 3 +- .../tasks/TakerCreatesAndSignContract.java | 3 +- .../tasks/TakerCreatesAndSignsDepositTx.java | 3 +- ...TakerProcessDepositTxPublishedMessage.java | 3 +- ...akerProcessFiatTransferStartedMessage.java | 3 +- ...essRequestSellerDepositPaymentMessage.java | 3 +- .../TakerSendsPayoutTxPublishedMessage.java | 3 +- .../tasks/TakerSignsAndPublishPayoutTx.java | 3 +- .../tasks/VerifyTakeOfferFeePayment.java | 3 +- .../offerer/tasks/VerifyTakerAccount.java | 3 +- .../taker/tasks/BroadcastTakeOfferFeeTx.java | 3 +- .../taker/tasks/CreateTakeOfferFeeTx.java | 3 +- .../taker/tasks/VerifyOfferFeePayment.java | 3 +- .../taker/tasks/VerifyOffererAccount.java | 3 +- .../trade/taker/tasks/TakerTradeTask.java | 4 +- 57 files changed, 214 insertions(+), 168 deletions(-) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{offerer/OffererAsBuyerProtocol.java => buyer/offerer/BuyerAsOffererProtocol.java} (87%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/offerer/tasks/OffererCommitsPayoutTx.java (92%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/offerer/tasks/OffererCreatesAndSignPayoutTx.java (95%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/offerer/tasks/OffererCreatesDepositTxInputs.java (94%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/offerer/tasks/OffererProcessPayoutTxPublishedMessage.java (94%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/offerer/tasks/OffererProcessRequestDepositTxInputsMessage.java (95%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/offerer/tasks/OffererProcessRequestPublishDepositTxMessage.java (96%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/offerer/tasks/OffererSendsDepositTxPublishedMessage.java (95%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/offerer/tasks/OffererSendsFiatTransferStartedMessage.java (96%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/offerer/tasks/OffererSendsRequestSellerDepositPaymentMessage.java (96%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/offerer/tasks/OffererSignsAndPublishDepositTx.java (97%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/offerer/tasks/OffererVerifiesAndSignsContract.java (95%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{taker/TakerAsBuyerProtocol.java => buyer/taker/BuyerAsTakerProtocol.java} (83%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/taker/tasks/TakerCommitsPayoutTx.java (92%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/taker/tasks/TakerCreatesAndSignsPayoutTx.java (95%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/taker/tasks/TakerCreatesDepositTxInputs.java (93%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/taker/tasks/TakerProcessPayoutTxPublishedMessage.java (94%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/taker/tasks/TakerProcessRequestPublishDepositTxFromTakerMessage.java (96%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/taker/tasks/TakerSendsDepositTxPublishedMessage.java (95%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/taker/tasks/TakerSendsFiatTransferStartedMessage.java (96%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/taker/tasks/TakerSendsRequestDepositTxInputsMessage.java (96%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/taker/tasks/TakerSendsRequestPayDepositMessage.java (96%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/taker/tasks/TakerSendsRequestPublishDepositTxMessage.java (96%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/taker/tasks/TakerSignsAndPublishDepositTx.java (96%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => buyer}/taker/tasks/TakerVerifiesAndSignsContract.java (95%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{offerer/OffererAsSellerProtocol.java => seller/offerer/SellerAsOffererProtocol.java} (88%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => seller}/offerer/tasks/OffererCommitDepositTx.java (92%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => seller}/offerer/tasks/OffererCreatesAndSignsContract.java (94%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => seller}/offerer/tasks/OffererCreatesAndSignsDepositTx.java (95%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => seller}/offerer/tasks/OffererProcessDepositTxPublishedMessage.java (94%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => seller}/offerer/tasks/OffererProcessFiatTransferStartedMessage.java (95%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => seller}/offerer/tasks/OffererProcessRequestPayDepositFromOffererMessage.java (95%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => seller}/offerer/tasks/OffererSendsPayoutTxPublishedMessage.java (95%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => seller}/offerer/tasks/OffererSendsRequestPublishDepositTxFromTakerMessage.java (96%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => seller}/offerer/tasks/OffererSignsAndPublishPayoutTx.java (96%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{taker/TakerAsSellerProtocol.java => seller/taker/SellerAsTakerProtocol.java} (84%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => seller}/taker/tasks/TakerCommitDepositTx.java (92%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => seller}/taker/tasks/TakerCreatesAndSignContract.java (95%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => seller}/taker/tasks/TakerCreatesAndSignsDepositTx.java (95%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => seller}/taker/tasks/TakerProcessDepositTxPublishedMessage.java (94%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => seller}/taker/tasks/TakerProcessFiatTransferStartedMessage.java (95%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => seller}/taker/tasks/TakerProcessRequestSellerDepositPaymentMessage.java (95%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => seller}/taker/tasks/TakerSendsPayoutTxPublishedMessage.java (95%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => seller}/taker/tasks/TakerSignsAndPublishPayoutTx.java (96%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => shared}/offerer/tasks/VerifyTakeOfferFeePayment.java (92%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => shared}/offerer/tasks/VerifyTakerAccount.java (95%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => shared}/taker/tasks/BroadcastTakeOfferFeeTx.java (96%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => shared}/taker/tasks/CreateTakeOfferFeeTx.java (94%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => shared}/taker/tasks/VerifyOfferFeePayment.java (92%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/{ => shared}/taker/tasks/VerifyOffererAccount.java (93%) diff --git a/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java b/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java index 0fb99f52e5..fb859cdbd3 100644 --- a/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java +++ b/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java @@ -28,33 +28,33 @@ import io.bitsquare.trade.protocol.placeoffer.tasks.AddOfferToRemoteOfferBook; import io.bitsquare.trade.protocol.placeoffer.tasks.BroadcastCreateOfferFeeTx; import io.bitsquare.trade.protocol.placeoffer.tasks.CreateOfferFeeTx; import io.bitsquare.trade.protocol.placeoffer.tasks.ValidateOffer; -import io.bitsquare.trade.protocol.trade.offerer.OffererAsBuyerProtocol; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererCreatesAndSignPayoutTx; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererCreatesDepositTxInputs; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererProcessPayoutTxPublishedMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererProcessRequestDepositTxInputsMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererProcessRequestPublishDepositTxMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererSendsRequestSellerDepositPaymentMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererSendsFiatTransferStartedMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererSendsDepositTxPublishedMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererSignsAndPublishDepositTx; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererVerifiesAndSignsContract; -import io.bitsquare.trade.protocol.trade.offerer.tasks.VerifyTakeOfferFeePayment; -import io.bitsquare.trade.protocol.trade.offerer.tasks.VerifyTakerAccount; -import io.bitsquare.trade.protocol.trade.taker.TakerAsSellerProtocol; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCreatesAndSignContract; -import io.bitsquare.trade.protocol.trade.taker.tasks.CreateTakeOfferFeeTx; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerProcessDepositTxPublishedMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerProcessFiatTransferStartedMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerProcessRequestSellerDepositPaymentMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerSendsPayoutTxPublishedMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerSendsRequestDepositTxInputsMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerSendsRequestPublishDepositTxMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerSignsAndPublishPayoutTx; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCommitDepositTx; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCreatesAndSignsDepositTx; -import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOfferFeePayment; -import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOffererAccount; +import io.bitsquare.trade.protocol.trade.buyer.offerer.BuyerAsOffererProtocol; +import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererCreatesAndSignPayoutTx; +import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererCreatesDepositTxInputs; +import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererProcessPayoutTxPublishedMessage; +import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererProcessRequestDepositTxInputsMessage; +import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererProcessRequestPublishDepositTxMessage; +import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererSendsRequestSellerDepositPaymentMessage; +import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererSendsFiatTransferStartedMessage; +import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererSendsDepositTxPublishedMessage; +import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererSignsAndPublishDepositTx; +import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererVerifiesAndSignsContract; +import io.bitsquare.trade.protocol.trade.shared.offerer.tasks.VerifyTakeOfferFeePayment; +import io.bitsquare.trade.protocol.trade.shared.offerer.tasks.VerifyTakerAccount; +import io.bitsquare.trade.protocol.trade.seller.taker.SellerAsTakerProtocol; +import io.bitsquare.trade.protocol.trade.seller.taker.tasks.TakerCreatesAndSignContract; +import io.bitsquare.trade.protocol.trade.shared.taker.tasks.CreateTakeOfferFeeTx; +import io.bitsquare.trade.protocol.trade.seller.taker.tasks.TakerProcessDepositTxPublishedMessage; +import io.bitsquare.trade.protocol.trade.seller.taker.tasks.TakerProcessFiatTransferStartedMessage; +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.buyer.taker.tasks.TakerSendsRequestDepositTxInputsMessage; +import io.bitsquare.trade.protocol.trade.buyer.taker.tasks.TakerSendsRequestPublishDepositTxMessage; +import io.bitsquare.trade.protocol.trade.seller.taker.tasks.TakerSignsAndPublishPayoutTx; +import io.bitsquare.trade.protocol.trade.seller.taker.tasks.TakerCommitDepositTx; +import io.bitsquare.trade.protocol.trade.seller.taker.tasks.TakerCreatesAndSignsDepositTx; +import io.bitsquare.trade.protocol.trade.shared.taker.tasks.VerifyOfferFeePayment; +import io.bitsquare.trade.protocol.trade.shared.taker.tasks.VerifyOffererAccount; import java.util.Arrays; @@ -100,7 +100,7 @@ public class DebugView extends InitializableView { /*---- Protocol ----*/ - OffererAsBuyerProtocol.class, + BuyerAsOffererProtocol.class, OffererProcessRequestDepositTxInputsMessage.class, OffererCreatesDepositTxInputs.class, OffererSendsRequestSellerDepositPaymentMessage.class, @@ -120,7 +120,7 @@ public class DebugView extends InitializableView { /*---- Protocol ----*/ - TakerAsSellerProtocol.class, + SellerAsTakerProtocol.class, CreateTakeOfferFeeTx.class, TakerSendsRequestDepositTxInputsMessage.class, diff --git a/core/src/main/java/io/bitsquare/trade/OffererAsBuyerTrade.java b/core/src/main/java/io/bitsquare/trade/OffererAsBuyerTrade.java index 95c8dcf511..4402203a7f 100644 --- a/core/src/main/java/io/bitsquare/trade/OffererAsBuyerTrade.java +++ b/core/src/main/java/io/bitsquare/trade/OffererAsBuyerTrade.java @@ -19,7 +19,7 @@ package io.bitsquare.trade; import io.bitsquare.offer.Offer; import io.bitsquare.storage.Storage; -import io.bitsquare.trade.protocol.trade.offerer.OffererAsBuyerProtocol; +import io.bitsquare.trade.protocol.trade.buyer.offerer.BuyerAsOffererProtocol; import java.io.IOException; import java.io.ObjectInputStream; @@ -81,7 +81,7 @@ public class OffererAsBuyerTrade extends OffererTrade implements Serializable { @Override protected void createProtocol() { - protocol = new OffererAsBuyerProtocol(this); + protocol = new BuyerAsOffererProtocol(this); } @Override @@ -97,8 +97,8 @@ public class OffererAsBuyerTrade extends OffererTrade implements Serializable { /////////////////////////////////////////////////////////////////////////////////////////// public void onFiatPaymentStarted() { - assert protocol instanceof OffererAsBuyerProtocol; - ((OffererAsBuyerProtocol) protocol).onFiatPaymentStarted(); + assert protocol instanceof BuyerAsOffererProtocol; + ((BuyerAsOffererProtocol) protocol).onFiatPaymentStarted(); } diff --git a/core/src/main/java/io/bitsquare/trade/OffererAsSellerTrade.java b/core/src/main/java/io/bitsquare/trade/OffererAsSellerTrade.java index f079b61bf3..5dd005643f 100644 --- a/core/src/main/java/io/bitsquare/trade/OffererAsSellerTrade.java +++ b/core/src/main/java/io/bitsquare/trade/OffererAsSellerTrade.java @@ -19,7 +19,7 @@ package io.bitsquare.trade; import io.bitsquare.offer.Offer; import io.bitsquare.storage.Storage; -import io.bitsquare.trade.protocol.trade.offerer.OffererAsSellerProtocol; +import io.bitsquare.trade.protocol.trade.seller.offerer.SellerAsOffererProtocol; import java.io.IOException; import java.io.ObjectInputStream; @@ -83,7 +83,7 @@ public class OffererAsSellerTrade extends OffererTrade implements Serializable { @Override protected void createProtocol() { - protocol = new OffererAsSellerProtocol(this); + protocol = new SellerAsOffererProtocol(this); } @Override @@ -99,8 +99,8 @@ public class OffererAsSellerTrade extends OffererTrade implements Serializable { /////////////////////////////////////////////////////////////////////////////////////////// public void onFiatPaymentReceived() { - assert protocol instanceof OffererAsSellerProtocol; - ((OffererAsSellerProtocol) protocol).onFiatPaymentReceived(); + assert protocol instanceof SellerAsOffererProtocol; + ((SellerAsOffererProtocol) protocol).onFiatPaymentReceived(); } diff --git a/core/src/main/java/io/bitsquare/trade/TakerAsBuyerTrade.java b/core/src/main/java/io/bitsquare/trade/TakerAsBuyerTrade.java index abba8a5538..f40513a84c 100644 --- a/core/src/main/java/io/bitsquare/trade/TakerAsBuyerTrade.java +++ b/core/src/main/java/io/bitsquare/trade/TakerAsBuyerTrade.java @@ -20,7 +20,7 @@ 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.taker.TakerAsBuyerProtocol; +import io.bitsquare.trade.protocol.trade.buyer.taker.BuyerAsTakerProtocol; import org.bitcoinj.core.Coin; @@ -93,7 +93,7 @@ public class TakerAsBuyerTrade extends TakerTrade implements Serializable { @Override public void createProtocol() { - protocol = new TakerAsBuyerProtocol(this); + protocol = new BuyerAsTakerProtocol(this); } @@ -103,13 +103,13 @@ public class TakerAsBuyerTrade extends TakerTrade implements Serializable { @Override public void takeAvailableOffer() { - assert protocol instanceof TakerAsBuyerProtocol; - ((TakerAsBuyerProtocol) protocol).takeAvailableOffer(); + assert protocol instanceof BuyerAsTakerProtocol; + ((BuyerAsTakerProtocol) protocol).takeAvailableOffer(); } public void onFiatPaymentStarted() { - assert protocol instanceof TakerAsBuyerProtocol; - ((TakerAsBuyerProtocol) protocol).onFiatPaymentStarted(); + assert protocol instanceof BuyerAsTakerProtocol; + ((BuyerAsTakerProtocol) protocol).onFiatPaymentStarted(); } diff --git a/core/src/main/java/io/bitsquare/trade/TakerAsSellerTrade.java b/core/src/main/java/io/bitsquare/trade/TakerAsSellerTrade.java index a4f9c0af31..1e2a27ab98 100644 --- a/core/src/main/java/io/bitsquare/trade/TakerAsSellerTrade.java +++ b/core/src/main/java/io/bitsquare/trade/TakerAsSellerTrade.java @@ -20,7 +20,7 @@ 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.taker.TakerAsSellerProtocol; +import io.bitsquare.trade.protocol.trade.seller.taker.SellerAsTakerProtocol; import org.bitcoinj.core.Coin; @@ -93,7 +93,7 @@ public class TakerAsSellerTrade extends TakerTrade implements Serializable { @Override public void createProtocol() { - protocol = new TakerAsSellerProtocol(this); + protocol = new SellerAsTakerProtocol(this); } @@ -103,13 +103,13 @@ public class TakerAsSellerTrade extends TakerTrade implements Serializable { @Override public void takeAvailableOffer() { - assert protocol instanceof TakerAsSellerProtocol; - ((TakerAsSellerProtocol) protocol).takeAvailableOffer(); + assert protocol instanceof SellerAsTakerProtocol; + ((SellerAsTakerProtocol) protocol).takeAvailableOffer(); } public void onFiatPaymentReceived() { - assert protocol instanceof TakerAsSellerProtocol; - ((TakerAsSellerProtocol) protocol).onFiatPaymentReceived(); + assert protocol instanceof SellerAsTakerProtocol; + ((SellerAsTakerProtocol) protocol).onFiatPaymentReceived(); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/OffererAsBuyerProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/BuyerAsOffererProtocol.java similarity index 87% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/OffererAsBuyerProtocol.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/BuyerAsOffererProtocol.java index 9ac2d17a1d..f996747901 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/OffererAsBuyerProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/BuyerAsOffererProtocol.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer; +package io.bitsquare.trade.protocol.trade.buyer.offerer; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.MailboxMessage; @@ -27,32 +27,32 @@ 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.buyer.offerer.tasks.OffererCommitsPayoutTx; +import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererCreatesAndSignPayoutTx; +import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererCreatesDepositTxInputs; +import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererProcessPayoutTxPublishedMessage; +import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererProcessRequestDepositTxInputsMessage; +import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererProcessRequestPublishDepositTxMessage; +import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererSendsDepositTxPublishedMessage; +import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererSendsFiatTransferStartedMessage; +import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererSendsRequestSellerDepositPaymentMessage; +import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererSignsAndPublishDepositTx; +import io.bitsquare.trade.protocol.trade.buyer.offerer.tasks.OffererVerifiesAndSignsContract; 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.offerer.models.OffererProcessModel; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererCommitsPayoutTx; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererCreatesAndSignPayoutTx; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererCreatesDepositTxInputs; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererProcessPayoutTxPublishedMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererProcessRequestDepositTxInputsMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererProcessRequestPublishDepositTxMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererSendsDepositTxPublishedMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererSendsFiatTransferStartedMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererSendsRequestSellerDepositPaymentMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererSignsAndPublishDepositTx; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererVerifiesAndSignsContract; -import io.bitsquare.trade.protocol.trade.offerer.tasks.VerifyTakeOfferFeePayment; -import io.bitsquare.trade.protocol.trade.offerer.tasks.VerifyTakerAccount; +import io.bitsquare.trade.protocol.trade.shared.offerer.tasks.VerifyTakeOfferFeePayment; +import io.bitsquare.trade.protocol.trade.shared.offerer.tasks.VerifyTakerAccount; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static io.bitsquare.util.Validator.*; -public class OffererAsBuyerProtocol implements Protocol { - private static final Logger log = LoggerFactory.getLogger(OffererAsBuyerProtocol.class); +public class BuyerAsOffererProtocol implements Protocol { + private static final Logger log = LoggerFactory.getLogger(BuyerAsOffererProtocol.class); private MessageHandler messageHandler; private final OffererAsBuyerTrade offererAsBuyerTrade; @@ -62,7 +62,7 @@ public class OffererAsBuyerProtocol implements Protocol { // Constructor /////////////////////////////////////////////////////////////////////////////////////////// - public OffererAsBuyerProtocol(OffererAsBuyerTrade model) { + public BuyerAsOffererProtocol(OffererAsBuyerTrade model) { log.debug("New OffererProtocol " + this); this.offererAsBuyerTrade = model; offererTradeProcessModel = offererAsBuyerTrade.getProcessModel(); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererCommitsPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererCommitsPayoutTx.java similarity index 92% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererCommitsPayoutTx.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererCommitsPayoutTx.java index c42ad79281..27f9f7bc84 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererCommitsPayoutTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererCommitsPayoutTx.java @@ -15,10 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; +package io.bitsquare.trade.protocol.trade.buyer.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.OffererTrade; +import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.bitcoinj.core.Transaction; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererCreatesAndSignPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererCreatesAndSignPayoutTx.java similarity index 95% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererCreatesAndSignPayoutTx.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererCreatesAndSignPayoutTx.java index a5cbf51703..c3796fb325 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererCreatesAndSignPayoutTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererCreatesAndSignPayoutTx.java @@ -15,10 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; +package io.bitsquare.trade.protocol.trade.buyer.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.OffererTrade; +import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.bitcoinj.core.Coin; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererCreatesDepositTxInputs.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererCreatesDepositTxInputs.java similarity index 94% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererCreatesDepositTxInputs.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererCreatesDepositTxInputs.java index 65cbe95061..fad6b69d2a 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererCreatesDepositTxInputs.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererCreatesDepositTxInputs.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; +package io.bitsquare.trade.protocol.trade.buyer.offerer.tasks; import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.TradeWalletService; @@ -23,6 +23,7 @@ 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.protocol.trade.offerer.tasks.OffererTradeTask; import org.bitcoinj.core.Coin; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererProcessPayoutTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererProcessPayoutTxPublishedMessage.java similarity index 94% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererProcessPayoutTxPublishedMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererProcessPayoutTxPublishedMessage.java index bb8f946e7d..40e6166108 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererProcessPayoutTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererProcessPayoutTxPublishedMessage.java @@ -15,13 +15,14 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; +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.protocol.trade.messages.PayoutTxPublishedMessage; +import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererProcessRequestDepositTxInputsMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererProcessRequestDepositTxInputsMessage.java similarity index 95% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererProcessRequestDepositTxInputsMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererProcessRequestDepositTxInputsMessage.java index 5cc84da4f6..6e4fd31095 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererProcessRequestDepositTxInputsMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererProcessRequestDepositTxInputsMessage.java @@ -15,13 +15,14 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; +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.protocol.trade.messages.RequestDepositTxInputsMessage; +import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererProcessRequestPublishDepositTxMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererProcessRequestPublishDepositTxMessage.java similarity index 96% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererProcessRequestPublishDepositTxMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererProcessRequestPublishDepositTxMessage.java index f0138c4fdd..b416c3bf20 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererProcessRequestPublishDepositTxMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererProcessRequestPublishDepositTxMessage.java @@ -15,13 +15,14 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; +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.protocol.trade.messages.RequestPublishDepositTxMessage; +import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererSendsDepositTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSendsDepositTxPublishedMessage.java similarity index 95% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererSendsDepositTxPublishedMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSendsDepositTxPublishedMessage.java index bdcff1b212..310d35d34f 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererSendsDepositTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSendsDepositTxPublishedMessage.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; +package io.bitsquare.trade.protocol.trade.buyer.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; @@ -23,6 +23,7 @@ import io.bitsquare.trade.OffererAsBuyerTrade; import io.bitsquare.trade.OffererAsSellerTrade; import io.bitsquare.trade.OffererTrade; import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage; +import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererSendsFiatTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSendsFiatTransferStartedMessage.java similarity index 96% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererSendsFiatTransferStartedMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSendsFiatTransferStartedMessage.java index f1f74ff52a..ff30ed40fb 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererSendsFiatTransferStartedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSendsFiatTransferStartedMessage.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; +package io.bitsquare.trade.protocol.trade.buyer.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; @@ -23,6 +23,7 @@ import io.bitsquare.trade.OffererAsBuyerTrade; import io.bitsquare.trade.OffererAsSellerTrade; import io.bitsquare.trade.OffererTrade; import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage; +import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererSendsRequestSellerDepositPaymentMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSendsRequestSellerDepositPaymentMessage.java similarity index 96% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererSendsRequestSellerDepositPaymentMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSendsRequestSellerDepositPaymentMessage.java index af25b8ae11..bedc45835c 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererSendsRequestSellerDepositPaymentMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSendsRequestSellerDepositPaymentMessage.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; +package io.bitsquare.trade.protocol.trade.buyer.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; @@ -23,6 +23,7 @@ import io.bitsquare.trade.OffererAsBuyerTrade; import io.bitsquare.trade.OffererAsSellerTrade; import io.bitsquare.trade.OffererTrade; import io.bitsquare.trade.protocol.trade.messages.RequestPayDepositMessage; +import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererSignsAndPublishDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSignsAndPublishDepositTx.java similarity index 97% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererSignsAndPublishDepositTx.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSignsAndPublishDepositTx.java index 83dd201ae6..540302e998 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererSignsAndPublishDepositTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererSignsAndPublishDepositTx.java @@ -15,13 +15,14 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; +package io.bitsquare.trade.protocol.trade.buyer.offerer.tasks; import io.bitsquare.btc.FeePolicy; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.OffererAsBuyerTrade; import io.bitsquare.trade.OffererAsSellerTrade; import io.bitsquare.trade.OffererTrade; +import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.bitcoinj.core.Coin; import org.bitcoinj.core.Transaction; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererVerifiesAndSignsContract.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererVerifiesAndSignsContract.java similarity index 95% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererVerifiesAndSignsContract.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererVerifiesAndSignsContract.java index da5f421414..232a9f2694 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererVerifiesAndSignsContract.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/offerer/tasks/OffererVerifiesAndSignsContract.java @@ -15,13 +15,14 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; +package io.bitsquare.trade.protocol.trade.buyer.offerer.tasks; 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.protocol.trade.offerer.tasks.OffererTradeTask; import io.bitsquare.util.Utilities; import org.slf4j.Logger; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/TakerAsBuyerProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/BuyerAsTakerProtocol.java similarity index 83% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/TakerAsBuyerProtocol.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/BuyerAsTakerProtocol.java index 41b136715d..cc9661b547 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/TakerAsBuyerProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/BuyerAsTakerProtocol.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker; +package io.bitsquare.trade.protocol.trade.buyer.taker; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.MailboxMessage; @@ -28,28 +28,28 @@ 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.taker.models.TakerProcessModel; -import io.bitsquare.trade.protocol.trade.taker.tasks.BroadcastTakeOfferFeeTx; -import io.bitsquare.trade.protocol.trade.taker.tasks.CreateTakeOfferFeeTx; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCommitsPayoutTx; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCreatesAndSignsPayoutTx; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCreatesDepositTxInputs; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerProcessPayoutTxPublishedMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerProcessRequestPublishDepositTxFromTakerMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerSendsDepositTxPublishedMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerSendsFiatTransferStartedMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerSendsRequestPayDepositMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerSignsAndPublishDepositTx; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerVerifiesAndSignsContract; -import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOfferFeePayment; -import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOffererAccount; +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.buyer.taker.tasks.TakerCommitsPayoutTx; +import io.bitsquare.trade.protocol.trade.buyer.taker.tasks.TakerCreatesAndSignsPayoutTx; +import io.bitsquare.trade.protocol.trade.buyer.taker.tasks.TakerCreatesDepositTxInputs; +import io.bitsquare.trade.protocol.trade.buyer.taker.tasks.TakerProcessPayoutTxPublishedMessage; +import io.bitsquare.trade.protocol.trade.buyer.taker.tasks.TakerProcessRequestPublishDepositTxFromTakerMessage; +import io.bitsquare.trade.protocol.trade.buyer.taker.tasks.TakerSendsDepositTxPublishedMessage; +import io.bitsquare.trade.protocol.trade.buyer.taker.tasks.TakerSendsFiatTransferStartedMessage; +import io.bitsquare.trade.protocol.trade.buyer.taker.tasks.TakerSendsRequestPayDepositMessage; +import io.bitsquare.trade.protocol.trade.buyer.taker.tasks.TakerSignsAndPublishDepositTx; +import io.bitsquare.trade.protocol.trade.buyer.taker.tasks.TakerVerifiesAndSignsContract; +import io.bitsquare.trade.protocol.trade.shared.taker.tasks.VerifyOfferFeePayment; +import io.bitsquare.trade.protocol.trade.shared.taker.tasks.VerifyOffererAccount; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static io.bitsquare.util.Validator.nonEmptyStringOf; -public class TakerAsBuyerProtocol implements Protocol { - private static final Logger log = LoggerFactory.getLogger(TakerAsBuyerProtocol.class); +public class BuyerAsTakerProtocol implements Protocol { + private static final Logger log = LoggerFactory.getLogger(BuyerAsTakerProtocol.class); private final TakerAsBuyerTrade takerAsBuyerTrade; private final TakerProcessModel takerTradeProcessModel; @@ -60,7 +60,7 @@ public class TakerAsBuyerProtocol implements Protocol { // Constructor /////////////////////////////////////////////////////////////////////////////////////////// - public TakerAsBuyerProtocol(TakerAsBuyerTrade takerTrade) { + public BuyerAsTakerProtocol(TakerAsBuyerTrade takerTrade) { log.debug("New SellerAsTakerProtocol " + this); this.takerAsBuyerTrade = takerTrade; takerTradeProcessModel = takerTrade.getProcessModel(); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitsPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerCommitsPayoutTx.java similarity index 92% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitsPayoutTx.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerCommitsPayoutTx.java index 9daffc16ad..d3b4307f6b 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitsPayoutTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerCommitsPayoutTx.java @@ -15,10 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.TakerTrade; +import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.bitcoinj.core.Transaction; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesAndSignsPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerCreatesAndSignsPayoutTx.java similarity index 95% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesAndSignsPayoutTx.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerCreatesAndSignsPayoutTx.java index 189ee7b36b..3a566e4279 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesAndSignsPayoutTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerCreatesAndSignsPayoutTx.java @@ -15,10 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.TakerTrade; +import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.bitcoinj.core.Coin; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesDepositTxInputs.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerCreatesDepositTxInputs.java similarity index 93% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesDepositTxInputs.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerCreatesDepositTxInputs.java index 5bd2c01798..f772ff6f8a 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesDepositTxInputs.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerCreatesDepositTxInputs.java @@ -15,12 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +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.protocol.trade.taker.tasks.TakerTradeTask; import org.bitcoinj.core.Coin; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerProcessPayoutTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerProcessPayoutTxPublishedMessage.java similarity index 94% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerProcessPayoutTxPublishedMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerProcessPayoutTxPublishedMessage.java index bdd5ca8dce..4568495cb9 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerProcessPayoutTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerProcessPayoutTxPublishedMessage.java @@ -15,13 +15,14 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +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.protocol.trade.messages.PayoutTxPublishedMessage; +import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerProcessRequestPublishDepositTxFromTakerMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerProcessRequestPublishDepositTxFromTakerMessage.java similarity index 96% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerProcessRequestPublishDepositTxFromTakerMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerProcessRequestPublishDepositTxFromTakerMessage.java index 85af5afd2e..33bcc69eaa 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerProcessRequestPublishDepositTxFromTakerMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerProcessRequestPublishDepositTxFromTakerMessage.java @@ -15,11 +15,12 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.TakerTrade; import io.bitsquare.trade.protocol.trade.messages.RequestPublishDepositTxFromTakerMessage; +import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSendsDepositTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsDepositTxPublishedMessage.java similarity index 95% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSendsDepositTxPublishedMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsDepositTxPublishedMessage.java index 0f1ae6ced7..b5ad8ecf6e 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSendsDepositTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsDepositTxPublishedMessage.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; @@ -23,6 +23,7 @@ import io.bitsquare.trade.TakerAsBuyerTrade; import io.bitsquare.trade.TakerAsSellerTrade; import io.bitsquare.trade.TakerTrade; import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage; +import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSendsFiatTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsFiatTransferStartedMessage.java similarity index 96% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSendsFiatTransferStartedMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsFiatTransferStartedMessage.java index 34bcad7041..e5e674aa4b 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSendsFiatTransferStartedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsFiatTransferStartedMessage.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; @@ -23,6 +23,7 @@ import io.bitsquare.trade.TakerAsBuyerTrade; import io.bitsquare.trade.TakerAsSellerTrade; import io.bitsquare.trade.TakerTrade; import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage; +import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSendsRequestDepositTxInputsMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsRequestDepositTxInputsMessage.java similarity index 96% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSendsRequestDepositTxInputsMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsRequestDepositTxInputsMessage.java index e5851ef262..75eba64f11 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSendsRequestDepositTxInputsMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsRequestDepositTxInputsMessage.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; @@ -23,6 +23,7 @@ import io.bitsquare.trade.TakerAsBuyerTrade; import io.bitsquare.trade.TakerAsSellerTrade; import io.bitsquare.trade.TakerTrade; import io.bitsquare.trade.protocol.trade.messages.RequestDepositTxInputsMessage; +import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import javafx.application.Platform; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSendsRequestPayDepositMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsRequestPayDepositMessage.java similarity index 96% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSendsRequestPayDepositMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsRequestPayDepositMessage.java index 1aa54df6df..51372adcf3 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSendsRequestPayDepositMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsRequestPayDepositMessage.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; @@ -23,6 +23,7 @@ import io.bitsquare.trade.TakerAsBuyerTrade; import io.bitsquare.trade.TakerAsSellerTrade; import io.bitsquare.trade.TakerTrade; import io.bitsquare.trade.protocol.trade.messages.RequestPayDepositFromOffererMessage; +import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSendsRequestPublishDepositTxMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsRequestPublishDepositTxMessage.java similarity index 96% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSendsRequestPublishDepositTxMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsRequestPublishDepositTxMessage.java index 9c5708e170..9150ec0c56 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSendsRequestPublishDepositTxMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSendsRequestPublishDepositTxMessage.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; @@ -23,6 +23,7 @@ import io.bitsquare.trade.TakerAsBuyerTrade; import io.bitsquare.trade.TakerAsSellerTrade; import io.bitsquare.trade.TakerTrade; import io.bitsquare.trade.protocol.trade.messages.RequestPublishDepositTxMessage; +import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSignsAndPublishDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSignsAndPublishDepositTx.java similarity index 96% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSignsAndPublishDepositTx.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSignsAndPublishDepositTx.java index 749d171993..2605857ca1 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSignsAndPublishDepositTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerSignsAndPublishDepositTx.java @@ -15,13 +15,14 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +package io.bitsquare.trade.protocol.trade.buyer.taker.tasks; import io.bitsquare.btc.FeePolicy; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.TakerAsBuyerTrade; import io.bitsquare.trade.TakerAsSellerTrade; import io.bitsquare.trade.TakerTrade; +import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.bitcoinj.core.Coin; import org.bitcoinj.core.Transaction; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerVerifiesAndSignsContract.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerVerifiesAndSignsContract.java similarity index 95% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerVerifiesAndSignsContract.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerVerifiesAndSignsContract.java index 04496bd00a..ca3cd64350 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerVerifiesAndSignsContract.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/buyer/taker/tasks/TakerVerifiesAndSignsContract.java @@ -15,11 +15,12 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +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.protocol.trade.taker.tasks.TakerTradeTask; import io.bitsquare.util.Utilities; import org.slf4j.Logger; 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 238e8b9d55..9e0e2829d6 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 @@ -25,12 +25,12 @@ import io.bitsquare.trade.protocol.trade.offerer.models.OffererProcessModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class OffererTradeTask extends Task { +public class OffererTradeTask extends Task { private static final Logger log = LoggerFactory.getLogger(OffererTradeTask.class); protected final OffererProcessModel offererTradeProcessModel; protected final OffererTrade offererTrade; - OffererTradeTask(TaskRunner taskHandler, OffererTrade offererTrade) { + public OffererTradeTask(TaskRunner taskHandler, OffererTrade offererTrade) { super(taskHandler, offererTrade); this.offererTrade = offererTrade; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/OffererAsSellerProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/SellerAsOffererProtocol.java similarity index 88% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/OffererAsSellerProtocol.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/SellerAsOffererProtocol.java index 2371f70f86..fbf8be8a12 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/OffererAsSellerProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/SellerAsOffererProtocol.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer; +package io.bitsquare.trade.protocol.trade.seller.offerer; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.MailboxMessage; @@ -32,25 +32,25 @@ import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage; import io.bitsquare.trade.protocol.trade.messages.RequestPayDepositMessage; import io.bitsquare.trade.protocol.trade.messages.TradeMessage; import io.bitsquare.trade.protocol.trade.offerer.models.OffererProcessModel; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererCommitDepositTx; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererCreatesAndSignsContract; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererCreatesAndSignsDepositTx; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererProcessDepositTxPublishedMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererProcessFiatTransferStartedMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererProcessRequestPayDepositFromOffererMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererSendsPayoutTxPublishedMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererSendsRequestPublishDepositTxFromTakerMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererSignsAndPublishPayoutTx; -import io.bitsquare.trade.protocol.trade.offerer.tasks.VerifyTakeOfferFeePayment; -import io.bitsquare.trade.protocol.trade.offerer.tasks.VerifyTakerAccount; +import io.bitsquare.trade.protocol.trade.seller.offerer.tasks.OffererCommitDepositTx; +import io.bitsquare.trade.protocol.trade.seller.offerer.tasks.OffererCreatesAndSignsContract; +import io.bitsquare.trade.protocol.trade.seller.offerer.tasks.OffererCreatesAndSignsDepositTx; +import io.bitsquare.trade.protocol.trade.seller.offerer.tasks.OffererProcessDepositTxPublishedMessage; +import io.bitsquare.trade.protocol.trade.seller.offerer.tasks.OffererProcessFiatTransferStartedMessage; +import io.bitsquare.trade.protocol.trade.seller.offerer.tasks.OffererProcessRequestPayDepositFromOffererMessage; +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.offerer.tasks.VerifyTakeOfferFeePayment; +import io.bitsquare.trade.protocol.trade.shared.offerer.tasks.VerifyTakerAccount; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static io.bitsquare.util.Validator.*; -public class OffererAsSellerProtocol implements Protocol { - private static final Logger log = LoggerFactory.getLogger(OffererAsSellerProtocol.class); +public class SellerAsOffererProtocol implements Protocol { + private static final Logger log = LoggerFactory.getLogger(SellerAsOffererProtocol.class); private final MessageHandler messageHandler; private final OffererAsSellerTrade offererAsSellerTrade; @@ -60,7 +60,7 @@ public class OffererAsSellerProtocol implements Protocol { // Constructor /////////////////////////////////////////////////////////////////////////////////////////// - public OffererAsSellerProtocol(OffererAsSellerTrade model) { + public SellerAsOffererProtocol(OffererAsSellerTrade model) { log.debug("New OffererProtocol " + this); this.offererAsSellerTrade = model; offererTradeProcessModel = offererAsSellerTrade.getProcessModel(); @@ -138,7 +138,7 @@ public class OffererAsSellerProtocol implements Protocol { offererTradeProcessModel.setTradeMessage(tradeMessage); offererAsSellerTrade.setTradingPeer(sender); - + TaskRunner taskRunner = new TaskRunner<>(offererAsSellerTrade, () -> log.debug("taskRunner at handleTakerDepositPaymentRequestMessage completed"), this::handleTaskRunnerFault); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererCommitDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererCommitDepositTx.java similarity index 92% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererCommitDepositTx.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererCommitDepositTx.java index 19e214c399..41ac4644ef 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererCommitDepositTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererCommitDepositTx.java @@ -15,10 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; +package io.bitsquare.trade.protocol.trade.seller.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.OffererTrade; +import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.bitcoinj.core.Transaction; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererCreatesAndSignsContract.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererCreatesAndSignsContract.java similarity index 94% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererCreatesAndSignsContract.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererCreatesAndSignsContract.java index 163a71b9f3..da48418113 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererCreatesAndSignsContract.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererCreatesAndSignsContract.java @@ -15,11 +15,12 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; +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.protocol.trade.offerer.tasks.OffererTradeTask; import io.bitsquare.util.Utilities; import org.slf4j.Logger; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererCreatesAndSignsDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererCreatesAndSignsDepositTx.java similarity index 95% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererCreatesAndSignsDepositTx.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererCreatesAndSignsDepositTx.java index 14ca2694ee..b41b267c41 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererCreatesAndSignsDepositTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererCreatesAndSignsDepositTx.java @@ -15,12 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; +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.protocol.trade.offerer.tasks.OffererTradeTask; import org.bitcoinj.core.Coin; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererProcessDepositTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererProcessDepositTxPublishedMessage.java similarity index 94% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererProcessDepositTxPublishedMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererProcessDepositTxPublishedMessage.java index b04a8c93a6..eae2e559d8 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererProcessDepositTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererProcessDepositTxPublishedMessage.java @@ -15,13 +15,14 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; +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.protocol.trade.messages.DepositTxPublishedMessage; +import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererProcessFiatTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererProcessFiatTransferStartedMessage.java similarity index 95% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererProcessFiatTransferStartedMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererProcessFiatTransferStartedMessage.java index 0356ab0f91..f2ea8876d3 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererProcessFiatTransferStartedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererProcessFiatTransferStartedMessage.java @@ -15,13 +15,14 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; +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.protocol.trade.messages.FiatTransferStartedMessage; +import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererProcessRequestPayDepositFromOffererMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererProcessRequestPayDepositFromOffererMessage.java similarity index 95% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererProcessRequestPayDepositFromOffererMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererProcessRequestPayDepositFromOffererMessage.java index 2ee00f2a90..ba43dd9136 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererProcessRequestPayDepositFromOffererMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererProcessRequestPayDepositFromOffererMessage.java @@ -15,11 +15,12 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; +package io.bitsquare.trade.protocol.trade.seller.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.OffererTrade; import io.bitsquare.trade.protocol.trade.messages.RequestPayDepositFromOffererMessage; +import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererSendsPayoutTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererSendsPayoutTxPublishedMessage.java similarity index 95% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererSendsPayoutTxPublishedMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererSendsPayoutTxPublishedMessage.java index 66ce9e5bd7..e6d1a625f6 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererSendsPayoutTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererSendsPayoutTxPublishedMessage.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; +package io.bitsquare.trade.protocol.trade.seller.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; @@ -23,6 +23,7 @@ import io.bitsquare.trade.OffererAsBuyerTrade; import io.bitsquare.trade.OffererAsSellerTrade; import io.bitsquare.trade.OffererTrade; import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage; +import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererSendsRequestPublishDepositTxFromTakerMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererSendsRequestPublishDepositTxFromTakerMessage.java similarity index 96% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererSendsRequestPublishDepositTxFromTakerMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererSendsRequestPublishDepositTxFromTakerMessage.java index 02e1c37f8e..4fd07a4ea8 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererSendsRequestPublishDepositTxFromTakerMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererSendsRequestPublishDepositTxFromTakerMessage.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; +package io.bitsquare.trade.protocol.trade.seller.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; @@ -23,6 +23,7 @@ import io.bitsquare.trade.OffererAsBuyerTrade; import io.bitsquare.trade.OffererAsSellerTrade; import io.bitsquare.trade.OffererTrade; import io.bitsquare.trade.protocol.trade.messages.RequestPublishDepositTxFromTakerMessage; +import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererSignsAndPublishPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererSignsAndPublishPayoutTx.java similarity index 96% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererSignsAndPublishPayoutTx.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererSignsAndPublishPayoutTx.java index 404420e126..60be15e1da 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererSignsAndPublishPayoutTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/offerer/tasks/OffererSignsAndPublishPayoutTx.java @@ -15,12 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; +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.protocol.trade.offerer.tasks.OffererTradeTask; import org.bitcoinj.core.Transaction; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/TakerAsSellerProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/SellerAsTakerProtocol.java similarity index 84% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/TakerAsSellerProtocol.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/SellerAsTakerProtocol.java index 5098ed33f5..1257f36a0f 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/TakerAsSellerProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/SellerAsTakerProtocol.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker; +package io.bitsquare.trade.protocol.trade.seller.taker; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.MailboxMessage; @@ -30,28 +30,28 @@ import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage; import io.bitsquare.trade.protocol.trade.messages.RequestPayDepositMessage; import io.bitsquare.trade.protocol.trade.messages.TradeMessage; import io.bitsquare.trade.protocol.trade.taker.models.TakerProcessModel; -import io.bitsquare.trade.protocol.trade.taker.tasks.BroadcastTakeOfferFeeTx; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCommitDepositTx; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCreatesAndSignContract; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCreatesAndSignsDepositTx; -import io.bitsquare.trade.protocol.trade.taker.tasks.CreateTakeOfferFeeTx; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerProcessDepositTxPublishedMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerProcessFiatTransferStartedMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerProcessRequestSellerDepositPaymentMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerSendsPayoutTxPublishedMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerSendsRequestDepositTxInputsMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerSendsRequestPublishDepositTxMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerSignsAndPublishPayoutTx; -import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOfferFeePayment; -import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOffererAccount; +import io.bitsquare.trade.protocol.trade.shared.taker.tasks.BroadcastTakeOfferFeeTx; +import io.bitsquare.trade.protocol.trade.seller.taker.tasks.TakerCommitDepositTx; +import io.bitsquare.trade.protocol.trade.seller.taker.tasks.TakerCreatesAndSignContract; +import io.bitsquare.trade.protocol.trade.seller.taker.tasks.TakerCreatesAndSignsDepositTx; +import io.bitsquare.trade.protocol.trade.shared.taker.tasks.CreateTakeOfferFeeTx; +import io.bitsquare.trade.protocol.trade.seller.taker.tasks.TakerProcessDepositTxPublishedMessage; +import io.bitsquare.trade.protocol.trade.seller.taker.tasks.TakerProcessFiatTransferStartedMessage; +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.buyer.taker.tasks.TakerSendsRequestDepositTxInputsMessage; +import io.bitsquare.trade.protocol.trade.buyer.taker.tasks.TakerSendsRequestPublishDepositTxMessage; +import io.bitsquare.trade.protocol.trade.seller.taker.tasks.TakerSignsAndPublishPayoutTx; +import io.bitsquare.trade.protocol.trade.shared.taker.tasks.VerifyOfferFeePayment; +import io.bitsquare.trade.protocol.trade.shared.taker.tasks.VerifyOffererAccount; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static io.bitsquare.util.Validator.nonEmptyStringOf; -public class TakerAsSellerProtocol implements Protocol { - private static final Logger log = LoggerFactory.getLogger(TakerAsSellerProtocol.class); +public class SellerAsTakerProtocol implements Protocol { + private static final Logger log = LoggerFactory.getLogger(SellerAsTakerProtocol.class); private final TakerAsSellerTrade takerAsSellerTrade; private final TakerProcessModel takerTradeProcessModel; @@ -62,7 +62,7 @@ public class TakerAsSellerProtocol implements Protocol { // Constructor /////////////////////////////////////////////////////////////////////////////////////////// - public TakerAsSellerProtocol(TakerAsSellerTrade takerTrade) { + public SellerAsTakerProtocol(TakerAsSellerTrade takerTrade) { log.debug("New SellerAsTakerProtocol " + this); this.takerAsSellerTrade = takerTrade; takerTradeProcessModel = takerTrade.getProcessModel(); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerCommitDepositTx.java similarity index 92% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerCommitDepositTx.java index c87da67332..d1ac3f587c 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerCommitDepositTx.java @@ -15,10 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +package io.bitsquare.trade.protocol.trade.seller.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.TakerTrade; +import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.bitcoinj.core.Transaction; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesAndSignContract.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerCreatesAndSignContract.java similarity index 95% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesAndSignContract.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerCreatesAndSignContract.java index 75bc6a36cf..6de6272c9b 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesAndSignContract.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerCreatesAndSignContract.java @@ -15,11 +15,12 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +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.protocol.trade.taker.tasks.TakerTradeTask; import io.bitsquare.util.Utilities; import org.slf4j.Logger; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesAndSignsDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerCreatesAndSignsDepositTx.java similarity index 95% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesAndSignsDepositTx.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerCreatesAndSignsDepositTx.java index 82ac38ee02..94df765e0a 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesAndSignsDepositTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerCreatesAndSignsDepositTx.java @@ -15,12 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +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.protocol.trade.taker.tasks.TakerTradeTask; import org.bitcoinj.core.Coin; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerProcessDepositTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerProcessDepositTxPublishedMessage.java similarity index 94% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerProcessDepositTxPublishedMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerProcessDepositTxPublishedMessage.java index 08d6bf3e0c..31760ef267 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerProcessDepositTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerProcessDepositTxPublishedMessage.java @@ -15,13 +15,14 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +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.protocol.trade.messages.DepositTxPublishedMessage; +import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerProcessFiatTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerProcessFiatTransferStartedMessage.java similarity index 95% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerProcessFiatTransferStartedMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerProcessFiatTransferStartedMessage.java index 1d3ce0d1f4..65f8eeb331 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerProcessFiatTransferStartedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerProcessFiatTransferStartedMessage.java @@ -15,13 +15,14 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +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.protocol.trade.messages.FiatTransferStartedMessage; +import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerProcessRequestSellerDepositPaymentMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerProcessRequestSellerDepositPaymentMessage.java similarity index 95% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerProcessRequestSellerDepositPaymentMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerProcessRequestSellerDepositPaymentMessage.java index e5399edd0d..a35f296225 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerProcessRequestSellerDepositPaymentMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerProcessRequestSellerDepositPaymentMessage.java @@ -15,11 +15,12 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +package io.bitsquare.trade.protocol.trade.seller.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.TakerTrade; import io.bitsquare.trade.protocol.trade.messages.RequestPayDepositMessage; +import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSendsPayoutTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerSendsPayoutTxPublishedMessage.java similarity index 95% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSendsPayoutTxPublishedMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerSendsPayoutTxPublishedMessage.java index 1314669fb4..78f180a454 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSendsPayoutTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerSendsPayoutTxPublishedMessage.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +package io.bitsquare.trade.protocol.trade.seller.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; @@ -23,6 +23,7 @@ import io.bitsquare.trade.TakerAsBuyerTrade; import io.bitsquare.trade.TakerAsSellerTrade; import io.bitsquare.trade.TakerTrade; import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage; +import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSignsAndPublishPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerSignsAndPublishPayoutTx.java similarity index 96% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSignsAndPublishPayoutTx.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerSignsAndPublishPayoutTx.java index 1743d7766d..98d58b74bb 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerSignsAndPublishPayoutTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/seller/taker/tasks/TakerSignsAndPublishPayoutTx.java @@ -15,12 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +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.protocol.trade.taker.tasks.TakerTradeTask; import org.bitcoinj.core.Transaction; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/offerer/tasks/VerifyTakeOfferFeePayment.java similarity index 92% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/shared/offerer/tasks/VerifyTakeOfferFeePayment.java index f88b5ede89..4d46efea01 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/offerer/tasks/VerifyTakeOfferFeePayment.java @@ -15,10 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; +package io.bitsquare.trade.protocol.trade.shared.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.OffererTrade; +import io.bitsquare.trade.protocol.trade.offerer.tasks.OffererTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/offerer/tasks/VerifyTakerAccount.java similarity index 95% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/shared/offerer/tasks/VerifyTakerAccount.java index b96758a7ab..4949c1f599 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/offerer/tasks/VerifyTakerAccount.java @@ -15,12 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer.tasks; +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.protocol.trade.offerer.tasks.OffererTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/BroadcastTakeOfferFeeTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/BroadcastTakeOfferFeeTx.java similarity index 96% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/BroadcastTakeOfferFeeTx.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/BroadcastTakeOfferFeeTx.java index 3e3d47f01e..48ebe90970 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/BroadcastTakeOfferFeeTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/BroadcastTakeOfferFeeTx.java @@ -15,12 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +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.protocol.trade.taker.tasks.TakerTradeTask; import org.bitcoinj.core.Transaction; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateTakeOfferFeeTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/CreateTakeOfferFeeTx.java similarity index 94% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateTakeOfferFeeTx.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/CreateTakeOfferFeeTx.java index d7277811a4..43ed7a43e8 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateTakeOfferFeeTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/CreateTakeOfferFeeTx.java @@ -15,12 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +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.protocol.trade.taker.tasks.TakerTradeTask; import org.bitcoinj.core.Transaction; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/VerifyOfferFeePayment.java similarity index 92% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/VerifyOfferFeePayment.java index 045691949a..d4c498cbf4 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/VerifyOfferFeePayment.java @@ -15,10 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +package io.bitsquare.trade.protocol.trade.shared.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.TakerTrade; +import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/VerifyOffererAccount.java similarity index 93% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/VerifyOffererAccount.java index 00e87b41af..85f4ad64f9 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/shared/taker/tasks/VerifyOffererAccount.java @@ -15,10 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.taker.tasks; +package io.bitsquare.trade.protocol.trade.shared.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.TakerTrade; +import io.bitsquare.trade.protocol.trade.taker.tasks.TakerTradeTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 6894e4977c..446ffda115 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 @@ -25,12 +25,12 @@ import io.bitsquare.trade.protocol.trade.taker.models.TakerProcessModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class TakerTradeTask extends Task { +public class TakerTradeTask extends Task { private static final Logger log = LoggerFactory.getLogger(TakerTradeTask.class); protected final TakerProcessModel takerTradeProcessModel; protected final TakerTrade takerTrade; - TakerTradeTask(TaskRunner taskHandler, TakerTrade takerTrade) { + public TakerTradeTask(TaskRunner taskHandler, TakerTrade takerTrade) { super(taskHandler, takerTrade); this.takerTrade = takerTrade;