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

Remove Prefixes for tasks

Browse source
This commit is contained in:
Manfred Karrer 2015-04-02 18:13:56 +02:00
parent 4491473d3d
commit 31ba7882f7
25 changed files with 164 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

60
core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java
View file

@ -30,25 +30,25 @@ import io.bitsquare.trade.protocol.placeoffer.tasks.CreateOfferFeeTx;
import io.bitsquare.trade.protocol.placeoffer.tasks.ValidateOffer; import io.bitsquare.trade.protocol.placeoffer.tasks.ValidateOffer;
import io.bitsquare.trade.protocol.trade.BuyerAsOffererProtocol; import io.bitsquare.trade.protocol.trade.BuyerAsOffererProtocol;
import io.bitsquare.trade.protocol.trade.SellerAsTakerProtocol; import io.bitsquare.trade.protocol.trade.SellerAsTakerProtocol;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerCreatesAndSignPayoutTx; import io.bitsquare.trade.protocol.trade.tasks.buyer.CreateAndSignPayoutTx;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerCreatesDepositTxInputs; import io.bitsquare.trade.protocol.trade.tasks.buyer.CreateDepositTxInputs;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerProcessPayoutTxPublishedMessage; import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessPayoutTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerProcessRequestPublishDepositTxMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSendsDepositTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSendsFiatTransferStartedMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSendsRequestPayDepositMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSignsAndPublishDepositTx;
import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessRequestDepositTxInputsMessage; import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessRequestDepositTxInputsMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessRequestPublishDepositTxMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.SendDepositTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.SendFiatTransferStartedMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.SendRequestPayDepositMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.SignAndPublishDepositTx;
import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakeOfferFeePayment; import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakeOfferFeePayment;
import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakerAccount; import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakerAccount;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerCommitDepositTx; import io.bitsquare.trade.protocol.trade.tasks.seller.CommitDepositTx;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerCreatesAndSignsDepositTx; import io.bitsquare.trade.protocol.trade.tasks.seller.CreateAndSignDepositTx;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerProcessDepositTxPublishedMessage; import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessDepositTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerProcessFiatTransferStartedMessage; import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessFiatTransferStartedMessage;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerProcessRequestPayDepositMessage; import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessRequestPayDepositMessage;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerSendsPayoutTxPublishedMessage; import io.bitsquare.trade.protocol.trade.tasks.seller.SendPayoutTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerSignsAndPublishPayoutTx;
import io.bitsquare.trade.protocol.trade.tasks.seller.SendRequestDepositTxInputsMessage; import io.bitsquare.trade.protocol.trade.tasks.seller.SendRequestDepositTxInputsMessage;
import io.bitsquare.trade.protocol.trade.tasks.seller.SignAndPublishPayoutTx;
import io.bitsquare.trade.protocol.trade.tasks.taker.CreateTakeOfferFeeTx; import io.bitsquare.trade.protocol.trade.tasks.taker.CreateTakeOfferFeeTx;
import io.bitsquare.trade.protocol.trade.tasks.taker.VerifyOfferFeePayment; import io.bitsquare.trade.protocol.trade.tasks.taker.VerifyOfferFeePayment;
import io.bitsquare.trade.protocol.trade.tasks.taker.VerifyOffererAccount; import io.bitsquare.trade.protocol.trade.tasks.taker.VerifyOffererAccount;
@ -99,19 +99,19 @@ public class DebugView extends InitializableView {
/*---- Protocol ----*/ /*---- Protocol ----*/
BuyerAsOffererProtocol.class, BuyerAsOffererProtocol.class,
ProcessRequestDepositTxInputsMessage.class, ProcessRequestDepositTxInputsMessage.class,
BuyerCreatesDepositTxInputs.class, CreateDepositTxInputs.class,
BuyerSendsRequestPayDepositMessage.class, SendRequestPayDepositMessage.class,
BuyerProcessRequestPublishDepositTxMessage.class, ProcessRequestPublishDepositTxMessage.class,
VerifyTakerAccount.class, VerifyTakerAccount.class,
BuyerSignsAndPublishDepositTx.class, SignAndPublishDepositTx.class,
BuyerSendsDepositTxPublishedMessage.class, SendDepositTxPublishedMessage.class,
BuyerCreatesAndSignPayoutTx.class, CreateAndSignPayoutTx.class,
VerifyTakeOfferFeePayment.class, VerifyTakeOfferFeePayment.class,
BuyerSendsFiatTransferStartedMessage.class, SendFiatTransferStartedMessage.class,
BuyerProcessPayoutTxPublishedMessage.class, ProcessPayoutTxPublishedMessage.class,
Boolean.class, /* used as seperator*/ Boolean.class, /* used as seperator*/
@ -120,18 +120,18 @@ public class DebugView extends InitializableView {
CreateTakeOfferFeeTx.class, CreateTakeOfferFeeTx.class,
SendRequestDepositTxInputsMessage.class, SendRequestDepositTxInputsMessage.class,
SellerProcessRequestPayDepositMessage.class, ProcessRequestPayDepositMessage.class,
VerifyOffererAccount.class, VerifyOffererAccount.class,
SellerCreatesAndSignsDepositTx.class, CreateAndSignDepositTx.class,
SellerProcessDepositTxPublishedMessage.class, ProcessDepositTxPublishedMessage.class,
SellerCommitDepositTx.class, CommitDepositTx.class,
SellerProcessFiatTransferStartedMessage.class, ProcessFiatTransferStartedMessage.class,
SellerSignsAndPublishPayoutTx.class, SignAndPublishPayoutTx.class,
VerifyOfferFeePayment.class, VerifyOfferFeePayment.class,
SellerSendsPayoutTxPublishedMessage.class SendPayoutTxPublishedMessage.class
) )
); );

