From 34bbe4678f8fd07e91156e086ee2e6df4686ef7d Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Wed, 20 Jan 2016 02:55:55 +0100 Subject: [PATCH] Cleanup --- .../src/main/java/io/bitsquare/trade/TradeManager.java | 10 +++------- .../io/bitsquare/trade/failed/FailedTradesManager.java | 3 ++- .../bitsquare/trade/protocol/trade/TradeProtocol.java | 6 ++++-- .../tasks/offerer/SetupDepositBalanceListener.java | 2 +- .../main/markets/statistics/MarketsStatisticsView.java | 2 +- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/io/bitsquare/trade/TradeManager.java b/core/src/main/java/io/bitsquare/trade/TradeManager.java index 30f90934c6..8cc30f7876 100644 --- a/core/src/main/java/io/bitsquare/trade/TradeManager.java +++ b/core/src/main/java/io/bitsquare/trade/TradeManager.java @@ -59,9 +59,7 @@ import org.spongycastle.crypto.params.KeyParameter; import javax.inject.Inject; import javax.inject.Named; import java.io.File; -import java.util.ArrayList; import java.util.Date; -import java.util.List; import java.util.Optional; import java.util.concurrent.TimeUnit; @@ -174,13 +172,11 @@ public class TradeManager { private void initPendingTrades() { if (firstPeerAuthenticatedListener != null) p2PService.removeP2PServiceListener(firstPeerAuthenticatedListener); - List failedTrades = new ArrayList<>(); + //List failedTrades = new ArrayList<>(); for (Trade trade : trades) { // We continue an interrupted trade. - // TODO if the peer has changed its IP address, we need to make another findPeer request. At the moment we use the peer stored in trade to - // continue the trade, but that might fail. - // TODO + // TODO /* if (trade.isFailedState()) { failedTrades.add(trade); } @@ -200,7 +196,7 @@ public class TradeManager { } pendingTradesInitialized.set(true); - failedTrades.stream().filter(Trade::isTakerFeePaid).forEach(this::addTradeToFailedTrades); + //failedTrades.stream().filter(Trade::isTakerFeePaid).forEach(this::addTradeToFailedTrades); } private void handleInitialTakeOfferRequest(TradeMessage message, Address peerAddress) { diff --git a/core/src/main/java/io/bitsquare/trade/failed/FailedTradesManager.java b/core/src/main/java/io/bitsquare/trade/failed/FailedTradesManager.java index ba4bb84043..200eb98b0b 100644 --- a/core/src/main/java/io/bitsquare/trade/failed/FailedTradesManager.java +++ b/core/src/main/java/io/bitsquare/trade/failed/FailedTradesManager.java @@ -43,7 +43,8 @@ public class FailedTradesManager { } public void add(Trade trade) { - failedTrades.add(trade); + if (!failedTrades.contains(trade)) + failedTrades.add(trade); } public boolean wasMyOffer(Offer offer) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java index f67844e848..bb6d4827c0 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java @@ -26,6 +26,7 @@ import io.bitsquare.p2p.messaging.DecryptedMsgWithPubKey; import io.bitsquare.trade.OffererTrade; import io.bitsquare.trade.TakerTrade; import io.bitsquare.trade.Trade; +import io.bitsquare.trade.TradeManager; import io.bitsquare.trade.protocol.trade.messages.TradeMessage; import io.bitsquare.trade.protocol.trade.tasks.shared.SetupPayoutTxLockTimeReachedListener; import org.slf4j.Logger; @@ -157,10 +158,11 @@ public abstract class TradeProtocol { boolean isTakerTrade = trade instanceof TakerTrade; if (isTakerTrade) { + TradeManager tradeManager = processModel.getTradeManager(); if (tradeState.getPhase() == Trade.Phase.PREPARATION) { - processModel.getTradeManager().removePreparedTrade(trade); + tradeManager.removePreparedTrade(trade); } else if (tradeState.getPhase() == Trade.Phase.TAKER_FEE_PAID) { - processModel.getTradeManager().addTradeToFailedTrades(trade); + tradeManager.addTradeToFailedTrades(trade); } } } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/SetupDepositBalanceListener.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/SetupDepositBalanceListener.java index 61085f92be..a83a3ae2ff 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/SetupDepositBalanceListener.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/SetupDepositBalanceListener.java @@ -97,7 +97,7 @@ public class SetupDepositBalanceListener extends TradeTask { trade.setState(Trade.State.DEPOSIT_SEEN_IN_NETWORK); } else if (tradeState.getPhase() == Trade.Phase.PREPARATION) { processModel.getTradeManager().removePreparedTrade(trade); - } else if (tradeState.getPhase().ordinal() < Trade.Phase.DEPOSIT_PAID.ordinal()) { + } else if (tradeState.getPhase().ordinal() < Trade.Phase.DEPOSIT_PAID.ordinal()) { // TODO need to evaluate if that is correct processModel.getTradeManager().addTradeToFailedTrades(trade); } } diff --git a/gui/src/main/java/io/bitsquare/gui/main/markets/statistics/MarketsStatisticsView.java b/gui/src/main/java/io/bitsquare/gui/main/markets/statistics/MarketsStatisticsView.java index 8c89d640c7..2234e23595 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/markets/statistics/MarketsStatisticsView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/markets/statistics/MarketsStatisticsView.java @@ -69,7 +69,7 @@ public class MarketsStatisticsView extends ActivatableViewAndModel