From 1f362d80a2c73a276e279769eaa1f4e31eadec5e Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 23 Apr 2015 13:37:40 +0200 Subject: [PATCH] Remove unused methods --- .../java/io/bitsquare/trade/TradeState.java | 1 - .../trade/protocol/trade/tasks/TradeTask.java | 15 +++++-- .../tasks/buyer/CreateDepositTxInputs.java | 5 --- .../buyer/ProcessDepositTxInputsRequest.java | 3 -- .../buyer/ProcessFinalizePayoutTxRequest.java | 4 -- .../buyer/ProcessPublishDepositTxRequest.java | 4 -- .../buyer/SendDepositTxPublishedMessage.java | 7 ---- .../buyer/SendFiatTransferStartedMessage.java | 7 ---- .../tasks/buyer/SendPayDepositRequest.java | 12 +----- .../buyer/SendPayoutTxFinalizedMessage.java | 5 --- .../tasks/buyer/SignAndFinalizePayoutTx.java | 2 - .../tasks/buyer/SignAndPublishDepositTx.java | 10 +---- .../tasks/buyer/VerifyAndSignContract.java | 6 --- .../offerer/VerifyTakeOfferFeePayment.java | 2 - .../tasks/offerer/VerifyTakerAccount.java | 12 +----- .../trade/tasks/seller/CommitDepositTx.java | 2 - .../tasks/seller/CreateAndSignContract.java | 2 - .../tasks/seller/CreateAndSignDepositTx.java | 2 - .../ProcessDepositTxPublishedMessage.java | 2 - .../ProcessFiatTransferStartedMessage.java | 2 - .../seller/ProcessPayDepositRequest.java | 2 - .../ProcessPayoutTxFinalizedMessage.java | 2 - .../seller/SendDepositTxInputsRequest.java | 5 --- .../seller/SendFinalizePayoutTxRequest.java | 9 +--- .../seller/SendPublishDepositTxRequest.java | 9 +--- .../trade/tasks/seller/SignPayoutTx.java | 2 - .../trade/tasks/shared/CommitPayoutTx.java | 2 - .../SetupPayoutTxLockTimeReachedListener.java | 12 ------ .../tasks/taker/VerifyOfferFeePayment.java | 2 - .../tasks/taker/VerifyOffererAccount.java | 2 - .../io/bitsquare/trade/states/StateUtil.java | 41 ------------------- .../closedtrades/ClosedTradesViewModel.java | 2 + .../failedtrades/FailedTradesViewModel.java | 6 ++- 33 files changed, 26 insertions(+), 175 deletions(-) delete mode 100644 core/src/main/java/io/bitsquare/trade/states/StateUtil.java diff --git a/core/src/main/java/io/bitsquare/trade/TradeState.java b/core/src/main/java/io/bitsquare/trade/TradeState.java index 4d1390a44f..74dcbf5d21 100644 --- a/core/src/main/java/io/bitsquare/trade/TradeState.java +++ b/core/src/main/java/io/bitsquare/trade/TradeState.java @@ -58,7 +58,6 @@ public interface TradeState { SellerState(Phase phase) { this.phase = phase; } - } enum BuyerState implements TradeState { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/TradeTask.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/TradeTask.java index d5c71cbf8b..eee1c548c5 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/TradeTask.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/TradeTask.java @@ -25,7 +25,7 @@ import io.bitsquare.trade.protocol.trade.ProcessModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TradeTask extends Task { +public abstract class TradeTask extends Task { private static final Logger log = LoggerFactory.getLogger(TradeTask.class); protected final ProcessModel processModel; @@ -39,7 +39,16 @@ public class TradeTask extends Task { } @Override - protected void run() { + protected void failed() { + trade.setErrorMessage(errorMessage); + super.failed(); + } + + @Override + protected void failed(String message) { + appendToErrorMessage(message); + trade.setErrorMessage(errorMessage); + super.failed(); } @Override @@ -47,6 +56,6 @@ public class TradeTask extends Task { t.printStackTrace(); appendExceptionToErrorMessage(t); trade.setErrorMessage(errorMessage); - failed(); + super.failed(); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/CreateDepositTxInputs.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/CreateDepositTxInputs.java index e61aa7aadd..ece0204fa0 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/CreateDepositTxInputs.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/CreateDepositTxInputs.java @@ -22,7 +22,6 @@ import io.bitsquare.btc.TradeWalletService; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.tasks.TradeTask; -import io.bitsquare.trade.states.StateUtil; import org.bitcoinj.core.Coin; @@ -50,10 +49,6 @@ public class CreateDepositTxInputs extends TradeTask { complete(); } catch (Throwable t) { - t.printStackTrace(); - - StateUtil.setOfferOpenState(trade); - failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessDepositTxInputsRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessDepositTxInputsRequest.java index 77d6e0d011..5272a6c91f 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessDepositTxInputsRequest.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessDepositTxInputsRequest.java @@ -21,7 +21,6 @@ import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.DepositTxInputsRequest; import io.bitsquare.trade.protocol.trade.tasks.TradeTask; -import io.bitsquare.trade.states.StateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,8 +50,6 @@ public class ProcessDepositTxInputsRequest extends TradeTask { complete(); } catch (Throwable t) { - t.printStackTrace(); - StateUtil.setOfferOpenState(trade); failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessFinalizePayoutTxRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessFinalizePayoutTxRequest.java index 13771c8023..61d72876e2 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessFinalizePayoutTxRequest.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessFinalizePayoutTxRequest.java @@ -22,7 +22,6 @@ import io.bitsquare.trade.Trade; import io.bitsquare.trade.TradeState; import io.bitsquare.trade.protocol.trade.messages.FinalizePayoutTxRequest; import io.bitsquare.trade.protocol.trade.tasks.TradeTask; -import io.bitsquare.trade.states.StateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,9 +52,6 @@ public class ProcessFinalizePayoutTxRequest extends TradeTask { complete(); } catch (Throwable t) { - t.printStackTrace(); - - StateUtil.setOfferOpenState(trade); failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessPublishDepositTxRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessPublishDepositTxRequest.java index 34ecc534ed..2674cabae6 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessPublishDepositTxRequest.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessPublishDepositTxRequest.java @@ -21,7 +21,6 @@ import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.PublishDepositTxRequest; import io.bitsquare.trade.protocol.trade.tasks.TradeTask; -import io.bitsquare.trade.states.StateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,9 +55,6 @@ public class ProcessPublishDepositTxRequest extends TradeTask { complete(); } catch (Throwable t) { - t.printStackTrace(); - - StateUtil.setOfferOpenState(trade); failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendDepositTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendDepositTxPublishedMessage.java index e3e6d88f80..9437fe7d3e 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendDepositTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendDepositTxPublishedMessage.java @@ -23,7 +23,6 @@ import io.bitsquare.trade.Trade; import io.bitsquare.trade.TradeState; import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage; import io.bitsquare.trade.protocol.trade.tasks.TradeTask; -import io.bitsquare.trade.states.StateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,16 +57,10 @@ public class SendDepositTxPublishedMessage extends TradeTask { @Override public void handleFault() { appendToErrorMessage("Sending DepositTxPublishedMessage failed"); - trade.setErrorMessage(errorMessage); - - StateUtil.setSendFailedState(trade); - failed(); } }); } catch (Throwable t) { - t.printStackTrace(); - failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendFiatTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendFiatTransferStartedMessage.java index cc990440eb..7bf2c90263 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendFiatTransferStartedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendFiatTransferStartedMessage.java @@ -23,7 +23,6 @@ import io.bitsquare.trade.Trade; import io.bitsquare.trade.TradeState; import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage; import io.bitsquare.trade.protocol.trade.tasks.TradeTask; -import io.bitsquare.trade.states.StateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -60,17 +59,11 @@ public class SendFiatTransferStartedMessage extends TradeTask { @Override public void handleFault() { appendToErrorMessage("Sending FiatTransferStartedMessage failed"); - trade.setErrorMessage(errorMessage); - - StateUtil.setSendFailedState(trade); - failed(); } } ); } catch (Throwable t) { - t.printStackTrace(); - failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendPayDepositRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendPayDepositRequest.java index e89c1a62f3..8785a48185 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendPayDepositRequest.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendPayDepositRequest.java @@ -23,7 +23,6 @@ import io.bitsquare.trade.BuyerAsTakerTrade; import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.PayDepositRequest; import io.bitsquare.trade.protocol.trade.tasks.TradeTask; -import io.bitsquare.trade.states.StateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,24 +58,17 @@ public class SendPayDepositRequest extends TradeTask { new SendMessageListener() { @Override public void handleResult() { - log.trace("RequestTakerDepositPaymentMessage successfully arrived at peer"); + log.trace("PayDepositRequest successfully arrived at peer"); complete(); } @Override public void handleFault() { - appendToErrorMessage("Sending RequestTakerDepositPaymentMessage failed"); - trade.setErrorMessage(errorMessage); - StateUtil.setOfferOpenState(trade); - StateUtil.setSendFailedState(trade); + appendToErrorMessage("Sending PayDepositRequest failed"); failed(); } }); } catch (Throwable t) { - t.printStackTrace(); - - StateUtil.setOfferOpenState(trade); - StateUtil.setSendFailedState(trade); failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendPayoutTxFinalizedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendPayoutTxFinalizedMessage.java index 424ca5eb6a..4bb4b2ae03 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendPayoutTxFinalizedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendPayoutTxFinalizedMessage.java @@ -23,7 +23,6 @@ import io.bitsquare.trade.Trade; import io.bitsquare.trade.TradeState; import io.bitsquare.trade.protocol.trade.messages.PayoutTxFinalizedMessage; import io.bitsquare.trade.protocol.trade.tasks.TradeTask; -import io.bitsquare.trade.states.StateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,14 +56,10 @@ public class SendPayoutTxFinalizedMessage extends TradeTask { @Override public void handleFault() { appendToErrorMessage("Sending PayoutTxFinalizedMessage failed"); - trade.setErrorMessage(errorMessage); - StateUtil.setSendFailedState(trade); failed(); } }); } catch (Throwable t) { - t.printStackTrace(); - failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndFinalizePayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndFinalizePayoutTx.java index d448db75c9..cef45a46e0 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndFinalizePayoutTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndFinalizePayoutTx.java @@ -60,8 +60,6 @@ public class SignAndFinalizePayoutTx extends TradeTask { complete(); } catch (Throwable t) { - t.printStackTrace(); - failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndPublishDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndPublishDepositTx.java index 27854ed11d..498a93edb4 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndPublishDepositTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndPublishDepositTx.java @@ -72,17 +72,11 @@ public class SignAndPublishDepositTx extends TradeTask { @Override public void onFailure(@NotNull Throwable t) { - handleFault(t); + failed(t); } }); } catch (Throwable t) { - handleFault(t); + failed(t); } } - - private void handleFault(Throwable t) { - t.printStackTrace(); - - failed(t); - } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/VerifyAndSignContract.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/VerifyAndSignContract.java index 1d8bdb8e3f..2f5b48fe62 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/VerifyAndSignContract.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/VerifyAndSignContract.java @@ -21,7 +21,6 @@ import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Contract; import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.tasks.TradeTask; -import io.bitsquare.trade.states.StateUtil; import io.bitsquare.util.Utilities; import org.slf4j.Logger; @@ -57,11 +56,6 @@ public class VerifyAndSignContract extends TradeTask { complete(); } catch (Throwable t) { - t.printStackTrace(); - - - StateUtil.setOfferOpenState(trade); - failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/VerifyTakeOfferFeePayment.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/VerifyTakeOfferFeePayment.java index b5c6833ce2..721142a22f 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/VerifyTakeOfferFeePayment.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/VerifyTakeOfferFeePayment.java @@ -43,8 +43,6 @@ public class VerifyTakeOfferFeePayment extends TradeTask { complete(); } catch (Throwable t) { - t.printStackTrace(); - failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/VerifyTakerAccount.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/VerifyTakerAccount.java index 1c8aa4733c..a5fffae9be 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/VerifyTakerAccount.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/VerifyTakerAccount.java @@ -20,7 +20,6 @@ package io.bitsquare.trade.protocol.trade.tasks.offerer; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.tasks.TradeTask; -import io.bitsquare.trade.states.StateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,9 +38,7 @@ public class VerifyTakerAccount extends TradeTask { //TODO mocked yet if (processModel.getBlockChainService().verifyAccountRegistration()) { if (processModel.getBlockChainService().isAccountBlackListed(processModel.tradingPeer.getAccountId(), - processModel - .tradingPeer - .getFiatAccount())) { + processModel.tradingPeer.getFiatAccount())) { log.error("Taker is blacklisted"); failed("Taker is blacklisted"); } @@ -51,15 +48,8 @@ public class VerifyTakerAccount extends TradeTask { } else { failed("Account registration validation for peer failed."); - - StateUtil.setOfferOpenState(trade); } } catch (Throwable t) { - t.printStackTrace(); - - - StateUtil.setOfferOpenState(trade); - failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CommitDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CommitDepositTx.java index 77793df1a2..bfa04a753f 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CommitDepositTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CommitDepositTx.java @@ -44,8 +44,6 @@ public class CommitDepositTx extends TradeTask { complete(); } catch (Throwable t) { - t.printStackTrace(); - failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CreateAndSignContract.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CreateAndSignContract.java index e77dfbfb77..5390552f5c 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CreateAndSignContract.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CreateAndSignContract.java @@ -57,8 +57,6 @@ public class CreateAndSignContract extends TradeTask { complete(); } catch (Throwable t) { - t.printStackTrace(); - failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CreateAndSignDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CreateAndSignDepositTx.java index 9006e9064c..2e0d8623d6 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CreateAndSignDepositTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CreateAndSignDepositTx.java @@ -59,8 +59,6 @@ public class CreateAndSignDepositTx extends TradeTask { complete(); } catch (Throwable t) { - t.printStackTrace(); - failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessDepositTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessDepositTxPublishedMessage.java index 736407e099..219ec7ad8b 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessDepositTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessDepositTxPublishedMessage.java @@ -50,8 +50,6 @@ public class ProcessDepositTxPublishedMessage extends TradeTask { complete(); } catch (Throwable t) { - t.printStackTrace(); - failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessFiatTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessFiatTransferStartedMessage.java index c62a2fa38e..a895168130 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessFiatTransferStartedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessFiatTransferStartedMessage.java @@ -50,8 +50,6 @@ public class ProcessFiatTransferStartedMessage extends TradeTask { complete(); } catch (Throwable t) { - t.printStackTrace(); - failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessPayDepositRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessPayDepositRequest.java index 8a255fb4a1..96d01342a5 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessPayDepositRequest.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessPayDepositRequest.java @@ -55,8 +55,6 @@ public class ProcessPayDepositRequest extends TradeTask { complete(); } catch (Throwable t) { - t.printStackTrace(); - failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessPayoutTxFinalizedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessPayoutTxFinalizedMessage.java index 5fc2f93005..2c22ed8f97 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessPayoutTxFinalizedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessPayoutTxFinalizedMessage.java @@ -50,8 +50,6 @@ public class ProcessPayoutTxFinalizedMessage extends TradeTask { complete(); } catch (Throwable t) { - t.printStackTrace(); - failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendDepositTxInputsRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendDepositTxInputsRequest.java index 02d09e742d..40429c7fa0 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendDepositTxInputsRequest.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendDepositTxInputsRequest.java @@ -22,7 +22,6 @@ import io.bitsquare.p2p.listener.SendMessageListener; import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.DepositTxInputsRequest; import io.bitsquare.trade.protocol.trade.tasks.TradeTask; -import io.bitsquare.trade.states.StateUtil; import org.bitcoinj.utils.Threading; @@ -75,15 +74,11 @@ public class SendDepositTxInputsRequest extends TradeTask { "lost or the offerer lost his connection. We persisted the state of the trade, please try again later " + "or cancel that trade."); - trade.setErrorMessage(errorMessage); - StateUtil.setSendFailedState(trade); failed(); } } }); } catch (Throwable t) { - t.printStackTrace(); - failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendFinalizePayoutTxRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendFinalizePayoutTxRequest.java index 6219f8e70d..739ffba544 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendFinalizePayoutTxRequest.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendFinalizePayoutTxRequest.java @@ -23,7 +23,6 @@ import io.bitsquare.trade.Trade; import io.bitsquare.trade.TradeState; import io.bitsquare.trade.protocol.trade.messages.FinalizePayoutTxRequest; import io.bitsquare.trade.protocol.trade.tasks.TradeTask; -import io.bitsquare.trade.states.StateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +52,7 @@ public class SendFinalizePayoutTxRequest extends TradeTask { new SendMessageListener() { @Override public void handleResult() { - log.trace("PayoutTxPublishedMessage successfully arrived at peer"); + log.trace("FinalizePayoutTxRequest successfully arrived at peer"); trade.setTradeState(TradeState.SellerState.FIAT_PAYMENT_RECEIPT_MSG_SENT); @@ -62,15 +61,11 @@ public class SendFinalizePayoutTxRequest extends TradeTask { @Override public void handleFault() { - appendToErrorMessage("Sending PayoutTxPublishedMessage failed"); - trade.setErrorMessage(errorMessage); - StateUtil.setSendFailedState(trade); + appendToErrorMessage("Sending FinalizePayoutTxRequest failed"); failed(); } }); } catch (Throwable t) { - t.printStackTrace(); - failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendPublishDepositTxRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendPublishDepositTxRequest.java index ccdee4eb49..3a0c80f5c0 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendPublishDepositTxRequest.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendPublishDepositTxRequest.java @@ -22,7 +22,6 @@ import io.bitsquare.p2p.listener.SendMessageListener; import io.bitsquare.trade.Trade; import io.bitsquare.trade.protocol.trade.messages.PublishDepositTxRequest; import io.bitsquare.trade.protocol.trade.tasks.TradeTask; -import io.bitsquare.trade.states.StateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -62,17 +61,11 @@ public class SendPublishDepositTxRequest extends TradeTask { @Override public void handleFault() { - appendToErrorMessage("Sending RequestOffererPublishDepositTxMessage failed"); - trade.setErrorMessage(errorMessage); - - StateUtil.setSendFailedState(trade); - + appendToErrorMessage("Sending PublishDepositTxRequest failed"); failed(); } }); } catch (Throwable t) { - t.printStackTrace(); - failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignPayoutTx.java index cb9a42a8a1..640f0b0fbd 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignPayoutTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignPayoutTx.java @@ -61,8 +61,6 @@ public class SignPayoutTx extends TradeTask { complete(); } catch (Throwable t) { - t.printStackTrace(); - failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/CommitPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/CommitPayoutTx.java index e444c2b09c..4d4c119739 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/CommitPayoutTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/CommitPayoutTx.java @@ -51,8 +51,6 @@ public class CommitPayoutTx extends TradeTask { complete(); } catch (Throwable t) { - t.printStackTrace(); - failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/SetupPayoutTxLockTimeReachedListener.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/SetupPayoutTxLockTimeReachedListener.java index 3ef48a4a1c..681b99ec0c 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/SetupPayoutTxLockTimeReachedListener.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/SetupPayoutTxLockTimeReachedListener.java @@ -67,8 +67,6 @@ public class SetupPayoutTxLockTimeReachedListener extends TradeTask { Threading.USER_THREAD::execute); } } catch (Throwable t) { - t.printStackTrace(); - failed(t); } } @@ -84,21 +82,11 @@ public class SetupPayoutTxLockTimeReachedListener extends TradeTask { else if (trade instanceof SellerTrade) trade.setTradeState(TradeState.SellerState.PAYOUT_BROAD_CASTED); - complete(); } @Override public void onFailure(@NotNull Throwable t) { - t.printStackTrace(); - -/* - if (trade instanceof TakerTrade) - trade.setProcessState(TakerTradeState.ProcessState.PAYOUT_BROAD_CASTED_FAILED); - else if (trade instanceof OffererTrade) - trade.setProcessState(OffererTradeState.ProcessState.PAYOUT_BROAD_CASTED_FAILED);*/ - - failed(t); } }); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/VerifyOfferFeePayment.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/VerifyOfferFeePayment.java index 2e0b40fa01..b0f19471b9 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/VerifyOfferFeePayment.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/VerifyOfferFeePayment.java @@ -42,8 +42,6 @@ public class VerifyOfferFeePayment extends TradeTask { }*/ complete(); } catch (Throwable t) { - t.printStackTrace(); - failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/VerifyOffererAccount.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/VerifyOffererAccount.java index e3c186b316..9a3cf6ebe4 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/VerifyOffererAccount.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/VerifyOffererAccount.java @@ -48,8 +48,6 @@ public class VerifyOffererAccount extends TradeTask { failed("Account registration validation for peer faultHandler.onFault."); } } catch (Throwable t) { - t.printStackTrace(); - failed(t); } } diff --git a/core/src/main/java/io/bitsquare/trade/states/StateUtil.java b/core/src/main/java/io/bitsquare/trade/states/StateUtil.java deleted file mode 100644 index 548f8fc5e1..0000000000 --- a/core/src/main/java/io/bitsquare/trade/states/StateUtil.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * This file is part of Bitsquare. - * - * Bitsquare is free software: you can redistribute it and/or modify it - * under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at - * your option) any later version. - * - * Bitsquare is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public - * License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Bitsquare. If not, see . - */ - -package io.bitsquare.trade.states; - -import io.bitsquare.trade.Trade; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class StateUtil { - private static final Logger log = LoggerFactory.getLogger(StateUtil.class); - - // TODO remove? - public static void setSendFailedState(Trade trade) { - /* if (trade instanceof BuyerTrade) - trade.setProcessState(BuyerProcessState.MESSAGE_SENDING_FAILED); - else if (trade instanceof SellerTrade) - trade.setProcessState(SellerProcessState.MESSAGE_SENDING_FAILED);*/ - } - - // TODO remove? - public static void setOfferOpenState(Trade trade) { - /*if (trade instanceof BuyerTrade) - trade.setLifeCycleState(Trade.LifeCycleState.PREPARATION);*/ - } -} diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java index 0fac96250a..7314439f5c 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java @@ -94,6 +94,7 @@ class ClosedTradesViewModel extends ActivatableWithDataModel