2
core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
View file

@ -241,7 +241,7 @@ public class PendingTradesViewModel extends ActivatableWithDataModel<PendingTrad
// summary // summary
public String getTradeVolume() { public String getTradeVolume() {
return formatter.formatCoinWithCode(dataModel.getTrade().getTradeAmount()); return dataModel.getTrade() != null ? formatter.formatCoinWithCode(dataModel.getTrade().getTradeAmount()) : "";
} }
public String getFiatVolume() { public String getFiatVolume() {

40
core/src/main/java/io/bitsquare/trade/protocol/trade/BuyerAsOffererProtocol.java
View file

@ -31,17 +31,17 @@ import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.messages.RequestDepositTxInputsMessage; import io.bitsquare.trade.protocol.trade.messages.RequestDepositTxInputsMessage;
import io.bitsquare.trade.protocol.trade.messages.RequestPublishDepositTxMessage; import io.bitsquare.trade.protocol.trade.messages.RequestPublishDepositTxMessage;
import io.bitsquare.trade.protocol.trade.messages.TradeMessage; import io.bitsquare.trade.protocol.trade.messages.TradeMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerCommitsPayoutTx; import io.bitsquare.trade.protocol.trade.tasks.buyer.CommitPayoutTx;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerCreatesAndSignPayoutTx; import io.bitsquare.trade.protocol.trade.tasks.buyer.CreateAndSignPayoutTx;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerCreatesDepositTxInputs; import io.bitsquare.trade.protocol.trade.tasks.buyer.CreateDepositTxInputs;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerProcessPayoutTxPublishedMessage; import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessPayoutTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerProcessRequestPublishDepositTxMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSendsDepositTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSendsFiatTransferStartedMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSendsRequestPayDepositMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSignsAndPublishDepositTx;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerVerifiesAndSignsContract;
import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessRequestDepositTxInputsMessage; import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessRequestDepositTxInputsMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessRequestPublishDepositTxMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.SendDepositTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.SendFiatTransferStartedMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.SendRequestPayDepositMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.SignAndPublishDepositTx;
import io.bitsquare.trade.protocol.trade.tasks.buyer.VerifyAndSignContract;
import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakeOfferFeePayment; import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakeOfferFeePayment;
import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakerAccount; import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakerAccount;
import io.bitsquare.trade.states.OffererTradeState; import io.bitsquare.trade.states.OffererTradeState;
@ -143,8 +143,8 @@ public class BuyerAsOffererProtocol implements TradeProtocol {
this::handleTaskRunnerFault); this::handleTaskRunnerFault);
taskRunner.addTasks( taskRunner.addTasks(
ProcessRequestDepositTxInputsMessage.class, ProcessRequestDepositTxInputsMessage.class,
BuyerCreatesDepositTxInputs.class, CreateDepositTxInputs.class,
BuyerSendsRequestPayDepositMessage.class SendRequestPayDepositMessage.class
); );
taskRunner.run(); taskRunner.run();
} }
@ -156,11 +156,11 @@ public class BuyerAsOffererProtocol implements TradeProtocol {
() -> log.debug("taskRunner at handleRequestPublishDepositTxMessage completed"), () -> log.debug("taskRunner at handleRequestPublishDepositTxMessage completed"),
this::handleTaskRunnerFault); this::handleTaskRunnerFault);
taskRunner.addTasks( taskRunner.addTasks(
BuyerProcessRequestPublishDepositTxMessage.class, ProcessRequestPublishDepositTxMessage.class,
VerifyTakerAccount.class, VerifyTakerAccount.class,
BuyerVerifiesAndSignsContract.class, VerifyAndSignContract.class,
BuyerSignsAndPublishDepositTx.class, SignAndPublishDepositTx.class,
BuyerSendsDepositTxPublishedMessage.class SendDepositTxPublishedMessage.class
); );
taskRunner.run(); taskRunner.run();
} }
@ -177,8 +177,8 @@ public class BuyerAsOffererProtocol implements TradeProtocol {
this::handleTaskRunnerFault); this::handleTaskRunnerFault);
taskRunner.addTasks( taskRunner.addTasks(
VerifyTakeOfferFeePayment.class, VerifyTakeOfferFeePayment.class,
BuyerCreatesAndSignPayoutTx.class, CreateAndSignPayoutTx.class,
BuyerSendsFiatTransferStartedMessage.class SendFiatTransferStartedMessage.class
); );
taskRunner.run(); taskRunner.run();
} }
@ -199,8 +199,8 @@ public class BuyerAsOffererProtocol implements TradeProtocol {
}, },
this::handleTaskRunnerFault); this::handleTaskRunnerFault);
taskRunner.addTasks(BuyerProcessPayoutTxPublishedMessage.class); taskRunner.addTasks(ProcessPayoutTxPublishedMessage.class);
taskRunner.addTasks(BuyerCommitsPayoutTx.class); taskRunner.addTasks(CommitPayoutTx.class);
taskRunner.run(); taskRunner.run();
} }

