mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove unneeded wrapping of tradeMessage into DecryptedMessageWithPubKey

Browse source
This commit is contained in:
chimp1984 2021-01-12 13:25:04 -05:00
parent 3875bd85d1
commit 0f087946fc
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java
View file

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