From 8713f9d835c988eedfd825427da079f142ff04a1 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Tue, 17 Mar 2015 00:51:43 +0100
Subject: [PATCH] Exclude 2nd log binding, cleanup, reformat

---
 core/pom.xml                                   |  8 ++++++++
 .../io/bitsquare/arbitrator/Arbitrator.java    |  2 +-
 .../btc/AddressBasedCoinSelector.java          |  7 ++++---
 .../java/io/bitsquare/btc/AddressEntry.java    |  2 +-
 .../io/bitsquare/btc/BlockChainService.java    | 10 +++++++++-
 .../java/io/bitsquare/btc/TradeService.java    | 18 ++++++++----------
 .../java/io/bitsquare/btc/WalletService.java   | 15 ++++++++-------
 .../btc/exceptions/SigningException.java       |  5 ++++-
 .../TransactionVerificationException.java      |  1 +
 .../btc/exceptions/WalletException.java        |  1 +
 .../listeners/AddressConfidenceListener.java   |  1 +
 .../btc/listeners/BalanceListener.java         |  1 +
 .../btc/listeners/TxConfidenceListener.java    |  1 +
 .../io/bitsquare/gui/main/debug/DebugView.java |  6 +++---
 core/src/main/java/io/bitsquare/modena.css     |  4 ++--
 .../java/io/bitsquare/trade/TradeManager.java  |  6 +++---
 .../CheckOfferAvailabilityProtocol.java        |  2 +-
 .../ReportOfferAvailabilityMessage.java        |  2 +-
 .../RequestIsOfferAvailableMessage.java        |  2 +-
 .../availability/tasks/GetPeerAddress.java     |  2 +-
 .../messages/BankTransferStartedMessage.java   |  2 +-
 .../messages/DepositTxPublishedMessage.java    |  2 +-
 .../RespondToTakeOfferRequestMessage.java      |  2 +-
 .../tasks/GetOffererDepositTxInputs.java       |  2 +-
 .../tasks/ProcessPayoutTxPublishedMessage.java |  2 +-
 .../tasks/RespondToTakeOfferRequest.java       |  2 +-
 ...SetupListenerForBlockChainConfirmation.java |  2 +-
 .../trade/taker/SellerAsTakerProtocol.java     |  6 +++---
 .../messages/PayoutTxPublishedMessage.java     |  2 +-
 .../messages/RequestTakeOfferMessage.java      |  2 +-
 .../messages/TakeOfferFeePayedMessage.java     |  2 +-
 .../trade/taker/tasks/GetPeerAddress.java      |  4 ++--
 .../ProcessDepositTxPublishedMessage.java      |  2 +-
 .../ProcessRequestDepositPaymentMessage.java   |  2 +-
 .../tasks/TakerCreatesAndSignsDepositTx.java   |  2 +-
 .../trade/tomp2p/TomP2PTradeMessageModule.java |  5 ++---
 .../tomp2p/TomP2PTradeMessageService.java      |  3 +--
 .../placeoffer/PlaceOfferProtocolTest.java     |  2 +-
 38 files changed, 82 insertions(+), 60 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 619c2c5eb6..9b4349b420 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -192,6 +192,14 @@
             <groupId>com.vinumeris</groupId>
             <artifactId>updatefx</artifactId>
             <version>1.2</version>
+
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-jdk14</artifactId>
+                </exclusion>
+            </exclusions>
+            
         </dependency>
 
         <!-- 