40
core/src/main/java/io/bitsquare/trade/protocol/trade/BuyerAsTakerProtocol.java
View file

@ -27,16 +27,16 @@ import io.bitsquare.trade.Trade;
import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage; import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.messages.RequestPublishDepositTxMessage; import io.bitsquare.trade.protocol.trade.messages.RequestPublishDepositTxMessage;
import io.bitsquare.trade.protocol.trade.messages.TradeMessage; import io.bitsquare.trade.protocol.trade.messages.TradeMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerCommitsPayoutTx; import io.bitsquare.trade.protocol.trade.tasks.buyer.CommitPayoutTx;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerCreatesAndSignPayoutTx; import io.bitsquare.trade.protocol.trade.tasks.buyer.CreateAndSignPayoutTx;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerCreatesDepositTxInputs; import io.bitsquare.trade.protocol.trade.tasks.buyer.CreateDepositTxInputs;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerProcessPayoutTxPublishedMessage; import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessPayoutTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerProcessRequestPublishDepositTxMessage; import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessRequestPublishDepositTxMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSendsDepositTxPublishedMessage; import io.bitsquare.trade.protocol.trade.tasks.buyer.SendDepositTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSendsFiatTransferStartedMessage; import io.bitsquare.trade.protocol.trade.tasks.buyer.SendFiatTransferStartedMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSendsRequestPayDepositMessage; import io.bitsquare.trade.protocol.trade.tasks.buyer.SendRequestPayDepositMessage;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSignsAndPublishDepositTx; import io.bitsquare.trade.protocol.trade.tasks.buyer.SignAndPublishDepositTx;
import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerVerifiesAndSignsContract; import io.bitsquare.trade.protocol.trade.tasks.buyer.VerifyAndSignContract;
import io.bitsquare.trade.protocol.trade.tasks.taker.BroadcastTakeOfferFeeTx; import io.bitsquare.trade.protocol.trade.tasks.taker.BroadcastTakeOfferFeeTx;
import io.bitsquare.trade.protocol.trade.tasks.taker.CreateTakeOfferFeeTx; import io.bitsquare.trade.protocol.trade.tasks.taker.CreateTakeOfferFeeTx;
import io.bitsquare.trade.protocol.trade.tasks.taker.VerifyOfferFeePayment; import io.bitsquare.trade.protocol.trade.tasks.taker.VerifyOfferFeePayment;
@ -100,8 +100,8 @@ public class BuyerAsTakerProtocol implements TradeProtocol {
taskRunner.addTasks( taskRunner.addTasks(
CreateTakeOfferFeeTx.class, CreateTakeOfferFeeTx.class,
BroadcastTakeOfferFeeTx.class, BroadcastTakeOfferFeeTx.class,
BuyerCreatesDepositTxInputs.class, CreateDepositTxInputs.class,
BuyerSendsRequestPayDepositMessage.class SendRequestPayDepositMessage.class
); );
taskRunner.run(); taskRunner.run();
} }
@ -118,11 +118,11 @@ public class BuyerAsTakerProtocol implements TradeProtocol {
() -> log.debug("taskRunner at handleRequestPublishDepositTxMessage completed"), () -> log.debug("taskRunner at handleRequestPublishDepositTxMessage completed"),
this::handleTaskRunnerFault); this::handleTaskRunnerFault);
taskRunner.addTasks( taskRunner.addTasks(
BuyerProcessRequestPublishDepositTxMessage.class, ProcessRequestPublishDepositTxMessage.class,
VerifyOffererAccount.class, VerifyOffererAccount.class,
BuyerVerifiesAndSignsContract.class, VerifyAndSignContract.class,
BuyerSignsAndPublishDepositTx.class, SignAndPublishDepositTx.class,
BuyerSendsDepositTxPublishedMessage.class SendDepositTxPublishedMessage.class
); );
taskRunner.run(); taskRunner.run();
} }
@ -139,8 +139,8 @@ public class BuyerAsTakerProtocol implements TradeProtocol {
this::handleTaskRunnerFault); this::handleTaskRunnerFault);
taskRunner.addTasks( taskRunner.addTasks(
VerifyOfferFeePayment.class, VerifyOfferFeePayment.class,
BuyerCreatesAndSignPayoutTx.class, CreateAndSignPayoutTx.class,
BuyerSendsFiatTransferStartedMessage.class SendFiatTransferStartedMessage.class
); );
taskRunner.run(); taskRunner.run();
} }
@ -162,8 +162,8 @@ public class BuyerAsTakerProtocol implements TradeProtocol {
this::handleTaskRunnerFault); this::handleTaskRunnerFault);
taskRunner.addTasks( taskRunner.addTasks(
BuyerProcessPayoutTxPublishedMessage.class, ProcessPayoutTxPublishedMessage.class,
BuyerCommitsPayoutTx.class); CommitPayoutTx.class);
taskRunner.run(); taskRunner.run();
} }

