From 0f087946fc7cb39387e9f0c5df01f3847d42969e Mon Sep 17 00:00:00 2001 From: chimp1984 Date: Tue, 12 Jan 2021 13:25:04 -0500 Subject: [PATCH] Remove unneeded wrapping of tradeMessage into DecryptedMessageWithPubKey --- .../java/bisq/core/trade/protocol/TradeProtocol.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java b/core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java index 291093d8bc..78136021bf 100644 --- a/core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java +++ b/core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java @@ -40,8 +40,6 @@ import bisq.common.crypto.PubKeyRing; import bisq.common.proto.network.NetworkEnvelope; import bisq.common.taskrunner.Task; -import java.security.PublicKey; - import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; @@ -168,14 +166,8 @@ public abstract class TradeProtocol implements DecryptedDirectMessageListener, D } public void removeMailboxMessageAfterProcessing(TradeMessage tradeMessage) { - if (tradeMessage instanceof MailboxMessage && - processModel.getTradingPeer() != null && - processModel.getTradingPeer().getPubKeyRing() != null && - processModel.getTradingPeer().getPubKeyRing().getSignaturePubKey() != null) { - PublicKey sigPubKey = processModel.getTradingPeer().getPubKeyRing().getSignaturePubKey(); - // We reconstruct the DecryptedMessageWithPubKey from the message and the peers signature pubKey - DecryptedMessageWithPubKey decryptedMessageWithPubKey = new DecryptedMessageWithPubKey(tradeMessage, sigPubKey); - processModel.getP2PService().getMailboxMessageService().removeMailboxMsg(decryptedMessageWithPubKey); + if (tradeMessage instanceof MailboxMessage) { + processModel.getP2PService().getMailboxMessageService().removeMailboxMsg((MailboxMessage) tradeMessage); log.info("Remove {} from the P2P network.", tradeMessage.getClass().getSimpleName()); } }