diff --git a/core/src/main/java/io/bitsquare/arbitrator/Arbitrator.java b/core/src/main/java/io/bitsquare/arbitrator/Arbitrator.java
index ccf368b923..2847aa107f 100644
--- a/core/src/main/java/io/bitsquare/arbitrator/Arbitrator.java
+++ b/core/src/main/java/io/bitsquare/arbitrator/Arbitrator.java
@@ -58,7 +58,7 @@ public class Arbitrator implements Serializable {
                       List<ID_VERIFICATION> idVerifications,
                       String webUrl,
                       String description) {
-        this.pubKey=pubKey;
+        this.pubKey = pubKey;
         this.messagePubKeyAsHex = messagePubKeyAsHex;
         this.name = name;
         this.idType = idType;
diff --git a/core/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java b/core/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java
index 1e5b89dbf3..f83c8f2481 100644
--- a/core/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java
+++ b/core/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java
@@ -53,12 +53,13 @@ class AddressBasedCoinSelector extends DefaultCoinSelector {
     // Constructor
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public AddressBasedCoinSelector(NetworkParameters params, AddressEntry addressEntry, boolean includePending) {
+    public AddressBasedCoinSelector(NetworkParameters params, AddressEntry addressEntry, @SuppressWarnings("SameParameterValue") boolean includePending) {
         this.params = params;
         this.addressEntry = addressEntry;
         this.includePending = includePending;
     }
 
+    @SuppressWarnings("WeakerAccess")
     @VisibleForTesting
     static void sortOutputs(ArrayList<TransactionOutput> outputs) {
         Collections.sort(outputs, (a, b) -> {
@@ -130,14 +131,14 @@ class AddressBasedCoinSelector extends DefaultCoinSelector {
     }
 
     private boolean matchesRequiredAddress(TransactionOutput transactionOutput) {
-        if (transactionOutput.getScriptPubKey().isSentToAddress() || transactionOutput.getScriptPubKey().isSentToP2SH
+        if (transactionOutput.getScriptPubKey().isSentToAddress() || transactionOutput.getScriptPubKey().isPayToScriptHash
                 ()) {
             Address addressOutput = transactionOutput.getScriptPubKey().getToAddress(params);
             log.trace("matchesRequiredAddress?");
             log.trace(addressOutput.toString());
             log.trace(addressEntry.getAddress().toString());
 
-            if (addressEntry != null && addressOutput.equals(addressEntry.getAddress())) {
+            if (addressOutput.equals(addressEntry.getAddress())) {
                 return true;
             }
             log.warn("No match found at matchesRequiredAddress addressOutput/addressEntry " + addressOutput.toString
diff --git a/core/src/main/java/io/bitsquare/btc/AddressEntry.java b/core/src/main/java/io/bitsquare/btc/AddressEntry.java
index e670eda34f..0c22c81402 100644
--- a/core/src/main/java/io/bitsquare/btc/AddressEntry.java
+++ b/core/src/main/java/io/bitsquare/btc/AddressEntry.java
@@ -38,7 +38,7 @@ public class AddressEntry implements Serializable {
     private final byte[] pubKey;
     private final byte[] pubKeyHash;
 
-    public AddressEntry(DeterministicKey keyPair, NetworkParameters params, AddressContext addressContext) {
+    public AddressEntry(DeterministicKey keyPair, NetworkParameters params, @SuppressWarnings("SameParameterValue") AddressContext addressContext) {
         this(keyPair, params, addressContext, null);
     }
 
diff --git a/core/src/main/java/io/bitsquare/btc/BlockChainService.java b/core/src/main/java/io/bitsquare/btc/BlockChainService.java
index a572817aff..ad74b9cd75 100644
--- a/core/src/main/java/io/bitsquare/btc/BlockChainService.java
+++ b/core/src/main/java/io/bitsquare/btc/BlockChainService.java
@@ -24,6 +24,7 @@ import javax.inject.Inject;
 /**
  * A service delivers blockchain functionality from the BitcoinJ library.
  */
+@SuppressWarnings({"UnusedDeclaration", "UnusedParameters"})
 public class BlockChainService {
     @Inject
     public BlockChainService() {
@@ -31,36 +32,43 @@ public class BlockChainService {
     }
 
     //TODO
-    public boolean isAccountBlackListed(String accountID, BankAccount bankAccount) {
+    @SuppressWarnings("SameReturnValue")
+    public boolean isAccountBlackListed(String accountId, BankAccount bankAccount) {
         return false;
     }
 
     //TODO
+    @SuppressWarnings("SameReturnValue")
     public boolean verifyAccountRegistration() {
         return true;
     }
 
+    @SuppressWarnings("SameReturnValue")
     private boolean findAddressInBlockChain(String address) {
         // TODO lookup for address in blockchain
         return true;
     }
 
 
+    @SuppressWarnings("SameReturnValue")
     private byte[] getDataForTxWithAddress(String address) {
         // TODO return data after OP_RETURN
         return null;
     }
 
+    @SuppressWarnings("SameReturnValue")
     private boolean isFeePayed(String address) {
         // TODO check if fee is paid
         return true;
     }
 
+    @SuppressWarnings("SameReturnValue")
     private boolean isAccountIDBlacklisted(String accountID) {
         // TODO check if accountID is on blacklist
         return false;
     }
 
+    @SuppressWarnings("SameReturnValue")
     private boolean isBankAccountBlacklisted(BankAccount bankAccount) {
         // TODO check if accountID is on blacklist
         return false;
diff --git a/core/src/main/java/io/bitsquare/btc/TradeService.java b/core/src/main/java/io/bitsquare/btc/TradeService.java
index 577bd2fc63..7c5818db36 100644
--- a/core/src/main/java/io/bitsquare/btc/TradeService.java
+++ b/core/src/main/java/io/bitsquare/btc/TradeService.java
@@ -80,8 +80,8 @@ public class TradeService {
 
     private final NetworkParameters params;
     private final Wallet wallet;
-    private WalletAppKit walletAppKit;
-    private FeePolicy feePolicy;
+    private final WalletAppKit walletAppKit;
+    private final FeePolicy feePolicy;
 
     public TradeService(NetworkParameters params, Wallet wallet, WalletAppKit walletAppKit, FeePolicy feePolicy) {
         this.params = params;
@@ -136,7 +136,7 @@ public class TradeService {
     // Trade
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public TransactionDataResult offererCreatesDepositTxInputs(Coin inputAmount, AddressEntry addressInfo) throws InsufficientMoneyException,
+    public TransactionDataResult offererCreatesDepositTxInputs(Coin inputAmount, AddressEntry addressInfo) throws
             TransactionVerificationException, WalletException {
 
         // We pay the tx fee 2 times to the deposit tx:
@@ -199,7 +199,7 @@ public class TradeService {
                                                                AddressEntry addressInfo,
                                                                byte[] offererPubKey,
                                                                byte[] takerPubKey,
-                                                               byte[] arbitratorPubKey) throws InsufficientMoneyException, SigningException,
+                                                               byte[] arbitratorPubKey) throws SigningException,
             TransactionVerificationException, WalletException {
 
         checkArgument(offererConnectedOutputsForAllInputs.size() > 0);
@@ -308,7 +308,6 @@ public class TradeService {
         }
 
         // Add taker inputs and apply signature
-        List<TransactionInput> takerInputs = new ArrayList<>();
         for (TransactionOutput connectedOutputForInput : takerConnectedOutputsForAllInputs) {
             TransactionOutPoint outPoint = new TransactionOutPoint(params, connectedOutputForInput.getIndex(), connectedOutputForInput.getParentTransaction());
 
@@ -319,7 +318,6 @@ public class TradeService {
                 throw new TransactionVerificationException("Inputs from taker not singed.");
 
             TransactionInput transactionInput = new TransactionInput(params, depositTx, scriptProgram, outPoint, connectedOutputForInput.getValue());
-            takerInputs.add(transactionInput);
             depositTx.addInput(transactionInput);
         }
 
@@ -372,7 +370,7 @@ public class TradeService {
                                                                 Coin takerPayoutAmount,
                                                                 String takerAddressString,
                                                                 AddressEntry addressEntry)
-            throws AddressFormatException, TransactionVerificationException, WalletException {
+            throws AddressFormatException, TransactionVerificationException {
 
         Transaction payoutTx = createPayoutTx(depositTx, offererPayoutAmount, takerPayoutAmount, addressEntry.getAddressString(), takerAddressString);
 
@@ -442,7 +440,7 @@ public class TradeService {
         return tx;
     }
 
-    public static void printTxWithInputs(String tracePrefix, Transaction tx) {
+    private static void printTxWithInputs(String tracePrefix, Transaction tx) {
         log.trace(tracePrefix + ": " + tx.toString());
         for (TransactionInput input : tx.getInputs()) {
             if (input.getConnectedOutput() != null)
@@ -474,7 +472,7 @@ public class TradeService {
         }
     }
 
-    private void signInput(Transaction transaction, TransactionInput input, int inputIndex) throws SigningException, TransactionVerificationException {
+    private void signInput(Transaction transaction, TransactionInput input, int inputIndex) throws SigningException {
         Script scriptPubKey = input.getConnectedOutput().getScriptPubKey();
         ECKey sigKey = input.getOutpoint().getConnectedKey(wallet);
         Sha256Hash hash = transaction.hashForSignature(inputIndex, scriptPubKey, Transaction.SigHash.ALL, false);
@@ -510,7 +508,7 @@ public class TradeService {
         }
     }*/
 
-    private void removeSignatures(Transaction transaction) throws InsufficientMoneyException {
+    private void removeSignatures(Transaction transaction) {
         for (TransactionInput input : transaction.getInputs()) {
             input.setScriptSig(new Script(new byte[]{}));
         }
diff --git a/core/src/main/java/io/bitsquare/btc/WalletService.java b/core/src/main/java/io/bitsquare/btc/WalletService.java
index 355b8fac93..d2778d6f68 100644
--- a/core/src/main/java/io/bitsquare/btc/WalletService.java
+++ b/core/src/main/java/io/bitsquare/btc/WalletService.java
@@ -211,7 +211,7 @@ public class WalletService {
         wallet.addEventListener(walletEventListener);
 
         Serializable serializable = persistence.read(this, "addressEntryList");
-        if (serializable instanceof List) {
+        if (serializable instanceof List<?>) {
             List<AddressEntry> persistedAddressEntryList = (List<AddressEntry>) serializable;
             for (AddressEntry persistedAddressEntry : persistedAddressEntryList) {
                 persistedAddressEntry.setDeterministicKey((DeterministicKey) wallet.findKeyFromPubHash(persistedAddressEntry.getPubKeyHash()));
@@ -355,9 +355,6 @@ public class WalletService {
         return null;
     }
 
-    private void notifyConfidenceListeners(Transaction tx) {
-    }
-
     private TransactionConfidence getTransactionConfidence(Transaction tx, Address address) {
         List<TransactionOutput> mergedOutputs = getOutputsWithConnectedOutputs(tx);
         List<TransactionConfidence> transactionConfidenceList = new ArrayList<>();
@@ -412,6 +409,7 @@ public class WalletService {
     }
 
 
+    @SuppressWarnings("UnusedDeclaration")
     public boolean isRegistrationFeeConfirmed() {
         TransactionConfidence transactionConfidence = null;
         if (getRegistrationAddressEntry() != null) {
@@ -442,7 +440,7 @@ public class WalletService {
         return balance;
     }
 
-    public Coin getWalletBalance() {
+    Coin getWalletBalance() {
         return wallet.getBalance(Wallet.BalanceType.ESTIMATED);
     }
 
@@ -454,16 +452,19 @@ public class WalletService {
         return getBalanceForAddress(getArbitratorDepositAddressEntry().getAddress());
     }
 
+    @SuppressWarnings("UnusedDeclaration")
     public boolean isRegistrationFeeBalanceNonZero() {
         return getRegistrationBalance().compareTo(Coin.ZERO) > 0;
     }
 
+    @SuppressWarnings("UnusedDeclaration")
     public boolean isRegistrationFeeBalanceSufficient() {
         return getRegistrationBalance().compareTo(FeePolicy.REGISTRATION_FEE) >= 0;
     }
 
     //TODO
-    public int getNumOfPeersSeenTx(String txID) {
+    @SuppressWarnings("SameReturnValue")
+    public int getNumOfPeersSeenTx(String txId) {
         // TODO check from blockchain
         // will be async
         return 3;
@@ -558,7 +559,7 @@ public class WalletService {
         }
     }
 
-    public static void printTxWithInputs(String tracePrefix, Transaction tx) {
+    private static void printTxWithInputs(String tracePrefix, Transaction tx) {
         log.trace(tracePrefix + ": " + tx.toString());
         for (TransactionInput input : tx.getInputs()) {
             if (input.getConnectedOutput() != null)
diff --git a/core/src/main/java/io/bitsquare/btc/exceptions/SigningException.java b/core/src/main/java/io/bitsquare/btc/exceptions/SigningException.java
index 2d53c2a089..6b5589d32e 100644
--- a/core/src/main/java/io/bitsquare/btc/exceptions/SigningException.java
+++ b/core/src/main/java/io/bitsquare/btc/exceptions/SigningException.java
@@ -21,14 +21,17 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class SigningException extends Exception {
+    private static final long serialVersionUID = -4585301671813918976L;
+
     private static final Logger log = LoggerFactory.getLogger(SigningException.class);
 
     public SigningException(String message) {
         super(message);
     }
 
+    @SuppressWarnings("WeakerAccess")
     public SigningException(Throwable t) {
         super(t);
-        
+
     }
 }
diff --git a/core/src/main/java/io/bitsquare/btc/exceptions/TransactionVerificationException.java b/core/src/main/java/io/bitsquare/btc/exceptions/TransactionVerificationException.java
index b842544890..6c7008fb04 100644
--- a/core/src/main/java/io/bitsquare/btc/exceptions/TransactionVerificationException.java
+++ b/core/src/main/java/io/bitsquare/btc/exceptions/TransactionVerificationException.java
@@ -21,6 +21,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class TransactionVerificationException extends Exception {
+    private static final long serialVersionUID = 4447301533313718296L;
     private static final Logger log = LoggerFactory.getLogger(TransactionVerificationException.class);
 
     public TransactionVerificationException(Throwable t) {
diff --git a/core/src/main/java/io/bitsquare/btc/exceptions/WalletException.java b/core/src/main/java/io/bitsquare/btc/exceptions/WalletException.java
index aa1777acda..b3ed1f79ac 100644
--- a/core/src/main/java/io/bitsquare/btc/exceptions/WalletException.java
+++ b/core/src/main/java/io/bitsquare/btc/exceptions/WalletException.java
@@ -21,6 +21,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class WalletException extends Exception {
+    private static final long serialVersionUID = 4782095361220152803L;
     private static final Logger log = LoggerFactory.getLogger(WalletException.class);
 
     public WalletException(Throwable t) {
diff --git a/core/src/main/java/io/bitsquare/btc/listeners/AddressConfidenceListener.java b/core/src/main/java/io/bitsquare/btc/listeners/AddressConfidenceListener.java
index 321d148b58..a3596a3840 100644
--- a/core/src/main/java/io/bitsquare/btc/listeners/AddressConfidenceListener.java
+++ b/core/src/main/java/io/bitsquare/btc/listeners/AddressConfidenceListener.java
@@ -31,6 +31,7 @@ public class AddressConfidenceListener {
         return address;
     }
 
+    @SuppressWarnings("UnusedParameters")
     public void onTransactionConfidenceChanged(TransactionConfidence confidence) {
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/btc/listeners/BalanceListener.java b/core/src/main/java/io/bitsquare/btc/listeners/BalanceListener.java
index 070eb26a8e..09941aa10d 100644
--- a/core/src/main/java/io/bitsquare/btc/listeners/BalanceListener.java
+++ b/core/src/main/java/io/bitsquare/btc/listeners/BalanceListener.java
@@ -34,6 +34,7 @@ public class BalanceListener {
         return address;
     }
 
+    @SuppressWarnings("UnusedParameters")
     public void onBalanceChanged(Coin balance) {
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/btc/listeners/TxConfidenceListener.java b/core/src/main/java/io/bitsquare/btc/listeners/TxConfidenceListener.java
index d32b0c95b9..1769594624 100644
--- a/core/src/main/java/io/bitsquare/btc/listeners/TxConfidenceListener.java
+++ b/core/src/main/java/io/bitsquare/btc/listeners/TxConfidenceListener.java
@@ -30,6 +30,7 @@ public class TxConfidenceListener {
         return txID;
     }
 
+    @SuppressWarnings("UnusedParameters")
     public void onTransactionConfidenceChanged(TransactionConfidence confidence) {
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java b/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java
index 26c312f3b1..fc8e4c2d09 100644
--- a/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java
@@ -31,10 +31,10 @@ import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessPayoutTxPublishedM
 import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessRequestOffererPublishDepositTxMessage;
 import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessRequestTakeOfferMessage;
 import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessTakeOfferFeePayedMessage;
+import io.bitsquare.trade.protocol.trade.offerer.tasks.RequestDepositPayment;
 import io.bitsquare.trade.protocol.trade.offerer.tasks.RespondToTakeOfferRequest;
 import io.bitsquare.trade.protocol.trade.offerer.tasks.SendBankTransferStartedMessage;
 import io.bitsquare.trade.protocol.trade.offerer.tasks.SendDepositTxIdToTaker;
-import io.bitsquare.trade.protocol.trade.offerer.tasks.RequestDepositPayment;
 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.SignPayoutTx;
@@ -43,18 +43,18 @@ 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.SellerAsTakerProtocol;
 import io.bitsquare.trade.protocol.trade.taker.tasks.CreateAndSignContract;
-import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCreatesAndSignsDepositTx;
 import io.bitsquare.trade.protocol.trade.taker.tasks.PayTakeOfferFee;
 import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessBankTransferStartedMessage;
 import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessDepositTxPublishedMessage;
-import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessRespondToTakeOfferRequestMessage;
 import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessRequestDepositPaymentMessage;
+import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessRespondToTakeOfferRequestMessage;
 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.SendSignedTakerDepositTx;
 import io.bitsquare.trade.protocol.trade.taker.tasks.SendTakeOfferFeePayedMessage;
 import io.bitsquare.trade.protocol.trade.taker.tasks.SignAndPublishPayoutTx;
 import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCommitDepositTx;
+import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCreatesAndSignsDepositTx;
 import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOfferFeePayment;
 import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOffererAccount;
 import io.bitsquare.util.taskrunner.Task;
diff --git a/core/src/main/java/io/bitsquare/modena.css b/core/src/main/java/io/bitsquare/modena.css
index 1b97aa73b0..da85fed8ec 100644
--- a/core/src/main/java/io/bitsquare/modena.css
+++ b/core/src/main/java/io/bitsquare/modena.css
@@ -2660,8 +2660,8 @@ is being used to size a border should also be in pixels.
 }
 
 /* Header Sort Arrows */
-.table-view /*> column-header-background > nested-column-header >*/  .arrow,
-.tree-table-view /*> column-header-background > nested-column-header >*/  .arrow {
+.table-view /*> column-header-background > nested-column-header >*/   .arrow,
+.tree-table-view /*> column-header-background > nested-column-header >*/   .arrow {
     -fx-background-color: -fx-mark-color;
     -fx-padding: 0.25em 0.3125em 0.25em 0.3125em; /* 3 3.75 3 3.75 */
     -fx-shape: "M 0 0 h 7 l -3.5 4 z";
diff --git a/core/src/main/java/io/bitsquare/trade/TradeManager.java b/core/src/main/java/io/bitsquare/trade/TradeManager.java
index a982d36e68..78617ff22d 100644
--- a/core/src/main/java/io/bitsquare/trade/TradeManager.java
+++ b/core/src/main/java/io/bitsquare/trade/TradeManager.java
@@ -103,17 +103,17 @@ public class TradeManager {
         this.offerBookService = offerBookService;
 
         Object openOffersObject = persistence.read(this, "openOffers");
-        if (openOffersObject instanceof Map) {
+        if (openOffersObject instanceof Map<?, ?>) {
             openOffers.putAll((Map<String, OpenOffer>) openOffersObject);
         }
 
         Object pendingTradesObject = persistence.read(this, "pendingTrades");
-        if (pendingTradesObject instanceof Map) {
+        if (pendingTradesObject instanceof Map<?, ?>) {
             pendingTrades.putAll((Map<String, Trade>) pendingTradesObject);
         }
 
         Object closedTradesObject = persistence.read(this, "closedTrades");
-        if (closedTradesObject instanceof Map) {
+        if (closedTradesObject instanceof Map<?, ?>) {
             closedTrades.putAll((Map<String, Trade>) closedTradesObject);
         }
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java
index 6d44d7fbea..3d22f64466 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java
@@ -90,7 +90,7 @@ public class CheckOfferAvailabilityProtocol {
     // Incoming message handling
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private void handleMessage(Message message, @SuppressWarnings("UnusedParameters") Peer sender) {
+    private void handleMessage(Message message, Peer sender) {
         if (!isCanceled) {
             if (message instanceof ReportOfferAvailabilityMessage)
                 handleReportOfferAvailabilityMessage((ReportOfferAvailabilityMessage) message);
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/ReportOfferAvailabilityMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/ReportOfferAvailabilityMessage.java
index d491b88160..4d6e755193 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/ReportOfferAvailabilityMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/ReportOfferAvailabilityMessage.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
 
 public class ReportOfferAvailabilityMessage implements Serializable, OfferMessage {
     private static final long serialVersionUID = 6177387534187739018L;
-    
+
     private final String offerId;
     private final boolean isOfferOpen;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/RequestIsOfferAvailableMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/RequestIsOfferAvailableMessage.java
index af41a4e604..2da7c4578b 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/RequestIsOfferAvailableMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/RequestIsOfferAvailableMessage.java
@@ -24,7 +24,7 @@ import java.io.Serializable;
 // That msg is used to ping the offerer if he is online and if the offer is still available
 public class RequestIsOfferAvailableMessage implements Serializable, OfferMessage {
     private static final long serialVersionUID = 4630151440192191798L;
-    
+
     private final String offerId;
 
     public RequestIsOfferAvailableMessage(String offerId) {
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java
index 3829afe2f9..3f945a9b36 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java
@@ -44,7 +44,7 @@ public class GetPeerAddress extends Task<CheckOfferAvailabilityModel> {
                 log.trace("Found peer: " + peer.toString());
 
                 model.setPeer(peer);
-                
+
                 complete();
             }
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/BankTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/BankTransferStartedMessage.java
index dbc336c013..1c7aa3e7bb 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/BankTransferStartedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/BankTransferStartedMessage.java
@@ -26,7 +26,7 @@ import java.io.Serializable;
 
 public class BankTransferStartedMessage implements Serializable, TradeMessage {
     private static final long serialVersionUID = -3479634129543632523L;
-    
+
     private final String tradeId;
     private final Transaction depositTx;
     private final byte[] offererSignature;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/DepositTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/DepositTxPublishedMessage.java
index df9088bbf1..38131aea31 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/DepositTxPublishedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/DepositTxPublishedMessage.java
@@ -25,7 +25,7 @@ import java.io.Serializable;
 
 public class DepositTxPublishedMessage implements Serializable, TradeMessage {
     private static final long serialVersionUID = -1532231540167406581L;
-    
+
     private final String tradeId;
     private final Transaction depositTx;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RespondToTakeOfferRequestMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RespondToTakeOfferRequestMessage.java
index 1fa8e45238..500f3caadd 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RespondToTakeOfferRequestMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RespondToTakeOfferRequestMessage.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
 
 public class RespondToTakeOfferRequestMessage implements Serializable, TradeMessage {
     private static final long serialVersionUID = 6177387534087739018L;
-    
+
     private final String tradeId;
     private final boolean offerIsAvailable;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/GetOffererDepositTxInputs.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/GetOffererDepositTxInputs.java
index 911a24a18e..b6444ac476 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/GetOffererDepositTxInputs.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/GetOffererDepositTxInputs.java
@@ -42,7 +42,7 @@ public class GetOffererDepositTxInputs extends Task<BuyerAsOffererModel> {
             Coin offererInputAmount = model.getTrade().getSecurityDeposit().add(FeePolicy.TX_FEE);
             AddressEntry addressInfo = model.getAddressEntry();
             TradeService.TransactionDataResult result = model.getTradeService().offererCreatesDepositTxInputs(offererInputAmount, addressInfo);
-          
+
             model.setOffererConnectedOutputsForAllInputs(result.getConnectedOutputsForAllInputs());
             model.setOffererOutputs(result.getOutputs());
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java
index 88f496159d..d7a100920f 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java
@@ -42,7 +42,7 @@ public class ProcessPayoutTxPublishedMessage extends Task<BuyerAsOffererModel> {
             checkTradeId(model.getId(), model.getTradeMessage());
 
             model.getTrade().setPayoutTx(checkNotNull(((PayoutTxPublishedMessage) model.getTradeMessage()).getPayoutTx()));
-            
+
             model.getTrade().setState(Trade.State.PAYOUT_PUBLISHED);
 
             complete();
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RespondToTakeOfferRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RespondToTakeOfferRequest.java
index 4d43648fdf..6fa6566660 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RespondToTakeOfferRequest.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RespondToTakeOfferRequest.java
@@ -39,7 +39,7 @@ public class RespondToTakeOfferRequest extends Task<BuyerAsOffererModel> {
     @Override
     protected void doRun() {
         offerIsAvailable = model.getOpenOffer().getState() == OpenOffer.State.OPEN;
-        
+
         if (offerIsAvailable) {
             Trade trade = new Trade(model.getOpenOffer().getOffer());
             model.setTrade(trade);
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
index 96b22cb22b..c198b2eed7 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
@@ -47,7 +47,7 @@ public class SetupListenerForBlockChainConfirmation extends Task<BuyerAsOffererM
                     model.getTrade().setState(Trade.State.DEPOSIT_CONFIRMED);
 
                     boolean removed = confidence.removeEventListener(this);
-                    log.debug("listener removed? "+removed);
+                    log.debug("listener removed? " + removed);
                 }
             }
         });
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java
index 802413540e..b38e997601 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java
@@ -28,7 +28,6 @@ import io.bitsquare.trade.protocol.trade.offerer.messages.RequestDepositPaymentM
 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.TakerCreatesAndSignsDepositTx;
 import io.bitsquare.trade.protocol.trade.taker.tasks.PayTakeOfferFee;
 import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessBankTransferStartedMessage;
 import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessDepositTxPublishedMessage;
@@ -40,6 +39,7 @@ import io.bitsquare.trade.protocol.trade.taker.tasks.SendSignedTakerDepositTx;
 import io.bitsquare.trade.protocol.trade.taker.tasks.SendTakeOfferFeePayedMessage;
 import io.bitsquare.trade.protocol.trade.taker.tasks.SignAndPublishPayoutTx;
 import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCommitDepositTx;
+import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCreatesAndSignsDepositTx;
 import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOfferFeePayment;
 import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOffererAccount;
 
@@ -196,12 +196,12 @@ public class SellerAsTakerProtocol {
     // Massage dispatcher
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private void handleMessage(Message message, @SuppressWarnings("UnusedParameters") Peer sender) {
+    private void handleMessage(Message message, Peer sender) {
         log.trace("handleNewMessage: message = " + message.getClass().getSimpleName());
         if (message instanceof TradeMessage) {
             TradeMessage tradeMessage = (TradeMessage) message;
             nonEmptyStringOf(tradeMessage.getTradeId());
-           
+
             if (tradeMessage.getTradeId().equals(model.getOffer().getId())) {
                 if (tradeMessage instanceof RespondToTakeOfferRequestMessage) {
                     handleRespondToTakeOfferRequestMessage((RespondToTakeOfferRequestMessage) tradeMessage);
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/PayoutTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/PayoutTxPublishedMessage.java
index 0d84c2c0b4..09bfd7df4a 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/PayoutTxPublishedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/PayoutTxPublishedMessage.java
@@ -25,7 +25,7 @@ import java.io.Serializable;
 
 public class PayoutTxPublishedMessage implements Serializable, TradeMessage {
     private static final long serialVersionUID = 1288653559218403873L;
-    
+
     private final String tradeId;
     private final Transaction payoutTx;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestTakeOfferMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestTakeOfferMessage.java
index f0f36883ff..bbe77d393f 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestTakeOfferMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestTakeOfferMessage.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
 
 public class RequestTakeOfferMessage implements Serializable, TradeMessage {
     private static final long serialVersionUID = 4660151440192191798L;
-    
+
     private final String tradeId;
 
     public RequestTakeOfferMessage(String tradeId) {
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/TakeOfferFeePayedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/TakeOfferFeePayedMessage.java
index 4d2092cc0c..bb6551d117 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/TakeOfferFeePayedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/TakeOfferFeePayedMessage.java
@@ -25,7 +25,7 @@ import java.io.Serializable;
 
 public class TakeOfferFeePayedMessage implements Serializable, TradeMessage {
     private static final long serialVersionUID = -5057935061275354312L;
-    
+
     private final String tradeId;
     private final Coin tradeAmount;
     private final String takeOfferFeeTxID;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java
index baf91b37a3..83e9a4cc1c 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java
@@ -43,14 +43,14 @@ public class GetPeerAddress extends Task<SellerAsTakerModel> {
                 log.trace("Found peer: " + peer.toString());
 
                 model.setOfferer(peer);
-                
+
                 complete();
             }
 
             @Override
             public void onFailed() {
                 model.getOffer().setState(Offer.State.OFFERER_OFFLINE);
-                
+
                 failed();
             }
         });
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java
index 9dabb96df6..23c3c9a744 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java
@@ -26,7 +26,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static io.bitsquare.util.Validator.*;
+import static io.bitsquare.util.Validator.checkTradeId;
 
 public class ProcessDepositTxPublishedMessage extends Task<SellerAsTakerModel> {
     private static final Logger log = LoggerFactory.getLogger(ProcessDepositTxPublishedMessage.class);
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRequestDepositPaymentMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRequestDepositPaymentMessage.java
index 4f1e814989..b93a51c781 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRequestDepositPaymentMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRequestDepositPaymentMessage.java
@@ -45,7 +45,7 @@ public class ProcessRequestDepositPaymentMessage extends Task<SellerAsTakerModel
             checkArgument(message.getOffererConnectedOutputsForAllInputs().size() > 0);
             model.setOffererOutputs(checkNotNull(message.getOffererOutputs()));
             model.setOffererPubKey(checkNotNull(message.getOffererPubKey()));
-            
+
             model.setTakerBankAccount(checkNotNull(message.getBankAccount()));
             model.setTakerAccountId(nonEmptyStringOf(message.getAccountId()));
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesAndSignsDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesAndSignsDepositTx.java
index 69144cf9e9..16db6cb238 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesAndSignsDepositTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesAndSignsDepositTx.java
@@ -52,7 +52,7 @@ public class TakerCreatesAndSignsDepositTx extends Task<SellerAsTakerModel> {
                     model.getTakerPubKey(),
                     model.getArbitratorPubKey());
 
-            
+
             model.setTakerConnectedOutputsForAllInputs(result.getConnectedOutputsForAllInputs());
             model.setTakerOutputs(result.getOutputs());
             model.setTakerDepositTx(result.getDepositTx());
diff --git a/core/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageModule.java b/core/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageModule.java
index 863a35f1b5..1da460e28a 100644
--- a/core/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageModule.java
+++ b/core/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageModule.java
@@ -20,7 +20,6 @@ package io.bitsquare.trade.tomp2p;
 import io.bitsquare.network.tomp2p.TomP2PNode;
 import io.bitsquare.trade.TradeMessageModule;
 import io.bitsquare.trade.TradeMessageService;
-import io.bitsquare.user.User;
 
 import com.google.inject.Provider;
 import com.google.inject.Singleton;
@@ -47,8 +46,8 @@ class TomP2PTradeMessageServiceProvider implements Provider<TradeMessageService>
     private final TradeMessageService tradeMessageService;
 
     @Inject
-    public TomP2PTradeMessageServiceProvider(User user, TomP2PNode tomP2PNode) {
-        tradeMessageService = new TomP2PTradeMessageService(user, tomP2PNode);
+    public TomP2PTradeMessageServiceProvider(TomP2PNode tomP2PNode) {
+        tradeMessageService = new TomP2PTradeMessageService(tomP2PNode);
         tradeMessageService.setExecutor(Platform::runLater);
     }
 
diff --git a/core/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java b/core/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java
index 7d4d89ec47..21ef71f660 100644
--- a/core/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java
+++ b/core/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java
@@ -25,7 +25,6 @@ import io.bitsquare.trade.TradeMessageService;
 import io.bitsquare.trade.handlers.MessageHandler;
 import io.bitsquare.trade.listeners.GetPeerAddressListener;
 import io.bitsquare.trade.listeners.SendMessageListener;
-import io.bitsquare.user.User;
 
 import java.security.PublicKey;
 
@@ -64,7 +63,7 @@ public class TomP2PTradeMessageService implements TradeMessageService {
     // Constructor
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public TomP2PTradeMessageService(User user, TomP2PNode tomP2PNode) {
+    public TomP2PTradeMessageService(TomP2PNode tomP2PNode) {
         this.tomP2PNode = tomP2PNode;
     }
 
diff --git a/core/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java b/core/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java
index 8a099480a3..91b86e6d79 100644
--- a/core/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java
+++ b/core/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java
@@ -96,7 +96,7 @@ public class PlaceOfferProtocolTest {
         user.applyPersistedUser(null);
         bootstrappedPeerBuilder = new BootstrappedPeerBuilder(Node.DEFAULT_PORT, false, bootstrapNode, "<unspecified>");
         tomP2PNode = new TomP2PNode(bootstrappedPeerBuilder);
-        tradeMessageService = new TomP2PTradeMessageService(user, tomP2PNode);
+        tradeMessageService = new TomP2PTradeMessageService(tomP2PNode);
 
         Observable<BootstrapState> messageObservable = tomP2PNode.bootstrap(user.getNetworkKeyPair(), tradeMessageService);
         messageObservable.publish();