36
core/src/main/java/io/bitsquare/trade/protocol/trade/SellerAsOffererProtocol.java
View file

@ -33,15 +33,15 @@ import io.bitsquare.trade.protocol.trade.messages.RequestPayDepositMessage;
import io.bitsquare.trade.protocol.trade.messages.TradeMessage; import io.bitsquare.trade.protocol.trade.messages.TradeMessage;
import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakeOfferFeePayment; import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakeOfferFeePayment;
import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakerAccount; import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakerAccount;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerCommitDepositTx; import io.bitsquare.trade.protocol.trade.tasks.seller.CommitDepositTx;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerCreatesAndSignsContract; import io.bitsquare.trade.protocol.trade.tasks.seller.CreateAndSignContract;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerCreatesAndSignsDepositTx; import io.bitsquare.trade.protocol.trade.tasks.seller.CreateAndSignDepositTx;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerProcessDepositTxPublishedMessage; import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessDepositTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerProcessFiatTransferStartedMessage; import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessFiatTransferStartedMessage;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerProcessRequestPayDepositMessage; import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessRequestPayDepositMessage;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerSendsPayoutTxPublishedMessage; import io.bitsquare.trade.protocol.trade.tasks.seller.SendPayoutTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerSendsRequestPublishDepositTxMessage; import io.bitsquare.trade.protocol.trade.tasks.seller.SendRequestPublishDepositTxMessage;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerSignsAndPublishPayoutTx; import io.bitsquare.trade.protocol.trade.tasks.seller.SignAndPublishPayoutTx;
import io.bitsquare.trade.states.OffererTradeState; import io.bitsquare.trade.states.OffererTradeState;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -144,11 +144,11 @@ public class SellerAsOffererProtocol implements TradeProtocol {
this::handleTaskRunnerFault); this::handleTaskRunnerFault);
taskRunner.addTasks( taskRunner.addTasks(
SellerProcessRequestPayDepositMessage.class, ProcessRequestPayDepositMessage.class,
VerifyTakerAccount.class, VerifyTakerAccount.class,
SellerCreatesAndSignsContract.class, CreateAndSignContract.class,
SellerCreatesAndSignsDepositTx.class, CreateAndSignDepositTx.class,
SellerSendsRequestPublishDepositTxMessage.class SendRequestPublishDepositTxMessage.class
); );
taskRunner.run(); taskRunner.run();
} }
@ -161,8 +161,8 @@ public class SellerAsOffererProtocol implements TradeProtocol {
this::handleTaskRunnerFault); this::handleTaskRunnerFault);
taskRunner.addTasks( taskRunner.addTasks(
SellerProcessDepositTxPublishedMessage.class, ProcessDepositTxPublishedMessage.class,
SellerCommitDepositTx.class CommitDepositTx.class
); );
taskRunner.run(); taskRunner.run();
} }
@ -174,7 +174,7 @@ public class SellerAsOffererProtocol implements TradeProtocol {
() -> log.debug("taskRunner at handleFiatTransferStartedMessage completed"), () -> log.debug("taskRunner at handleFiatTransferStartedMessage completed"),
this::handleTaskRunnerFault); this::handleTaskRunnerFault);
taskRunner.addTasks(SellerProcessFiatTransferStartedMessage.class); taskRunner.addTasks(ProcessFiatTransferStartedMessage.class);
taskRunner.run(); taskRunner.run();
} }
@ -198,8 +198,8 @@ public class SellerAsOffererProtocol implements TradeProtocol {
taskRunner.addTasks( taskRunner.addTasks(
VerifyTakeOfferFeePayment.class, VerifyTakeOfferFeePayment.class,
SellerSignsAndPublishPayoutTx.class, SignAndPublishPayoutTx.class,
SellerSendsPayoutTxPublishedMessage.class SendPayoutTxPublishedMessage.class
); );
taskRunner.run(); taskRunner.run();
} }

