diff --git a/common/src/main/java/io/bitsquare/common/crypto/SealedAndSigned.java b/common/src/main/java/io/bitsquare/common/crypto/SealedAndSigned.java index 6f2406dd1d..0d6c03b0d3 100644 --- a/common/src/main/java/io/bitsquare/common/crypto/SealedAndSigned.java +++ b/common/src/main/java/io/bitsquare/common/crypto/SealedAndSigned.java @@ -61,14 +61,4 @@ public final class SealedAndSigned implements Serializable { result = 31 * result + (sigPublicKey != null ? sigPublicKey.hashCode() : 0); return result; } - - @Override - public String toString() { - return "SealedAndSigned{" + - "encryptedSecretKey.hashCode()=" + Arrays.toString(encryptedSecretKey).hashCode() + - ", encryptedPayloadWithHmac.hashCode()=" + Arrays.toString(encryptedPayloadWithHmac).hashCode() + - ", signature.hashCode()=" + Arrays.toString(signature).hashCode() + - ", sigPublicKey.hashCode()=" + sigPublicKey.hashCode() + - '}'; - } } diff --git a/core/src/main/java/io/bitsquare/btc/TradeWalletService.java b/core/src/main/java/io/bitsquare/btc/TradeWalletService.java index bdc8d12dfe..14899eb955 100644 --- a/core/src/main/java/io/bitsquare/btc/TradeWalletService.java +++ b/core/src/main/java/io/bitsquare/btc/TradeWalletService.java @@ -482,7 +482,6 @@ public class TradeWalletService { // Add all outputs from offerersDepositTx to depositTx offerersDepositTx.getOutputs().forEach(depositTx::addOutput); - printTxWithInputs("offerersDepositTx", offerersDepositTx); // Sign inputs @@ -625,7 +624,6 @@ public class TradeWalletService { TransactionInput input = payoutTx.getInput(0); input.setScriptSig(inputScript); - printTxWithInputs("payoutTx", payoutTx); verifyTransaction(payoutTx); checkWalletConsistency(); checkScriptSig(payoutTx, input, 0); @@ -784,7 +782,6 @@ public class TradeWalletService { TransactionInput input = payoutTx.getInput(0); input.setScriptSig(inputScript); - printTxWithInputs("disputed payoutTx", payoutTx); verifyTransaction(payoutTx); checkWalletConsistency(); checkScriptSig(payoutTx, input, 0); diff --git a/network/src/main/java/io/bitsquare/p2p/P2PService.java b/network/src/main/java/io/bitsquare/p2p/P2PService.java index f765447240..d20c3025da 100644 --- a/network/src/main/java/io/bitsquare/p2p/P2PService.java +++ b/network/src/main/java/io/bitsquare/p2p/P2PService.java @@ -321,7 +321,7 @@ public class P2PService implements SetupListener, MessageListener, ConnectionLis @Override public void onMessage(Message message, Connection connection) { if (message instanceof PrefixedSealedAndSignedMessage) { - Log.traceCall(message.toString() + "\n\tconnection=" + connection); + Log.traceCall("\n\t" + message.toString() + "\n\tconnection=" + connection); // Seed nodes don't have set the encryptionService if (optionalEncryptionService.isPresent()) { try { diff --git a/network/src/main/java/io/bitsquare/p2p/network/NetworkNode.java b/network/src/main/java/io/bitsquare/p2p/network/NetworkNode.java index 82823387be..b40d456942 100644 --- a/network/src/main/java/io/bitsquare/p2p/network/NetworkNode.java +++ b/network/src/main/java/io/bitsquare/p2p/network/NetworkNode.java @@ -127,7 +127,7 @@ public abstract class NetworkNode implements MessageListener, ConnectionListener } public SettableFuture sendMessage(Connection connection, Message message) { - Log.traceCall("message=" + message + "\n\tconnection=" + connection); + Log.traceCall("\n\tmessage=" + message + "\n\tconnection=" + connection); // connection.sendMessage might take a bit (compression, write to stream), so we use a thread to not block ListenableFuture future = executorService.submit(() -> { Thread.currentThread().setName("NetworkNode:SendMessage-to-" + connection.getUid());