Merge pull request #5196 from jmacxx/fix_SignaturePubKey_error

Prevent erroneous logging of 'SignaturePubKey in message does not match'
bisq-network · Feb 18, 2021 · 2e89e59 · 2e89e59
2 parents cd8c479 + 4afa846
commit 2e89e59
Showing 1 changed file with 3 additions and 3 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
@@ -108,12 +108,12 @@ protected void onMailboxMessage(TradeMessage message, NodeAddress peerNodeAddres
 
     @Override
     public void onDirectMessage(DecryptedMessageWithPubKey decryptedMessageWithPubKey, NodeAddress peer) {
-        if (!isPubKeyValid(decryptedMessageWithPubKey)) {
+        NetworkEnvelope networkEnvelope = decryptedMessageWithPubKey.getNetworkEnvelope();
+        if (!isMyMessage(networkEnvelope)) {
             return;
         }
 
-        NetworkEnvelope networkEnvelope = decryptedMessageWithPubKey.getNetworkEnvelope();
-        if (!isMyMessage(networkEnvelope)) {
+        if (!isPubKeyValid(decryptedMessageWithPubKey)) {
             return;
         }