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

Remove unused methods

Browse Source
This commit is contained in:
Manfred Karrer 2015-04-23 13:37:40 +02:00
parent 398a729a83
commit 1f362d80a2
33 changed files with 26 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/io/bitsquare/trade/TradeState.java
View File

@ -58,7 +58,6 @@ public interface TradeState {
SellerState(Phase phase) {
this.phase = phase;
}
}
enum BuyerState implements TradeState {

15
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/TradeTask.java
View File

@ -25,7 +25,7 @@ import io.bitsquare.trade.protocol.trade.ProcessModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class TradeTask extends Task<Trade> {
public abstract class TradeTask extends Task<Trade> {
private static final Logger log = LoggerFactory.getLogger(TradeTask.class);
protected final ProcessModel processModel;
@ -39,7 +39,16 @@ public class TradeTask extends Task<Trade> {
}
@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<Trade> {
t.printStackTrace();
appendExceptionToErrorMessage(t);
trade.setErrorMessage(errorMessage);
failed();
super.failed();
}
}

5
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/CreateDepositTxInputs.java
View File

@ -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);
}
}

3
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessDepositTxInputsRequest.java
View File

@ -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);
}
}

4
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessFinalizePayoutTxRequest.java
View File

@ -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);
}
}

4
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessPublishDepositTxRequest.java
View File

@ -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);
}
}

7
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendDepositTxPublishedMessage.java
View File

@ -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);
}
}

7
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendFiatTransferStartedMessage.java
View File

@ -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);
}
}

12
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendPayDepositRequest.java
View File

@ -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);
}
}

5
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendPayoutTxFinalizedMessage.java
View File

@ -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);
}
}

2
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndFinalizePayoutTx.java
View File

@ -60,8 +60,6 @@ public class SignAndFinalizePayoutTx extends TradeTask {
complete();
} catch (Throwable t) {
t.printStackTrace();
failed(t);
}
}

10
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndPublishDepositTx.java
View File

@ -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);
}
}

6
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/VerifyAndSignContract.java
View File

@ -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);
}
}

2
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/VerifyTakeOfferFeePayment.java
View File

@ -43,8 +43,6 @@ public class VerifyTakeOfferFeePayment extends TradeTask {
complete();
} catch (Throwable t) {
t.printStackTrace();
failed(t);
}
}

12
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/VerifyTakerAccount.java
View File

@ -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);
}
}

2
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CommitDepositTx.java
View File

@ -44,8 +44,6 @@ public class CommitDepositTx extends TradeTask {
complete();
} catch (Throwable t) {
t.printStackTrace();
failed(t);
}
}

2
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CreateAndSignContract.java
View File

@ -57,8 +57,6 @@ public class CreateAndSignContract extends TradeTask {
complete();
} catch (Throwable t) {
t.printStackTrace();
failed(t);
}
}

2
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CreateAndSignDepositTx.java
View File

@ -59,8 +59,6 @@ public class CreateAndSignDepositTx extends TradeTask {
complete();
} catch (Throwable t) {
t.printStackTrace();
failed(t);
}
}

2
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessDepositTxPublishedMessage.java
View File

@ -50,8 +50,6 @@ public class ProcessDepositTxPublishedMessage extends TradeTask {
complete();
} catch (Throwable t) {
t.printStackTrace();
failed(t);
}
}

2
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessFiatTransferStartedMessage.java
View File

@ -50,8 +50,6 @@ public class ProcessFiatTransferStartedMessage extends TradeTask {
complete();
} catch (Throwable t) {
t.printStackTrace();
failed(t);
}
}

2
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessPayDepositRequest.java
View File

@ -55,8 +55,6 @@ public class ProcessPayDepositRequest extends TradeTask {
complete();
} catch (Throwable t) {
t.printStackTrace();
failed(t);
}
}

2
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessPayoutTxFinalizedMessage.java
View File

@ -50,8 +50,6 @@ public class ProcessPayoutTxFinalizedMessage extends TradeTask {
complete();
} catch (Throwable t) {
t.printStackTrace();
failed(t);
}
}

5
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendDepositTxInputsRequest.java
View File

@ -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);
}
}

9
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendFinalizePayoutTxRequest.java
View File

@ -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);
}
}

9
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendPublishDepositTxRequest.java
View File

@ -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);
}
}

2
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignPayoutTx.java
View File

@ -61,8 +61,6 @@ public class SignPayoutTx extends TradeTask {
complete();
} catch (Throwable t) {
t.printStackTrace();
failed(t);
}
}

2
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/CommitPayoutTx.java
View File

@ -51,8 +51,6 @@ public class CommitPayoutTx extends TradeTask {
complete();
} catch (Throwable t) {
t.printStackTrace();
failed(t);
}
}

12
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/SetupPayoutTxLockTimeReachedListener.java
View File

@ -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);
}
});

2
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/VerifyOfferFeePayment.java
View File

@ -42,8 +42,6 @@ public class VerifyOfferFeePayment extends TradeTask {
}*/
complete();
} catch (Throwable t) {
t.printStackTrace();
failed(t);
}
}

2
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/VerifyOffererAccount.java
View File

@ -48,8 +48,6 @@ public class VerifyOffererAccount extends TradeTask {
failed("Account registration validation for peer faultHandler.onFault.");
}
} catch (Throwable t) {
t.printStackTrace();
failed(t);
}
}

41
core/src/main/java/io/bitsquare/trade/states/StateUtil.java
View File

@ -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 <http://www.gnu.org/licenses/>.
*/
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);*/
}
}

2
gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java
View File

@ -94,6 +94,7 @@ class ClosedTradesViewModel extends ActivatableWithDataModel<ClosedTradesDataMod
}
else {
log.error("That must not happen. We got a pending state but we are in the closed trades list.");
return tradeState.toString();
}
}
else if (trade instanceof SellerTrade) {
@ -105,6 +106,7 @@ class ClosedTradesViewModel extends ActivatableWithDataModel<ClosedTradesDataMod
}
else {
log.error("That must not happen. We got a pending state but we are in the closed trades list.");
return tradeState.toString();
}
}
}

6
gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesViewModel.java
View File

@ -88,7 +88,8 @@ class FailedTradesViewModel extends ActivatableWithDataModel<FailedTradesDataMod
return "Failed";
}
else {
log.error("Wrong state " + item.getTrade().tradeStateProperty().get());
log.error("Wrong state " + tradeState);
return tradeState.toString();
}
}
else if (trade instanceof SellerTrade) {
@ -96,7 +97,8 @@ class FailedTradesViewModel extends ActivatableWithDataModel<FailedTradesDataMod
return "Failed";
}
else {
log.error("Wrong state " + item.getTrade().tradeStateProperty().get());
log.error("Wrong state " + tradeState);
return tradeState.toString();
}
}
}