diff --git a/src/main/java/io/bitsquare/gui/MainController.java b/src/main/java/io/bitsquare/gui/MainController.java index 22262b7d49..e22c22ad89 100644 --- a/src/main/java/io/bitsquare/gui/MainController.java +++ b/src/main/java/io/bitsquare/gui/MainController.java @@ -27,7 +27,7 @@ import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.ImageUtil; import io.bitsquare.gui.util.Profiler; import io.bitsquare.gui.util.Transitions; -import io.bitsquare.msg.BootstrapListener; +import io.bitsquare.msg.listeners.BootstrapListener; import io.bitsquare.msg.MessageFacade; import io.bitsquare.storage.Persistence; import io.bitsquare.trade.TradeManager; diff --git a/src/main/java/io/bitsquare/gui/trade/takeoffer/TakerOfferController.java b/src/main/java/io/bitsquare/gui/trade/takeoffer/TakerOfferController.java index 184c68f772..d3e9a440ed 100644 --- a/src/main/java/io/bitsquare/gui/trade/takeoffer/TakerOfferController.java +++ b/src/main/java/io/bitsquare/gui/trade/takeoffer/TakerOfferController.java @@ -29,8 +29,8 @@ import io.bitsquare.gui.util.BitSquareValidator; import io.bitsquare.trade.Offer; import io.bitsquare.trade.Trade; import io.bitsquare.trade.TradeManager; -import io.bitsquare.trade.protocol.taker.ProtocolForTakerAsSeller; -import io.bitsquare.trade.protocol.taker.ProtocolForTakerAsSellerListener; +import io.bitsquare.trade.protocol.trade.taker.SellerTakesOfferProtocol; +import io.bitsquare.trade.protocol.trade.taker.SellerTakesOfferProtocolListener; import com.google.bitcoin.core.Coin; @@ -173,7 +173,7 @@ public class TakerOfferController extends CachedViewController { else { takeOfferButton.setDisable(true); amountTextField.setEditable(false); - tradeManager.takeOffer(amount, offer, new ProtocolForTakerAsSellerListener() { + tradeManager.takeOffer(amount, offer, new SellerTakesOfferProtocolListener() { @Override public void onDepositTxPublished(String depositTxId) { setDepositTxId(depositTxId); @@ -207,19 +207,19 @@ public class TakerOfferController extends CachedViewController { } @Override - public void onFault(Throwable throwable, ProtocolForTakerAsSeller.State state) { + public void onFault(Throwable throwable, SellerTakesOfferProtocol.State state) { log.error("Error while executing trade process at state: " + state + " / " + throwable); Popups.openErrorPopup("Error while executing trade process", "Error while executing trade process at state: " + state + " / " + throwable); } @Override - public void onWaitingForPeerResponse(ProtocolForTakerAsSeller.State state) { + public void onWaitingForPeerResponse(SellerTakesOfferProtocol.State state) { log.debug("Waiting for peers response at state " + state); } @Override - public void onCompleted(ProtocolForTakerAsSeller.State state) { + public void onCompleted(SellerTakesOfferProtocol.State state) { log.debug("Trade protocol completed at state " + state); } diff --git a/src/main/java/io/bitsquare/gui/util/BitSquareValidator.java b/src/main/java/io/bitsquare/gui/util/BitSquareValidator.java index e6879d4c59..cb9c815d92 100644 --- a/src/main/java/io/bitsquare/gui/util/BitSquareValidator.java +++ b/src/main/java/io/bitsquare/gui/util/BitSquareValidator.java @@ -146,7 +146,6 @@ public class BitSquareValidator { public static boolean validateStringAsDouble(String input) { try { input = input.replace(",", "."); - //noinspection ResultOfMethodCallIgnored Double.parseDouble(input); return true; } catch (NumberFormatException | NullPointerException e) { diff --git a/src/main/java/io/bitsquare/gui/util/NumberValidator.java b/src/main/java/io/bitsquare/gui/util/NumberValidator.java index d8f671c1dd..2bba2ea3b5 100644 --- a/src/main/java/io/bitsquare/gui/util/NumberValidator.java +++ b/src/main/java/io/bitsquare/gui/util/NumberValidator.java @@ -55,7 +55,6 @@ public abstract class NumberValidator { protected ValidationResult validateIfNumber(String input) { try { - //noinspection ResultOfMethodCallIgnored Double.parseDouble(input); return new ValidationResult(true); } catch (Exception e) { diff --git a/src/main/java/io/bitsquare/msg/MessageBroker.java b/src/main/java/io/bitsquare/msg/MessageBroker.java index 3a3e12cf51..5446c40abb 100644 --- a/src/main/java/io/bitsquare/msg/MessageBroker.java +++ b/src/main/java/io/bitsquare/msg/MessageBroker.java @@ -19,6 +19,9 @@ package io.bitsquare.msg; import net.tomp2p.peers.PeerAddress; +/** + * Interface for the object handling incoming messages. + */ public interface MessageBroker { void handleMessage(Object message, PeerAddress peerAddress); } diff --git a/src/main/java/io/bitsquare/msg/MessageFacade.java b/src/main/java/io/bitsquare/msg/MessageFacade.java index 28e23a5653..42212a47d3 100644 --- a/src/main/java/io/bitsquare/msg/MessageFacade.java +++ b/src/main/java/io/bitsquare/msg/MessageFacade.java @@ -18,6 +18,7 @@ package io.bitsquare.msg; import io.bitsquare.msg.listeners.ArbitratorListener; +import io.bitsquare.msg.listeners.BootstrapListener; import io.bitsquare.msg.listeners.GetPeerAddressListener; import io.bitsquare.msg.listeners.IncomingTradeMessageListener; import io.bitsquare.msg.listeners.OrderBookListener; diff --git a/src/main/java/io/bitsquare/msg/SeedNodeAddress.java b/src/main/java/io/bitsquare/msg/SeedNodeAddress.java index ba34d87001..0469c59a84 100644 --- a/src/main/java/io/bitsquare/msg/SeedNodeAddress.java +++ b/src/main/java/io/bitsquare/msg/SeedNodeAddress.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +// TODO Might be better with a config file public class SeedNodeAddress { private final String id; private final String ip; diff --git a/src/main/java/io/bitsquare/msg/BootstrapListener.java b/src/main/java/io/bitsquare/msg/listeners/BootstrapListener.java similarity index 95% rename from src/main/java/io/bitsquare/msg/BootstrapListener.java rename to src/main/java/io/bitsquare/msg/listeners/BootstrapListener.java index 2cb9a1775f..9273c30bdf 100644 --- a/src/main/java/io/bitsquare/msg/BootstrapListener.java +++ b/src/main/java/io/bitsquare/msg/listeners/BootstrapListener.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.msg; +package io.bitsquare.msg.listeners; public interface BootstrapListener { public void onCompleted(); diff --git a/src/main/java/io/bitsquare/msg/listeners/PingPeerListener.java b/src/main/java/io/bitsquare/msg/listeners/PingPeerListener.java deleted file mode 100644 index a777941d3f..0000000000 --- a/src/main/java/io/bitsquare/msg/listeners/PingPeerListener.java +++ /dev/null @@ -1,24 +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.msg.listeners; - -public interface PingPeerListener { - void onPing(); - - void onPingPeerResult(boolean success); -} diff --git a/src/main/java/io/bitsquare/settings/Settings.java b/src/main/java/io/bitsquare/settings/Settings.java index 5f8a42ba79..de0db88a48 100644 --- a/src/main/java/io/bitsquare/settings/Settings.java +++ b/src/main/java/io/bitsquare/settings/Settings.java @@ -35,7 +35,8 @@ public class Settings implements Serializable { private List acceptedCountryLocales = new ArrayList<>(); private List acceptedArbitrators = new ArrayList<>(); - private long collateral = 100; // is 1/1000 so 100 is a multiplier of 0,1 or 10% of the amount + private long collateral = 100; // is 1/1000 so 100 results to 100/1000 = 0,1 (or 10%) + // which will be used for multiplying with the amount to get the collateral size in BTC. /////////////////////////////////////////////////////////////////////////////////////////// @@ -111,7 +112,6 @@ public class Settings implements Serializable { //TODO public Arbitrator getRandomArbitrator(Coin amount) { List candidates = new ArrayList<>(); - //noinspection Convert2streamapi for (Arbitrator arbitrator : acceptedArbitrators) { candidates.add(arbitrator); } diff --git a/src/main/java/io/bitsquare/storage/Persistence.java b/src/main/java/io/bitsquare/storage/Persistence.java index 91b6c90353..9a321feb77 100644 --- a/src/main/java/io/bitsquare/storage/Persistence.java +++ b/src/main/java/io/bitsquare/storage/Persistence.java @@ -45,6 +45,8 @@ import org.slf4j.LoggerFactory; /** * Simple storage solution for serialized data + * TODO: Should be improved with a more robust solution or maybe a lightweight database. + * TODO: Should run in a dedicated thread. */ public class Persistence { private static final Logger log = LoggerFactory.getLogger(Persistence.class); @@ -191,7 +193,6 @@ public class Persistence { } else { if (object instanceof Map) { - //noinspection unchecked return (Map) object; } else { diff --git a/src/main/java/io/bitsquare/trade/TradeManager.java b/src/main/java/io/bitsquare/trade/TradeManager.java index 5ea5dee9fb..410a547510 100644 --- a/src/main/java/io/bitsquare/trade/TradeManager.java +++ b/src/main/java/io/bitsquare/trade/TradeManager.java @@ -29,18 +29,18 @@ import io.bitsquare.trade.handlers.ErrorMessageHandler; import io.bitsquare.trade.handlers.TransactionResultHandler; import io.bitsquare.trade.protocol.TradeMessage; import io.bitsquare.trade.protocol.createoffer.CreateOfferCoordinator; -import io.bitsquare.trade.protocol.offerer.BankTransferInitedMessage; -import io.bitsquare.trade.protocol.offerer.DepositTxPublishedMessage; -import io.bitsquare.trade.protocol.offerer.ProtocolForOffererAsBuyer; -import io.bitsquare.trade.protocol.offerer.ProtocolForOffererAsBuyerListener; -import io.bitsquare.trade.protocol.offerer.RequestTakerDepositPaymentMessage; -import io.bitsquare.trade.protocol.offerer.RespondToTakeOfferRequestMessage; -import io.bitsquare.trade.protocol.taker.PayoutTxPublishedMessage; -import io.bitsquare.trade.protocol.taker.ProtocolForTakerAsSeller; -import io.bitsquare.trade.protocol.taker.ProtocolForTakerAsSellerListener; -import io.bitsquare.trade.protocol.taker.RequestOffererPublishDepositTxMessage; -import io.bitsquare.trade.protocol.taker.RequestTakeOfferMessage; -import io.bitsquare.trade.protocol.taker.TakeOfferFeePayedMessage; +import io.bitsquare.trade.protocol.trade.offerer.BuyerAcceptsOfferProtocol; +import io.bitsquare.trade.protocol.trade.offerer.BuyerAcceptsOfferProtocolListener; +import io.bitsquare.trade.protocol.trade.offerer.messages.BankTransferInitedMessage; +import io.bitsquare.trade.protocol.trade.offerer.messages.DepositTxPublishedMessage; +import io.bitsquare.trade.protocol.trade.offerer.messages.RequestTakerDepositPaymentMessage; +import io.bitsquare.trade.protocol.trade.offerer.messages.RespondToTakeOfferRequestMessage; +import io.bitsquare.trade.protocol.trade.taker.SellerTakesOfferProtocol; +import io.bitsquare.trade.protocol.trade.taker.SellerTakesOfferProtocolListener; +import io.bitsquare.trade.protocol.trade.taker.messages.PayoutTxPublishedMessage; +import io.bitsquare.trade.protocol.trade.taker.messages.RequestOffererPublishDepositTxMessage; +import io.bitsquare.trade.protocol.trade.taker.messages.RequestTakeOfferMessage; +import io.bitsquare.trade.protocol.trade.taker.messages.TakeOfferFeePayedMessage; import io.bitsquare.user.User; import com.google.bitcoin.core.Coin; @@ -81,8 +81,8 @@ public class TradeManager { private final List takeOfferRequestListeners = new ArrayList<>(); //TODO store TakerAsSellerProtocol in trade - private final Map takerAsSellerProtocolMap = new HashMap<>(); - private final Map offererAsBuyerProtocolMap = new HashMap<>(); + private final Map takerAsSellerProtocolMap = new HashMap<>(); + private final Map offererAsBuyerProtocolMap = new HashMap<>(); private final Map createOfferCoordinatorMap = new HashMap<>(); private final StringProperty newTradeProperty = new SimpleStringProperty(); @@ -227,14 +227,14 @@ public class TradeManager { messageFacade.removeOffer(offer); } - public Trade takeOffer(Coin amount, Offer offer, ProtocolForTakerAsSellerListener listener) { + public Trade takeOffer(Coin amount, Offer offer, SellerTakesOfferProtocolListener listener) { Trade trade = createTrade(offer); trade.setTradeAmount(amount); - ProtocolForTakerAsSeller protocolForTakerAsSeller = new ProtocolForTakerAsSeller( + SellerTakesOfferProtocol sellerTakesOfferProtocol = new SellerTakesOfferProtocol( trade, listener, messageFacade, walletFacade, blockChainFacade, cryptoFacade, user); - takerAsSellerProtocolMap.put(trade.getId(), protocolForTakerAsSeller); - protocolForTakerAsSeller.start(); + takerAsSellerProtocolMap.put(trade.getId(), sellerTakesOfferProtocol); + sellerTakesOfferProtocol.start(); return trade; } @@ -284,14 +284,14 @@ public class TradeManager { Trade trade = createTrade(offer); pendingTrade = trade; - ProtocolForOffererAsBuyer protocolForOffererAsBuyer = new ProtocolForOffererAsBuyer(trade, + BuyerAcceptsOfferProtocol buyerAcceptsOfferProtocol = new BuyerAcceptsOfferProtocol(trade, sender, messageFacade, walletFacade, blockChainFacade, cryptoFacade, user, - new ProtocolForOffererAsBuyerListener() { + new BuyerAcceptsOfferProtocolListener() { @Override public void onOfferAccepted(Offer offer) { removeOffer(offer); @@ -317,7 +317,7 @@ public class TradeManager { } @Override - public void onFault(Throwable throwable, ProtocolForOffererAsBuyer.State state) { + public void onFault(Throwable throwable, BuyerAcceptsOfferProtocol.State state) { log.error("Error while executing trade process at state: " + state + " / " + throwable); Popups.openErrorPopup("Error while executing trade process", "Error while executing trade process at state: " + state + " / " + @@ -325,17 +325,17 @@ public class TradeManager { } @Override - public void onWaitingForPeerResponse(ProtocolForOffererAsBuyer.State state) { + public void onWaitingForPeerResponse(BuyerAcceptsOfferProtocol.State state) { log.debug("Waiting for peers response at state " + state); } @Override - public void onCompleted(ProtocolForOffererAsBuyer.State state) { + public void onCompleted(BuyerAcceptsOfferProtocol.State state) { log.debug("Trade protocol completed at state " + state); } @Override - public void onWaitingForUserInteraction(ProtocolForOffererAsBuyer.State state) { + public void onWaitingForUserInteraction(BuyerAcceptsOfferProtocol.State state) { log.debug("Waiting for UI activity at state " + state); } @@ -348,7 +348,7 @@ public class TradeManager { }); if (!offererAsBuyerProtocolMap.containsKey(trade.getId())) { - offererAsBuyerProtocolMap.put(trade.getId(), protocolForOffererAsBuyer); + offererAsBuyerProtocolMap.put(trade.getId(), buyerAcceptsOfferProtocol); } else { // We don't store the protocol in case we have already a pending offer. The protocol is only @@ -356,7 +356,7 @@ public class TradeManager { log.trace("offererAsBuyerProtocol not stored as offer is already pending."); } - protocolForOffererAsBuyer.start(); + buyerAcceptsOfferProtocol.start(); } else { log.warn("Incoming offer take request does not match with any saved offer. We ignore that request."); diff --git a/src/main/java/io/bitsquare/trade/orderbook/OrderBook.java b/src/main/java/io/bitsquare/trade/orderbook/OrderBook.java index d4eec345cf..72ea011e59 100644 --- a/src/main/java/io/bitsquare/trade/orderbook/OrderBook.java +++ b/src/main/java/io/bitsquare/trade/orderbook/OrderBook.java @@ -55,6 +55,7 @@ remove dependencies to tomp2p import net.tomp2p.peers.Number160; import net.tomp2p.storage.Data; */ + public class OrderBook implements OrderBookListener { private static final Logger log = LoggerFactory.getLogger(OrderBook.class); private final ObservableList allOffers = FXCollections.observableArrayList(); @@ -148,8 +149,6 @@ public class OrderBook implements OrderBookListener { // (1 to n) boolean arbitratorResult = arbitratorInList(offer.getArbitrator(), settings.getAcceptedArbitrators()); - - //noinspection UnnecessaryLocalVariable boolean result = currencyResult && countryResult && languageResult && amountResult && directionResult && priceResult && arbitratorResult; diff --git a/src/main/java/io/bitsquare/trade/orderbook/OrderBookFilter.java b/src/main/java/io/bitsquare/trade/orderbook/OrderBookFilter.java index 1ba5b15609..92df7eff22 100644 --- a/src/main/java/io/bitsquare/trade/orderbook/OrderBookFilter.java +++ b/src/main/java/io/bitsquare/trade/orderbook/OrderBookFilter.java @@ -24,6 +24,7 @@ import com.google.bitcoin.core.Coin; import javafx.beans.property.SimpleBooleanProperty; public class OrderBookFilter { + // TODO use ObjectProperty instead private final SimpleBooleanProperty directionChangedProperty = new SimpleBooleanProperty(); private double price; @@ -65,10 +66,7 @@ public class OrderBookFilter { this.price = price; } - public SimpleBooleanProperty getDirectionChangedProperty() { return directionChangedProperty; } - - } diff --git a/src/main/java/io/bitsquare/trade/protocol/old/BuyOffererPaymentProcess.java b/src/main/java/io/bitsquare/trade/protocol/old/BuyOffererPaymentProcess.java deleted file mode 100644 index 5572cdd23f..0000000000 --- a/src/main/java/io/bitsquare/trade/protocol/old/BuyOffererPaymentProcess.java +++ /dev/null @@ -1,53 +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.protocol.old; - -//TODO not used but let it for reference until all use cases are impl. -class BuyOffererPaymentProcess extends PaymentProcess { - public BuyOffererPaymentProcess() { - super(); - } - - - // case 1 offerer step 1 - private void buyOfferOfferer_payToDeposit() { - onDataDepositTx(); - payCollateral(); - signDepositTx(); - publishDepositTx(); - sendMessageDepositTxPublished(); - onBlockChainConfirmation(); - } - - // case 1 offerer step 2 - private void buyOfferOfferer_payToDeposist() { - payFiat(); - sendMessageFiatTxInited(); - createPayoutTx(); - signPayoutTx(); - sendDataPayoutTx(); - onBlockChainConfirmation(); - } - - // case 1 offerer step 3 - private void buyOfferOfferer_waitForRelease() { - onMessagePayoutTxPublished(); - onBlockChainConfirmation(); - done(); - } -} diff --git a/src/main/java/io/bitsquare/trade/protocol/old/BuyTakerPaymentProcess.java b/src/main/java/io/bitsquare/trade/protocol/old/BuyTakerPaymentProcess.java deleted file mode 100644 index 1f07c43828..0000000000 --- a/src/main/java/io/bitsquare/trade/protocol/old/BuyTakerPaymentProcess.java +++ /dev/null @@ -1,52 +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.protocol.old; - -//TODO not used but let it for reference until all use cases are impl. -public class BuyTakerPaymentProcess extends PaymentProcess { - - public BuyTakerPaymentProcess() { - super(); - } - - @Override - public void executeStep0() { - // bitcoinServices.createMultiSig(); - createDepositTx(); - payPaymentAndCollateral(); - signDepositTx(); - sendDataDepositTx(); - } - - @Override - public void executeStep1() { - onMessageDepositTxPublished(); - onMessageFiatTxInited(); - onUserInputFiatReceived(); - onDataPayoutTx(); - } - - @Override - public void executeStep2() { - signPayoutTx(); - publishPayoutTx(); - sendMessagePayoutTxPublished(); - onBlockChainConfirmation(); - done(); - } -} diff --git a/src/main/java/io/bitsquare/trade/protocol/old/PaymentProcess.java b/src/main/java/io/bitsquare/trade/protocol/old/PaymentProcess.java deleted file mode 100644 index 035460349b..0000000000 --- a/src/main/java/io/bitsquare/trade/protocol/old/PaymentProcess.java +++ /dev/null @@ -1,224 +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.protocol.old; - -import io.bitsquare.btc.BlockChainFacade; -import io.bitsquare.btc.WalletFacade; -import io.bitsquare.msg.MessageFacade; - -import javax.inject.Inject; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -//TODO not used but let it for reference until all use cases are impl. -public class PaymentProcess { - private static final Logger log = LoggerFactory.getLogger(PaymentProcess.class); - protected String offererDepositPubKey; - protected String offererPayoutAddress; - protected String offererChangeAddress; - protected String offererTotalInputPayment; - protected String offererOutputPayment; - protected String takerDepositPubKey; - protected String takerPayoutAddress; - protected String takerChangeAddress; - protected String takerTotalInputPayment; - protected String takerOutputPayment; - protected String multiSigAddress; - - public PaymentProcess() { - } - - @Inject - public void setMessageService(MessageFacade messageService) { - } - - @Inject - public void setWallet(WalletFacade wallet) { - } - - @Inject - public void setBtcServices(BlockChainFacade bitcoinServices) { - } - - - public void executeStep0() { - } - - public void executeStep1() { - } - - public void executeStep2() { - } - - public void executeStep3() { - } - - - protected void createDepositTx() { - //wallet.getInputs(offererTotalInputPayment); - //bitcoinServices.createTx(taker); - } - - protected void payPaymentAndCollateral() { - } - - protected void signDepositTx() { - } - - protected void sendDataDepositTx() { - } - - protected void onMessageFiatTxInited() { - } - - protected void onUserInputFiatReceived() { - } - - protected void onDataPayoutTx() { - } - - protected void onMessageDepositTxPublished() { - } - - protected void signPayoutTx() { - } - - protected void publishPayoutTx() { - } - - protected void sendMessagePayoutTxPublished() { - } - - protected void onBlockChainConfirmation() { - } - - protected void done() { - } - - protected void onDataDepositTx() { - } - - protected void payCollateral() { - } - - protected void publishDepositTx() { - } - - protected void sendMessageDepositTxPublished() { - } - - protected void payFiat() { - } - - protected void sendMessageFiatTxInited() { - } - - protected void createPayoutTx() { - } - - protected void sendDataPayoutTx() { - } - - protected void onMessagePayoutTxPublished() { - } - - /* - case 1: - BUY offer - taker: - 1 PAY BTC - create ms - create deposit tx - pay payment+coll - signContract - send deposit tx to offerer - 2 WAIT FOR FIAT - wait for pub tx info msg - wait for build fiat info msg - wait for fiat on bank - wait for payout tx - 3 RELEASE BTC - signContract payout tx - pub payout tx - send info to offerer - wait for >= 1 confirm - DONE - offerer: - 1 WAIT FOR BTC PAYMENT - wait for deposit tx - pay coll - signContract - pub deposit tx - send info msg to taker - wait for >=1 confirm - 2 PAY FIAT - build fiat - send info msg to taker - create payout tx - signContract payout tx - send payout tx to taker - 3 WAIT FOR BTC RELEASE - wait for release info msg - wait for >= 1 confirm - DONE - - case 2: - SELL offer - taker: - 1 PAY COLL - create ms - create deposit tx - pay coll - signContract - send deposit tx to offerer - 2 WAIT FOR BTC PAYMENT - wait for pub tx info msg - wait for >=1 confirm - 3 PAY FIAT -> Same - build fiat - send info msg to taker - create payout tx - signContract payout tx - send payout tx to offerer - 4 WAIT FOR BTC RELEASE -> Same - wait for release info msg - wait for >= 1 confirm - DONE - offerer: - 1 WAIT FOR COLL - wait for deposit tx - 2 PAY BTC - pay coll+payment - signContract - pub deposit tx - send info msg to taker - 3 WAIT FOR FIAT - wait for build fiat info msg - wait for payout tx - wait for fiat on bank - 4 RELEASE BTC - signContract payout tx - pub payout tx - send info to taker - wait for >= 1 confirm - DONE - - - */ -} diff --git a/src/main/java/io/bitsquare/trade/protocol/old/SellOffererPaymentProcess.java b/src/main/java/io/bitsquare/trade/protocol/old/SellOffererPaymentProcess.java deleted file mode 100644 index 3d28a97b12..0000000000 --- a/src/main/java/io/bitsquare/trade/protocol/old/SellOffererPaymentProcess.java +++ /dev/null @@ -1,56 +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.protocol.old; - -//TODO not used but let it for reference until all use cases are impl. -class SellOffererPaymentProcess extends PaymentProcess { - public SellOffererPaymentProcess() { - super(); - } - - - // case 2 offerer step 1 - private void sellOfferOfferer_waitForCollateralPayedByPeer() { - onDataDepositTx(); - } - - // case 2 offerer step 2 - private void sellOfferOfferer_payToDeposit() { - payPaymentAndCollateral(); - signDepositTx(); - publishDepositTx(); - sendMessageDepositTxPublished(); - } - - // case 2 offerer step 3 - private void sellOfferOfferer_waitForFiat() { - onMessageFiatTxInited(); - onDataPayoutTx(); - onUserInputFiatReceived(); - } - - // case 2 offerer step 4 - private void sellOfferOfferer_releasePayment() { - signPayoutTx(); - publishPayoutTx(); - sendMessagePayoutTxPublished(); - onBlockChainConfirmation(); - done(); - } - -} diff --git a/src/main/java/io/bitsquare/trade/protocol/old/SellTakerPaymentProcess.java b/src/main/java/io/bitsquare/trade/protocol/old/SellTakerPaymentProcess.java deleted file mode 100644 index ed1f083d5d..0000000000 --- a/src/main/java/io/bitsquare/trade/protocol/old/SellTakerPaymentProcess.java +++ /dev/null @@ -1,57 +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.protocol.old; - -//TODO not used but let it for reference until all use cases are impl. -class SellTakerPaymentProcess extends PaymentProcess { - public SellTakerPaymentProcess() { - super(); - } - - - // case 2 taker step 1 - private void sellOfferTaker_payToDeposit() { - //createMultiSig(); - createDepositTx(); - payCollateral(); - signDepositTx(); - sendDataDepositTx(); - } - - // case 2 taker step 2 - private void sellOfferTaker_waitForDepositPublished() { - onMessageDepositTxPublished(); - onBlockChainConfirmation(); - } - - // case 2 taker step 3 - private void sellOfferTaker_payFiat() { - payFiat(); - sendMessageFiatTxInited(); - createPayoutTx(); - signPayoutTx(); - sendDataPayoutTx(); - } - - // case 2 taker step 4 - private void sellOfferTaker_waitForRelease() { - onMessagePayoutTxPublished(); - onBlockChainConfirmation(); - done(); - } -} diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/ProtocolForOffererAsBuyer.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocol.java similarity index 91% rename from src/main/java/io/bitsquare/trade/protocol/offerer/ProtocolForOffererAsBuyer.java rename to src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocol.java index e1ea294982..c8b8411493 100644 --- a/src/main/java/io/bitsquare/trade/protocol/offerer/ProtocolForOffererAsBuyer.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocol.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.offerer; +package io.bitsquare.trade.protocol.trade.offerer; import io.bitsquare.bank.BankAccount; import io.bitsquare.btc.BlockChainFacade; @@ -26,9 +26,19 @@ import io.bitsquare.msg.MessageFacade; import io.bitsquare.trade.Contract; import io.bitsquare.trade.Offer; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.taker.PayoutTxPublishedMessage; -import io.bitsquare.trade.protocol.taker.RequestOffererPublishDepositTxMessage; -import io.bitsquare.trade.protocol.taker.TakeOfferFeePayedMessage; +import io.bitsquare.trade.protocol.trade.offerer.tasks.CreateDepositTx; +import io.bitsquare.trade.protocol.trade.offerer.tasks.HandleTakeOfferRequest; +import io.bitsquare.trade.protocol.trade.offerer.tasks.RequestTakerDepositPayment; +import io.bitsquare.trade.protocol.trade.offerer.tasks.SendDepositTxIdToTaker; +import io.bitsquare.trade.protocol.trade.offerer.tasks.SendSignedPayoutTx; +import io.bitsquare.trade.protocol.trade.offerer.tasks.SetupListenerForBlockChainConfirmation; +import io.bitsquare.trade.protocol.trade.offerer.tasks.SignAndPublishDepositTx; +import io.bitsquare.trade.protocol.trade.offerer.tasks.VerifyAndSignContract; +import io.bitsquare.trade.protocol.trade.offerer.tasks.VerifyTakeOfferFeePayment; +import io.bitsquare.trade.protocol.trade.offerer.tasks.VerifyTakerAccount; +import io.bitsquare.trade.protocol.trade.taker.messages.PayoutTxPublishedMessage; +import io.bitsquare.trade.protocol.trade.taker.messages.RequestOffererPublishDepositTxMessage; +import io.bitsquare.trade.protocol.trade.taker.messages.TakeOfferFeePayedMessage; import io.bitsquare.user.User; import com.google.bitcoin.core.Coin; @@ -56,9 +66,9 @@ import static io.bitsquare.util.Validator.*; * It uses sub tasks to not pollute the main class too much with all the async result/fault handling. * Any data from incoming messages need to be validated before further processing. */ -public class ProtocolForOffererAsBuyer { +public class BuyerAcceptsOfferProtocol { - private static final Logger log = LoggerFactory.getLogger(ProtocolForOffererAsBuyer.class); + private static final Logger log = LoggerFactory.getLogger(BuyerAcceptsOfferProtocol.class); public enum State { Init, @@ -90,7 +100,7 @@ public class ProtocolForOffererAsBuyer { private final WalletFacade walletFacade; private final BlockChainFacade blockChainFacade; private final CryptoFacade cryptoFacade; - private final ProtocolForOffererAsBuyerListener listener; + private final BuyerAcceptsOfferProtocolListener listener; // derived private final String tradeId; @@ -127,14 +137,14 @@ public class ProtocolForOffererAsBuyer { // Constructor /////////////////////////////////////////////////////////////////////////////////////////// - public ProtocolForOffererAsBuyer(Trade trade, + public BuyerAcceptsOfferProtocol(Trade trade, PeerAddress peerAddress, MessageFacade messageFacade, WalletFacade walletFacade, BlockChainFacade blockChainFacade, CryptoFacade cryptoFacade, User user, - ProtocolForOffererAsBuyerListener listener) { + BuyerAcceptsOfferProtocolListener listener) { this.trade = trade; this.peerAddress = peerAddress; this.listener = listener; diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/ProtocolForOffererAsBuyerListener.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocolListener.java similarity index 75% rename from src/main/java/io/bitsquare/trade/protocol/offerer/ProtocolForOffererAsBuyerListener.java rename to src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocolListener.java index db3f04951c..962cd97d67 100644 --- a/src/main/java/io/bitsquare/trade/protocol/offerer/ProtocolForOffererAsBuyerListener.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocolListener.java @@ -15,13 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.offerer; +package io.bitsquare.trade.protocol.trade.offerer; import io.bitsquare.trade.Offer; import com.google.bitcoin.core.TransactionConfidence; -public interface ProtocolForOffererAsBuyerListener { +public interface BuyerAcceptsOfferProtocolListener { void onOfferAccepted(Offer offer); void onDepositTxPublished(String depositTxID); @@ -32,11 +32,11 @@ public interface ProtocolForOffererAsBuyerListener { void onPayoutTxPublished(String payoutTxID); - void onFault(Throwable throwable, ProtocolForOffererAsBuyer.State state); + void onFault(Throwable throwable, BuyerAcceptsOfferProtocol.State state); - void onWaitingForPeerResponse(ProtocolForOffererAsBuyer.State state); + void onWaitingForPeerResponse(BuyerAcceptsOfferProtocol.State state); - void onCompleted(ProtocolForOffererAsBuyer.State state); + void onCompleted(BuyerAcceptsOfferProtocol.State state); - void onWaitingForUserInteraction(ProtocolForOffererAsBuyer.State state); + void onWaitingForUserInteraction(BuyerAcceptsOfferProtocol.State state); } diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/BankTransferInitedMessage.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/BankTransferInitedMessage.java similarity index 97% rename from src/main/java/io/bitsquare/trade/protocol/offerer/BankTransferInitedMessage.java rename to src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/BankTransferInitedMessage.java index 7b5d49db68..233aa57b20 100644 --- a/src/main/java/io/bitsquare/trade/protocol/offerer/BankTransferInitedMessage.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/BankTransferInitedMessage.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.offerer; +package io.bitsquare.trade.protocol.trade.offerer.messages; import io.bitsquare.trade.protocol.TradeMessage; diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/DepositTxPublishedMessage.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/DepositTxPublishedMessage.java similarity index 95% rename from src/main/java/io/bitsquare/trade/protocol/offerer/DepositTxPublishedMessage.java rename to src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/DepositTxPublishedMessage.java index 4609f90ee0..23df2ca954 100644 --- a/src/main/java/io/bitsquare/trade/protocol/offerer/DepositTxPublishedMessage.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/DepositTxPublishedMessage.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.offerer; +package io.bitsquare.trade.protocol.trade.offerer.messages; import io.bitsquare.trade.protocol.TradeMessage; diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/RequestTakerDepositPaymentMessage.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RequestTakerDepositPaymentMessage.java similarity index 97% rename from src/main/java/io/bitsquare/trade/protocol/offerer/RequestTakerDepositPaymentMessage.java rename to src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RequestTakerDepositPaymentMessage.java index 93bec16161..fd98a53c9d 100644 --- a/src/main/java/io/bitsquare/trade/protocol/offerer/RequestTakerDepositPaymentMessage.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RequestTakerDepositPaymentMessage.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.offerer; +package io.bitsquare.trade.protocol.trade.offerer.messages; import io.bitsquare.bank.BankAccount; import io.bitsquare.trade.protocol.TradeMessage; diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/RespondToTakeOfferRequestMessage.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RespondToTakeOfferRequestMessage.java similarity index 95% rename from src/main/java/io/bitsquare/trade/protocol/offerer/RespondToTakeOfferRequestMessage.java rename to src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RespondToTakeOfferRequestMessage.java index 08322e1e3b..e7da683313 100644 --- a/src/main/java/io/bitsquare/trade/protocol/offerer/RespondToTakeOfferRequestMessage.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RespondToTakeOfferRequestMessage.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.offerer; +package io.bitsquare.trade.protocol.trade.offerer.messages; import io.bitsquare.trade.protocol.TradeMessage; diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/CreateDepositTx.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CreateDepositTx.java similarity index 97% rename from src/main/java/io/bitsquare/trade/protocol/offerer/CreateDepositTx.java rename to src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CreateDepositTx.java index ac792fee93..7f82d23e05 100644 --- a/src/main/java/io/bitsquare/trade/protocol/offerer/CreateDepositTx.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CreateDepositTx.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.offerer; +package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.btc.WalletFacade; import io.bitsquare.trade.handlers.ExceptionHandler; diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/HandleTakeOfferRequest.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/HandleTakeOfferRequest.java similarity index 94% rename from src/main/java/io/bitsquare/trade/protocol/offerer/HandleTakeOfferRequest.java rename to src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/HandleTakeOfferRequest.java index 91dbdbb7e8..ed60b6b930 100644 --- a/src/main/java/io/bitsquare/trade/protocol/offerer/HandleTakeOfferRequest.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/HandleTakeOfferRequest.java @@ -15,12 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.offerer; +package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.msg.MessageFacade; import io.bitsquare.msg.listeners.OutgoingTradeMessageListener; import io.bitsquare.trade.Trade; import io.bitsquare.trade.handlers.ExceptionHandler; +import io.bitsquare.trade.protocol.trade.offerer.messages.RespondToTakeOfferRequestMessage; import net.tomp2p.peers.PeerAddress; diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/RequestTakerDepositPayment.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestTakerDepositPayment.java similarity index 94% rename from src/main/java/io/bitsquare/trade/protocol/offerer/RequestTakerDepositPayment.java rename to src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestTakerDepositPayment.java index 910483166e..7fe0a3af6a 100644 --- a/src/main/java/io/bitsquare/trade/protocol/offerer/RequestTakerDepositPayment.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestTakerDepositPayment.java @@ -15,13 +15,14 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.offerer; +package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.bank.BankAccount; import io.bitsquare.msg.MessageFacade; import io.bitsquare.msg.listeners.OutgoingTradeMessageListener; import io.bitsquare.trade.handlers.ExceptionHandler; import io.bitsquare.trade.handlers.ResultHandler; +import io.bitsquare.trade.protocol.trade.offerer.messages.RequestTakerDepositPaymentMessage; import net.tomp2p.peers.PeerAddress; diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/SendDepositTxIdToTaker.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java similarity index 93% rename from src/main/java/io/bitsquare/trade/protocol/offerer/SendDepositTxIdToTaker.java rename to src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java index 302c23d704..607314260d 100644 --- a/src/main/java/io/bitsquare/trade/protocol/offerer/SendDepositTxIdToTaker.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java @@ -15,12 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.offerer; +package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.msg.MessageFacade; import io.bitsquare.msg.listeners.OutgoingTradeMessageListener; import io.bitsquare.trade.handlers.ExceptionHandler; import io.bitsquare.trade.handlers.ResultHandler; +import io.bitsquare.trade.protocol.trade.offerer.messages.DepositTxPublishedMessage; import com.google.bitcoin.core.Transaction; import com.google.bitcoin.core.Utils; diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/SendSignedPayoutTx.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendSignedPayoutTx.java similarity index 96% rename from src/main/java/io/bitsquare/trade/protocol/offerer/SendSignedPayoutTx.java rename to src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendSignedPayoutTx.java index b00ed0a43b..6ebf3a808b 100644 --- a/src/main/java/io/bitsquare/trade/protocol/offerer/SendSignedPayoutTx.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendSignedPayoutTx.java @@ -15,13 +15,14 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.offerer; +package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.btc.WalletFacade; import io.bitsquare.msg.MessageFacade; import io.bitsquare.msg.listeners.OutgoingTradeMessageListener; import io.bitsquare.trade.handlers.ExceptionHandler; import io.bitsquare.trade.handlers.ResultHandler; +import io.bitsquare.trade.protocol.trade.offerer.messages.BankTransferInitedMessage; import com.google.bitcoin.core.Coin; import com.google.bitcoin.core.ECKey; diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/SetupListenerForBlockChainConfirmation.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java similarity index 90% rename from src/main/java/io/bitsquare/trade/protocol/offerer/SetupListenerForBlockChainConfirmation.java rename to src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java index 1e2d8a4f0c..313d717a0f 100644 --- a/src/main/java/io/bitsquare/trade/protocol/offerer/SetupListenerForBlockChainConfirmation.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java @@ -15,10 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.offerer; +package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.trade.handlers.ExceptionHandler; import io.bitsquare.trade.handlers.ResultHandler; +import io.bitsquare.trade.protocol.trade.offerer.BuyerAcceptsOfferProtocolListener; import com.google.bitcoin.core.Transaction; import com.google.bitcoin.core.TransactionConfidence; @@ -30,7 +31,7 @@ public class SetupListenerForBlockChainConfirmation { private static final Logger log = LoggerFactory.getLogger(SetupListenerForBlockChainConfirmation.class); public static void run(ResultHandler resultHandler, ExceptionHandler exceptionHandler, - Transaction depositTransaction, ProtocolForOffererAsBuyerListener listener) { + Transaction depositTransaction, BuyerAcceptsOfferProtocolListener listener) { log.trace("Run task"); //TODO // sharedModel.offererPaymentProtocolListener.onDepositTxConfirmedInBlockchain(); diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/SignAndPublishDepositTx.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java similarity index 98% rename from src/main/java/io/bitsquare/trade/protocol/offerer/SignAndPublishDepositTx.java rename to src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java index 83689b928a..71b0239421 100644 --- a/src/main/java/io/bitsquare/trade/protocol/offerer/SignAndPublishDepositTx.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.offerer; +package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.btc.WalletFacade; import io.bitsquare.trade.handlers.ExceptionHandler; diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/VerifyAndSignContract.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java similarity index 97% rename from src/main/java/io/bitsquare/trade/protocol/offerer/VerifyAndSignContract.java rename to src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java index 7ce7d09f80..995607129e 100644 --- a/src/main/java/io/bitsquare/trade/protocol/offerer/VerifyAndSignContract.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.offerer; +package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.bank.BankAccount; import io.bitsquare.crypto.CryptoFacade; diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/VerifyTakeOfferFeePayment.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java similarity index 96% rename from src/main/java/io/bitsquare/trade/protocol/offerer/VerifyTakeOfferFeePayment.java rename to src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java index c19d51180d..5b731a86e2 100644 --- a/src/main/java/io/bitsquare/trade/protocol/offerer/VerifyTakeOfferFeePayment.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.offerer; +package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.btc.WalletFacade; import io.bitsquare.trade.handlers.ExceptionHandler; diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/VerifyTakerAccount.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java similarity index 91% rename from src/main/java/io/bitsquare/trade/protocol/offerer/VerifyTakerAccount.java rename to src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java index 2442f0e1cd..e1ed167ba4 100644 --- a/src/main/java/io/bitsquare/trade/protocol/offerer/VerifyTakerAccount.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java @@ -15,13 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.offerer; +package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.bank.BankAccount; import io.bitsquare.btc.BlockChainFacade; import io.bitsquare.trade.handlers.ExceptionHandler; import io.bitsquare.trade.handlers.ResultHandler; -import io.bitsquare.trade.protocol.shared.VerifyPeerAccount; +import io.bitsquare.trade.protocol.trade.shared.tasks.VerifyPeerAccount; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/bitsquare/trade/protocol/shared/VerifyPeerAccount.java b/src/main/java/io/bitsquare/trade/protocol/trade/shared/tasks/VerifyPeerAccount.java similarity index 97% rename from src/main/java/io/bitsquare/trade/protocol/shared/VerifyPeerAccount.java rename to src/main/java/io/bitsquare/trade/protocol/trade/shared/tasks/VerifyPeerAccount.java index 142b107361..b60ae370cc 100644 --- a/src/main/java/io/bitsquare/trade/protocol/shared/VerifyPeerAccount.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/shared/tasks/VerifyPeerAccount.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.shared; +package io.bitsquare.trade.protocol.trade.shared.tasks; import io.bitsquare.bank.BankAccount; import io.bitsquare.btc.BlockChainFacade; diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/ProtocolForTakerAsSeller.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerTakesOfferProtocol.java similarity index 91% rename from src/main/java/io/bitsquare/trade/protocol/taker/ProtocolForTakerAsSeller.java rename to src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerTakesOfferProtocol.java index 614d295694..863d24f9e4 100644 --- a/src/main/java/io/bitsquare/trade/protocol/taker/ProtocolForTakerAsSeller.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerTakesOfferProtocol.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.taker; +package io.bitsquare.trade.protocol.trade.taker; import io.bitsquare.bank.BankAccount; import io.bitsquare.btc.BlockChainFacade; @@ -25,10 +25,20 @@ import io.bitsquare.msg.MessageFacade; import io.bitsquare.trade.Contract; import io.bitsquare.trade.Offer; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.offerer.BankTransferInitedMessage; -import io.bitsquare.trade.protocol.offerer.DepositTxPublishedMessage; -import io.bitsquare.trade.protocol.offerer.RequestTakerDepositPaymentMessage; -import io.bitsquare.trade.protocol.offerer.RespondToTakeOfferRequestMessage; +import io.bitsquare.trade.protocol.trade.offerer.messages.BankTransferInitedMessage; +import io.bitsquare.trade.protocol.trade.offerer.messages.DepositTxPublishedMessage; +import io.bitsquare.trade.protocol.trade.offerer.messages.RequestTakerDepositPaymentMessage; +import io.bitsquare.trade.protocol.trade.offerer.messages.RespondToTakeOfferRequestMessage; +import io.bitsquare.trade.protocol.trade.taker.tasks.CreateAndSignContract; +import io.bitsquare.trade.protocol.trade.taker.tasks.GetPeerAddress; +import io.bitsquare.trade.protocol.trade.taker.tasks.PayDeposit; +import io.bitsquare.trade.protocol.trade.taker.tasks.PayTakeOfferFee; +import io.bitsquare.trade.protocol.trade.taker.tasks.RequestTakeOffer; +import io.bitsquare.trade.protocol.trade.taker.tasks.SendPayoutTxToOfferer; +import io.bitsquare.trade.protocol.trade.taker.tasks.SendSignedTakerDepositTxAsHex; +import io.bitsquare.trade.protocol.trade.taker.tasks.SendTakeOfferFeePayedTxId; +import io.bitsquare.trade.protocol.trade.taker.tasks.SignAndPublishPayoutTx; +import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOffererAccount; import io.bitsquare.user.User; import com.google.bitcoin.core.Coin; @@ -52,8 +62,8 @@ import static io.bitsquare.util.Validator.*; * It uses sub tasks to not pollute the main class too much with all the async result/fault handling. * Any data from incoming messages as well data used to send to the peer need to be validated before further processing. */ -public class ProtocolForTakerAsSeller { - private static final Logger log = LoggerFactory.getLogger(ProtocolForTakerAsSeller.class); +public class SellerTakesOfferProtocol { + private static final Logger log = LoggerFactory.getLogger(SellerTakesOfferProtocol.class); public enum State { @@ -76,7 +86,7 @@ public class ProtocolForTakerAsSeller { // provided data private final Trade trade; - private final ProtocolForTakerAsSellerListener listener; + private final SellerTakesOfferProtocolListener listener; private final MessageFacade messageFacade; private final WalletFacade walletFacade; private final BlockChainFacade blockChainFacade; @@ -122,8 +132,8 @@ public class ProtocolForTakerAsSeller { // Constructor /////////////////////////////////////////////////////////////////////////////////////////// - public ProtocolForTakerAsSeller(Trade trade, - ProtocolForTakerAsSellerListener listener, + public SellerTakesOfferProtocol(Trade trade, + SellerTakesOfferProtocolListener listener, MessageFacade messageFacade, WalletFacade walletFacade, BlockChainFacade blockChainFacade, diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/ProtocolForTakerAsSellerListener.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerTakesOfferProtocolListener.java similarity index 77% rename from src/main/java/io/bitsquare/trade/protocol/taker/ProtocolForTakerAsSellerListener.java rename to src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerTakesOfferProtocolListener.java index 1c85754b78..fde855aba9 100644 --- a/src/main/java/io/bitsquare/trade/protocol/taker/ProtocolForTakerAsSellerListener.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerTakesOfferProtocolListener.java @@ -15,22 +15,22 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.taker; +package io.bitsquare.trade.protocol.trade.taker; import io.bitsquare.trade.Trade; -public interface ProtocolForTakerAsSellerListener { +public interface SellerTakesOfferProtocolListener { void onDepositTxPublished(String depositTxId); void onBankTransferInited(String tradeId); void onPayoutTxPublished(Trade trade, String hashAsString); - void onFault(Throwable throwable, ProtocolForTakerAsSeller.State state); + void onFault(Throwable throwable, SellerTakesOfferProtocol.State state); - void onWaitingForPeerResponse(ProtocolForTakerAsSeller.State state); + void onWaitingForPeerResponse(SellerTakesOfferProtocol.State state); - void onCompleted(ProtocolForTakerAsSeller.State state); + void onCompleted(SellerTakesOfferProtocol.State state); void onTakeOfferRequestRejected(Trade trade); } diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/PayoutTxPublishedMessage.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/PayoutTxPublishedMessage.java similarity index 95% rename from src/main/java/io/bitsquare/trade/protocol/taker/PayoutTxPublishedMessage.java rename to src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/PayoutTxPublishedMessage.java index 45fc0927c5..d1845914d0 100644 --- a/src/main/java/io/bitsquare/trade/protocol/taker/PayoutTxPublishedMessage.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/PayoutTxPublishedMessage.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.taker; +package io.bitsquare.trade.protocol.trade.taker.messages; import io.bitsquare.trade.protocol.TradeMessage; diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/RequestOffererPublishDepositTxMessage.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestOffererPublishDepositTxMessage.java similarity index 98% rename from src/main/java/io/bitsquare/trade/protocol/taker/RequestOffererPublishDepositTxMessage.java rename to src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestOffererPublishDepositTxMessage.java index 484b9d88a9..d66cb44ecf 100644 --- a/src/main/java/io/bitsquare/trade/protocol/taker/RequestOffererPublishDepositTxMessage.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestOffererPublishDepositTxMessage.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.taker; +package io.bitsquare.trade.protocol.trade.taker.messages; import io.bitsquare.bank.BankAccount; import io.bitsquare.trade.protocol.TradeMessage; diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/RequestTakeOfferMessage.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestTakeOfferMessage.java similarity index 95% rename from src/main/java/io/bitsquare/trade/protocol/taker/RequestTakeOfferMessage.java rename to src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestTakeOfferMessage.java index f1291ebd8f..2a0e2cdf63 100644 --- a/src/main/java/io/bitsquare/trade/protocol/taker/RequestTakeOfferMessage.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestTakeOfferMessage.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.taker; +package io.bitsquare.trade.protocol.trade.taker.messages; import io.bitsquare.trade.protocol.TradeMessage; diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/TakeOfferFeePayedMessage.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/TakeOfferFeePayedMessage.java similarity index 96% rename from src/main/java/io/bitsquare/trade/protocol/taker/TakeOfferFeePayedMessage.java rename to src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/TakeOfferFeePayedMessage.java index 81acb7648f..474686eb3f 100644 --- a/src/main/java/io/bitsquare/trade/protocol/taker/TakeOfferFeePayedMessage.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/TakeOfferFeePayedMessage.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.taker; +package io.bitsquare.trade.protocol.trade.taker.messages; import io.bitsquare.trade.protocol.TradeMessage; diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/CreateAndSignContract.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java similarity index 97% rename from src/main/java/io/bitsquare/trade/protocol/taker/CreateAndSignContract.java rename to src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java index c86cbab6a9..f340c8b626 100644 --- a/src/main/java/io/bitsquare/trade/protocol/taker/CreateAndSignContract.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.taker; +package io.bitsquare.trade.protocol.trade.taker.tasks; import io.bitsquare.bank.BankAccount; import io.bitsquare.crypto.CryptoFacade; diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/GetPeerAddress.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java similarity index 97% rename from src/main/java/io/bitsquare/trade/protocol/taker/GetPeerAddress.java rename to src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java index 0b8fb1ba1a..594dfb34a5 100644 --- a/src/main/java/io/bitsquare/trade/protocol/taker/GetPeerAddress.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.taker; +package io.bitsquare.trade.protocol.trade.taker.tasks; import io.bitsquare.msg.MessageFacade; import io.bitsquare.msg.listeners.GetPeerAddressListener; diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/PayDeposit.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayDeposit.java similarity index 97% rename from src/main/java/io/bitsquare/trade/protocol/taker/PayDeposit.java rename to src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayDeposit.java index 09ccb8f053..ffbdc3d641 100644 --- a/src/main/java/io/bitsquare/trade/protocol/taker/PayDeposit.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayDeposit.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.taker; +package io.bitsquare.trade.protocol.trade.taker.tasks; import io.bitsquare.btc.WalletFacade; import io.bitsquare.trade.handlers.ExceptionHandler; diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/PayTakeOfferFee.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayTakeOfferFee.java similarity index 97% rename from src/main/java/io/bitsquare/trade/protocol/taker/PayTakeOfferFee.java rename to src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayTakeOfferFee.java index bec3f557ff..976a0a5cf4 100644 --- a/src/main/java/io/bitsquare/trade/protocol/taker/PayTakeOfferFee.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayTakeOfferFee.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.taker; +package io.bitsquare.trade.protocol.trade.taker.tasks; import io.bitsquare.btc.WalletFacade; import io.bitsquare.trade.handlers.ExceptionHandler; diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/RequestTakeOffer.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/RequestTakeOffer.java similarity index 93% rename from src/main/java/io/bitsquare/trade/protocol/taker/RequestTakeOffer.java rename to src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/RequestTakeOffer.java index d419574be6..af68b52124 100644 --- a/src/main/java/io/bitsquare/trade/protocol/taker/RequestTakeOffer.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/RequestTakeOffer.java @@ -15,12 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.taker; +package io.bitsquare.trade.protocol.trade.taker.tasks; import io.bitsquare.msg.MessageFacade; import io.bitsquare.msg.listeners.OutgoingTradeMessageListener; import io.bitsquare.trade.handlers.ExceptionHandler; import io.bitsquare.trade.handlers.ResultHandler; +import io.bitsquare.trade.protocol.trade.taker.messages.RequestTakeOfferMessage; import net.tomp2p.peers.PeerAddress; diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/SendPayoutTxToOfferer.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java similarity index 93% rename from src/main/java/io/bitsquare/trade/protocol/taker/SendPayoutTxToOfferer.java rename to src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java index d8de515b9f..186380510f 100644 --- a/src/main/java/io/bitsquare/trade/protocol/taker/SendPayoutTxToOfferer.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java @@ -15,12 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.taker; +package io.bitsquare.trade.protocol.trade.taker.tasks; import io.bitsquare.msg.MessageFacade; import io.bitsquare.msg.listeners.OutgoingTradeMessageListener; import io.bitsquare.trade.handlers.ExceptionHandler; import io.bitsquare.trade.handlers.ResultHandler; +import io.bitsquare.trade.protocol.trade.taker.messages.PayoutTxPublishedMessage; import net.tomp2p.peers.PeerAddress; diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/SendSignedTakerDepositTxAsHex.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java similarity index 95% rename from src/main/java/io/bitsquare/trade/protocol/taker/SendSignedTakerDepositTxAsHex.java rename to src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java index 7aa8b81aef..e226433fb2 100644 --- a/src/main/java/io/bitsquare/trade/protocol/taker/SendSignedTakerDepositTxAsHex.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.taker; +package io.bitsquare.trade.protocol.trade.taker.tasks; import io.bitsquare.bank.BankAccount; import io.bitsquare.btc.WalletFacade; @@ -23,6 +23,7 @@ import io.bitsquare.msg.MessageFacade; import io.bitsquare.msg.listeners.OutgoingTradeMessageListener; import io.bitsquare.trade.handlers.ExceptionHandler; import io.bitsquare.trade.handlers.ResultHandler; +import io.bitsquare.trade.protocol.trade.taker.messages.RequestOffererPublishDepositTxMessage; import com.google.bitcoin.core.Transaction; import com.google.bitcoin.core.Utils; diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/SendTakeOfferFeePayedTxId.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendTakeOfferFeePayedTxId.java similarity index 94% rename from src/main/java/io/bitsquare/trade/protocol/taker/SendTakeOfferFeePayedTxId.java rename to src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendTakeOfferFeePayedTxId.java index 7630d97e57..ad4807092f 100644 --- a/src/main/java/io/bitsquare/trade/protocol/taker/SendTakeOfferFeePayedTxId.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendTakeOfferFeePayedTxId.java @@ -15,12 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.taker; +package io.bitsquare.trade.protocol.trade.taker.tasks; import io.bitsquare.msg.MessageFacade; import io.bitsquare.msg.listeners.OutgoingTradeMessageListener; import io.bitsquare.trade.handlers.ExceptionHandler; import io.bitsquare.trade.handlers.ResultHandler; +import io.bitsquare.trade.protocol.trade.taker.messages.TakeOfferFeePayedMessage; import com.google.bitcoin.core.Coin; diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/SignAndPublishPayoutTx.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java similarity index 98% rename from src/main/java/io/bitsquare/trade/protocol/taker/SignAndPublishPayoutTx.java rename to src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java index 8d6124fbbd..d90c5a207b 100644 --- a/src/main/java/io/bitsquare/trade/protocol/taker/SignAndPublishPayoutTx.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.taker; +package io.bitsquare.trade.protocol.trade.taker.tasks; import io.bitsquare.btc.WalletFacade; import io.bitsquare.trade.handlers.ExceptionHandler; diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/VerifyOffererAccount.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java similarity index 91% rename from src/main/java/io/bitsquare/trade/protocol/taker/VerifyOffererAccount.java rename to src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java index 0c8c6a1b6c..f42cc1ad98 100644 --- a/src/main/java/io/bitsquare/trade/protocol/taker/VerifyOffererAccount.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java @@ -15,13 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.taker; +package io.bitsquare.trade.protocol.trade.taker.tasks; import io.bitsquare.bank.BankAccount; import io.bitsquare.btc.BlockChainFacade; import io.bitsquare.trade.handlers.ExceptionHandler; import io.bitsquare.trade.handlers.ResultHandler; -import io.bitsquare.trade.protocol.shared.VerifyPeerAccount; +import io.bitsquare.trade.protocol.trade.shared.tasks.VerifyPeerAccount; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/io/bitsquare/btc/BtcValidatorTest.java b/src/test/java/io/bitsquare/btc/BtcValidatorTest.java index e119bb0882..195dfc4efd 100644 --- a/src/test/java/io/bitsquare/btc/BtcValidatorTest.java +++ b/src/test/java/io/bitsquare/btc/BtcValidatorTest.java @@ -28,7 +28,6 @@ public class BtcValidatorTest { @Test public void testIsMinSpendableAmount() { Coin amount = null; - //noinspection ConstantConditions assertFalse("tx unfunded, pending", BtcValidator.isMinSpendableAmount(amount)); amount = Coin.ZERO;