36
core/src/main/java/io/bitsquare/trade/protocol/trade/SellerAsTakerProtocol.java
View file

@ -28,16 +28,16 @@ import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage; import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage;
import io.bitsquare.trade.protocol.trade.messages.RequestPayDepositMessage; import io.bitsquare.trade.protocol.trade.messages.RequestPayDepositMessage;
import io.bitsquare.trade.protocol.trade.messages.TradeMessage; import io.bitsquare.trade.protocol.trade.messages.TradeMessage;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerCommitDepositTx; import io.bitsquare.trade.protocol.trade.tasks.seller.CommitDepositTx;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerCreatesAndSignsContract; import io.bitsquare.trade.protocol.trade.tasks.seller.CreateAndSignContract;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerCreatesAndSignsDepositTx; import io.bitsquare.trade.protocol.trade.tasks.seller.CreateAndSignDepositTx;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerProcessDepositTxPublishedMessage; import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessDepositTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerProcessFiatTransferStartedMessage; import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessFiatTransferStartedMessage;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerProcessRequestPayDepositMessage; import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessRequestPayDepositMessage;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerSendsPayoutTxPublishedMessage; import io.bitsquare.trade.protocol.trade.tasks.seller.SendPayoutTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerSendsRequestPublishDepositTxMessage;
import io.bitsquare.trade.protocol.trade.tasks.seller.SellerSignsAndPublishPayoutTx;
import io.bitsquare.trade.protocol.trade.tasks.seller.SendRequestDepositTxInputsMessage; import io.bitsquare.trade.protocol.trade.tasks.seller.SendRequestDepositTxInputsMessage;
import io.bitsquare.trade.protocol.trade.tasks.seller.SendRequestPublishDepositTxMessage;
import io.bitsquare.trade.protocol.trade.tasks.seller.SignAndPublishPayoutTx;
import io.bitsquare.trade.protocol.trade.tasks.taker.BroadcastTakeOfferFeeTx; import io.bitsquare.trade.protocol.trade.tasks.taker.BroadcastTakeOfferFeeTx;
import io.bitsquare.trade.protocol.trade.tasks.taker.CreateTakeOfferFeeTx; import io.bitsquare.trade.protocol.trade.tasks.taker.CreateTakeOfferFeeTx;
import io.bitsquare.trade.protocol.trade.tasks.taker.VerifyOfferFeePayment; import io.bitsquare.trade.protocol.trade.tasks.taker.VerifyOfferFeePayment;
@ -120,11 +120,11 @@ public class SellerAsTakerProtocol implements TradeProtocol {
this::handleTaskRunnerFault); this::handleTaskRunnerFault);
taskRunner.addTasks( taskRunner.addTasks(
SellerProcessRequestPayDepositMessage.class, ProcessRequestPayDepositMessage.class,
VerifyOffererAccount.class, VerifyOffererAccount.class,
SellerCreatesAndSignsContract.class, CreateAndSignContract.class,
SellerCreatesAndSignsDepositTx.class, CreateAndSignDepositTx.class,
SellerSendsRequestPublishDepositTxMessage.class SendRequestPublishDepositTxMessage.class
); );
taskRunner.run(); taskRunner.run();
} }
@ -137,8 +137,8 @@ public class SellerAsTakerProtocol implements TradeProtocol {
this::handleTaskRunnerFault); this::handleTaskRunnerFault);
taskRunner.addTasks( taskRunner.addTasks(
SellerProcessDepositTxPublishedMessage.class, ProcessDepositTxPublishedMessage.class,
SellerCommitDepositTx.class CommitDepositTx.class
); );
taskRunner.run(); taskRunner.run();
} }
@ -150,7 +150,7 @@ public class SellerAsTakerProtocol implements TradeProtocol {
() -> log.debug("taskRunner at handleFiatTransferStartedMessage completed"), () -> log.debug("taskRunner at handleFiatTransferStartedMessage completed"),
this::handleTaskRunnerFault); this::handleTaskRunnerFault);
taskRunner.addTasks(SellerProcessFiatTransferStartedMessage.class); taskRunner.addTasks(ProcessFiatTransferStartedMessage.class);
taskRunner.run(); taskRunner.run();
} }
@ -174,8 +174,8 @@ public class SellerAsTakerProtocol implements TradeProtocol {
taskRunner.addTasks( taskRunner.addTasks(
VerifyOfferFeePayment.class, VerifyOfferFeePayment.class,
SellerSignsAndPublishPayoutTx.class, SignAndPublishPayoutTx.class,
SellerSendsPayoutTxPublishedMessage.class SendPayoutTxPublishedMessage.class
); );
taskRunner.run(); taskRunner.run();
} }

6
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/BuyerCommitsPayoutTx.java → core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/CommitPayoutTx.java
View file

@ -26,10 +26,10 @@ import org.bitcoinj.core.Transaction;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class BuyerCommitsPayoutTx extends TradeTask { public class CommitPayoutTx extends TradeTask {
private static final Logger log = LoggerFactory.getLogger(BuyerCommitsPayoutTx.class); private static final Logger log = LoggerFactory.getLogger(CommitPayoutTx.class);
public BuyerCommitsPayoutTx(TaskRunner taskHandler, Trade trade) { public CommitPayoutTx(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade); super(taskHandler, trade);
} }

6
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/BuyerCreatesAndSignPayoutTx.java → core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/CreateAndSignPayoutTx.java
View file

@ -26,10 +26,10 @@ import org.bitcoinj.core.Coin;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class BuyerCreatesAndSignPayoutTx extends TradeTask { public class CreateAndSignPayoutTx extends TradeTask {
private static final Logger log = LoggerFactory.getLogger(BuyerCreatesAndSignPayoutTx.class); private static final Logger log = LoggerFactory.getLogger(CreateAndSignPayoutTx.class);
public BuyerCreatesAndSignPayoutTx(TaskRunner taskHandler, Trade trade) { public CreateAndSignPayoutTx(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade); super(taskHandler, trade);
} }

6
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/BuyerCreatesDepositTxInputs.java → core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/CreateDepositTxInputs.java
View file

@ -29,10 +29,10 @@ import org.bitcoinj.core.Coin;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class BuyerCreatesDepositTxInputs extends TradeTask { public class CreateDepositTxInputs extends TradeTask {
private static final Logger log = LoggerFactory.getLogger(BuyerCreatesDepositTxInputs.class); private static final Logger log = LoggerFactory.getLogger(CreateDepositTxInputs.class);
public BuyerCreatesDepositTxInputs(TaskRunner taskHandler, Trade trade) { public CreateDepositTxInputs(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade); super(taskHandler, trade);
} }

6
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/BuyerProcessPayoutTxPublishedMessage.java → core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessPayoutTxPublishedMessage.java
View file

@ -32,10 +32,10 @@ import org.slf4j.LoggerFactory;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static io.bitsquare.util.Validator.checkTradeId; import static io.bitsquare.util.Validator.checkTradeId;
public class BuyerProcessPayoutTxPublishedMessage extends TradeTask { public class ProcessPayoutTxPublishedMessage extends TradeTask {
private static final Logger log = LoggerFactory.getLogger(BuyerProcessPayoutTxPublishedMessage.class); private static final Logger log = LoggerFactory.getLogger(ProcessPayoutTxPublishedMessage.class);
public BuyerProcessPayoutTxPublishedMessage(TaskRunner taskHandler, Trade trade) { public ProcessPayoutTxPublishedMessage(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade); super(taskHandler, trade);
} }

6
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/BuyerProcessRequestPublishDepositTxMessage.java → core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessRequestPublishDepositTxMessage.java
View file

@ -29,10 +29,10 @@ import org.slf4j.LoggerFactory;
import static com.google.common.base.Preconditions.*; import static com.google.common.base.Preconditions.*;
import static io.bitsquare.util.Validator.*; import static io.bitsquare.util.Validator.*;
public class BuyerProcessRequestPublishDepositTxMessage extends TradeTask { public class ProcessRequestPublishDepositTxMessage extends TradeTask {
private static final Logger log = LoggerFactory.getLogger(BuyerProcessRequestPublishDepositTxMessage.class); private static final Logger log = LoggerFactory.getLogger(ProcessRequestPublishDepositTxMessage.class);
public BuyerProcessRequestPublishDepositTxMessage(TaskRunner taskHandler, Trade trade) { public ProcessRequestPublishDepositTxMessage(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade); super(taskHandler, trade);
} }

6
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/BuyerSendsDepositTxPublishedMessage.java → core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendDepositTxPublishedMessage.java
View file

@ -27,10 +27,10 @@ import io.bitsquare.trade.states.StateUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class BuyerSendsDepositTxPublishedMessage extends TradeTask { public class SendDepositTxPublishedMessage extends TradeTask {
private static final Logger log = LoggerFactory.getLogger(BuyerSendsDepositTxPublishedMessage.class); private static final Logger log = LoggerFactory.getLogger(SendDepositTxPublishedMessage.class);
public BuyerSendsDepositTxPublishedMessage(TaskRunner taskHandler, Trade trade) { public SendDepositTxPublishedMessage(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade); super(taskHandler, trade);
} }

6
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/BuyerSendsFiatTransferStartedMessage.java → core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendFiatTransferStartedMessage.java
View file

@ -31,10 +31,10 @@ import io.bitsquare.trade.states.TakerTradeState;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class BuyerSendsFiatTransferStartedMessage extends TradeTask { public class SendFiatTransferStartedMessage extends TradeTask {
private static final Logger log = LoggerFactory.getLogger(BuyerSendsFiatTransferStartedMessage.class); private static final Logger log = LoggerFactory.getLogger(SendFiatTransferStartedMessage.class);
public BuyerSendsFiatTransferStartedMessage(TaskRunner taskHandler, Trade trade) { public SendFiatTransferStartedMessage(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade); super(taskHandler, trade);
} }

6
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/BuyerSendsRequestPayDepositMessage.java → core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendRequestPayDepositMessage.java
View file

@ -27,10 +27,10 @@ import io.bitsquare.trade.states.StateUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class BuyerSendsRequestPayDepositMessage extends TradeTask { public class SendRequestPayDepositMessage extends TradeTask {
private static final Logger log = LoggerFactory.getLogger(BuyerSendsRequestPayDepositMessage.class); private static final Logger log = LoggerFactory.getLogger(SendRequestPayDepositMessage.class);
public BuyerSendsRequestPayDepositMessage(TaskRunner taskHandler, Trade trade) { public SendRequestPayDepositMessage(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade); super(taskHandler, trade);
} }

6
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/BuyerSignsAndPublishDepositTx.java → core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndPublishDepositTx.java
View file

@ -36,10 +36,10 @@ import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class BuyerSignsAndPublishDepositTx extends TradeTask { public class SignAndPublishDepositTx extends TradeTask {
private static final Logger log = LoggerFactory.getLogger(BuyerSignsAndPublishDepositTx.class); private static final Logger log = LoggerFactory.getLogger(SignAndPublishDepositTx.class);
public BuyerSignsAndPublishDepositTx(TaskRunner taskHandler, Trade trade) { public SignAndPublishDepositTx(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade); super(taskHandler, trade);
} }

6
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/BuyerVerifiesAndSignsContract.java → core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/VerifyAndSignContract.java
View file

@ -27,10 +27,10 @@ import io.bitsquare.util.Utilities;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class BuyerVerifiesAndSignsContract extends TradeTask { public class VerifyAndSignContract extends TradeTask {
private static final Logger log = LoggerFactory.getLogger(BuyerVerifiesAndSignsContract.class); private static final Logger log = LoggerFactory.getLogger(VerifyAndSignContract.class);
public BuyerVerifiesAndSignsContract(TaskRunner taskHandler, Trade trade) { public VerifyAndSignContract(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade); super(taskHandler, trade);
} }

6
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SellerCommitDepositTx.java → core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CommitDepositTx.java
View file

@ -26,10 +26,10 @@ import org.bitcoinj.core.Transaction;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class SellerCommitDepositTx extends TradeTask { public class CommitDepositTx extends TradeTask {
private static final Logger log = LoggerFactory.getLogger(SellerCommitDepositTx.class); private static final Logger log = LoggerFactory.getLogger(CommitDepositTx.class);
public SellerCommitDepositTx(TaskRunner taskHandler, Trade trade) { public CommitDepositTx(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade); super(taskHandler, trade);
} }

6
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SellerCreatesAndSignsContract.java → core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CreateAndSignContract.java
View file

@ -26,10 +26,10 @@ import io.bitsquare.util.Utilities;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class SellerCreatesAndSignsContract extends TradeTask { public class CreateAndSignContract extends TradeTask {
private static final Logger log = LoggerFactory.getLogger(SellerCreatesAndSignsContract.class); private static final Logger log = LoggerFactory.getLogger(CreateAndSignContract.class);
public SellerCreatesAndSignsContract(TaskRunner taskHandler, Trade trade) { public CreateAndSignContract(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade); super(taskHandler, trade);
} }

6
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SellerCreatesAndSignsDepositTx.java → core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CreateAndSignDepositTx.java
View file

@ -28,10 +28,10 @@ import org.bitcoinj.core.Coin;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class SellerCreatesAndSignsDepositTx extends TradeTask { public class CreateAndSignDepositTx extends TradeTask {
private static final Logger log = LoggerFactory.getLogger(SellerCreatesAndSignsDepositTx.class); private static final Logger log = LoggerFactory.getLogger(CreateAndSignDepositTx.class);
public SellerCreatesAndSignsDepositTx(TaskRunner taskHandler, Trade trade) { public CreateAndSignDepositTx(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade); super(taskHandler, trade);
} }

6
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SellerProcessDepositTxPublishedMessage.java → core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessDepositTxPublishedMessage.java
View file

@ -32,10 +32,10 @@ import org.slf4j.LoggerFactory;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static io.bitsquare.util.Validator.checkTradeId; import static io.bitsquare.util.Validator.checkTradeId;
public class SellerProcessDepositTxPublishedMessage extends TradeTask { public class ProcessDepositTxPublishedMessage extends TradeTask {
private static final Logger log = LoggerFactory.getLogger(SellerProcessDepositTxPublishedMessage.class); private static final Logger log = LoggerFactory.getLogger(ProcessDepositTxPublishedMessage.class);
public SellerProcessDepositTxPublishedMessage(TaskRunner taskHandler, Trade trade) { public ProcessDepositTxPublishedMessage(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade); super(taskHandler, trade);
} }

6
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SellerProcessFiatTransferStartedMessage.java → core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessFiatTransferStartedMessage.java
View file

@ -32,10 +32,10 @@ import org.slf4j.LoggerFactory;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static io.bitsquare.util.Validator.*; import static io.bitsquare.util.Validator.*;
public class SellerProcessFiatTransferStartedMessage extends TradeTask { public class ProcessFiatTransferStartedMessage extends TradeTask {
private static final Logger log = LoggerFactory.getLogger(SellerProcessFiatTransferStartedMessage.class); private static final Logger log = LoggerFactory.getLogger(ProcessFiatTransferStartedMessage.class);
public SellerProcessFiatTransferStartedMessage(TaskRunner taskHandler, Trade trade) { public ProcessFiatTransferStartedMessage(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade); super(taskHandler, trade);
} }

6
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SellerProcessRequestPayDepositMessage.java → core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessRequestPayDepositMessage.java
View file

@ -28,10 +28,10 @@ import org.slf4j.LoggerFactory;
import static com.google.common.base.Preconditions.*; import static com.google.common.base.Preconditions.*;
import static io.bitsquare.util.Validator.*; import static io.bitsquare.util.Validator.*;
public class SellerProcessRequestPayDepositMessage extends TradeTask { public class ProcessRequestPayDepositMessage extends TradeTask {
private static final Logger log = LoggerFactory.getLogger(SellerProcessRequestPayDepositMessage.class); private static final Logger log = LoggerFactory.getLogger(ProcessRequestPayDepositMessage.class);
public SellerProcessRequestPayDepositMessage(TaskRunner taskHandler, Trade trade) { public ProcessRequestPayDepositMessage(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade); super(taskHandler, trade);
} }

6
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SellerSendsPayoutTxPublishedMessage.java → core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendPayoutTxPublishedMessage.java
View file

@ -27,10 +27,10 @@ import io.bitsquare.trade.states.StateUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class SellerSendsPayoutTxPublishedMessage extends TradeTask { public class SendPayoutTxPublishedMessage extends TradeTask {
private static final Logger log = LoggerFactory.getLogger(SellerSendsPayoutTxPublishedMessage.class); private static final Logger log = LoggerFactory.getLogger(SendPayoutTxPublishedMessage.class);
public SellerSendsPayoutTxPublishedMessage(TaskRunner taskHandler, Trade trade) { public SendPayoutTxPublishedMessage(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade); super(taskHandler, trade);
} }

6
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SellerSendsRequestPublishDepositTxMessage.java → core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendRequestPublishDepositTxMessage.java
View file

@ -27,10 +27,10 @@ import io.bitsquare.trade.states.StateUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class SellerSendsRequestPublishDepositTxMessage extends TradeTask { public class SendRequestPublishDepositTxMessage extends TradeTask {
private static final Logger log = LoggerFactory.getLogger(SellerSendsRequestPublishDepositTxMessage.class); private static final Logger log = LoggerFactory.getLogger(SendRequestPublishDepositTxMessage.class);
public SellerSendsRequestPublishDepositTxMessage(TaskRunner taskHandler, Trade trade) { public SendRequestPublishDepositTxMessage(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade); super(taskHandler, trade);
} }

6
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SellerSignsAndPublishPayoutTx.java → core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignAndPublishPayoutTx.java
View file

@ -34,10 +34,10 @@ import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class SellerSignsAndPublishPayoutTx extends TradeTask { public class SignAndPublishPayoutTx extends TradeTask {
private static final Logger log = LoggerFactory.getLogger(SellerSignsAndPublishPayoutTx.class); private static final Logger log = LoggerFactory.getLogger(SignAndPublishPayoutTx.class);
public SellerSignsAndPublishPayoutTx(TaskRunner taskHandler, Trade trade) { public SignAndPublishPayoutTx(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade); super(taskHandler, trade);
} }