Revert "Use FilterRecalculateMode.SEND_IF_CHANGED"

This reverts commit 12beae6.
bisq-network · Dec 16, 2020 · 902679f · 902679f
1 parent dcf8af0
commit 902679f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/core/src/main/java/org/bitcoinj/core/PeerGroup.java b/core/src/main/java/org/bitcoinj/core/PeerGroup.java
@@ -214,14 +214,10 @@ public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coi
                 Script scriptPubKey = output.getScriptPubKey();
                 if (ScriptPattern.isP2PK(scriptPubKey) || ScriptPattern.isP2WPKH(scriptPubKey)) {
                     if (output.isMine(wallet)) {
-//                        if (tx.getConfidence().getConfidenceType() == TransactionConfidence.ConfidenceType.BUILDING)
-//                            recalculateFastCatchupAndFilter(FilterRecalculateMode.SEND_IF_CHANGED);
-//                        else
-//                            recalculateFastCatchupAndFilter(FilterRecalculateMode.SEND_IF_CHANGED);
-                        // Original bitcoinj code is commented out.
-                        // This is a fix to https://github.com/bitcoinj/bitcoinj/issues/2070
-                        // Maybe it fixes https://github.com/bisq-network/bisq/issues/4870
-                        recalculateFastCatchupAndFilter(FilterRecalculateMode.SEND_IF_CHANGED);
+                        if (tx.getConfidence().getConfidenceType() == TransactionConfidence.ConfidenceType.BUILDING)
+                            recalculateFastCatchupAndFilter(FilterRecalculateMode.SEND_IF_CHANGED);
+                        else
+                            recalculateFastCatchupAndFilter(FilterRecalculateMode.DONT_SEND);
                         return;
                     }
                 }

diff --git a/core/src/test/java/org/bitcoinj/core/PeerGroupTest.java b/core/src/test/java/org/bitcoinj/core/PeerGroupTest.java
@@ -616,7 +616,6 @@ public void shutdown() {
         assertEquals(2001, disconnectedPeers.take().getAddress().getPort());
     }
 
-    @Ignore
     @Test
     public void testBloomOnP2PK() throws Exception {
         // Cover bug 513. When a relevant transaction with a P2PK output is found, the Bloom filter should be
-Original file line number
+Diff line change
@@ Expand Up / @@ -616,7 +616,6 @@ public void shutdown() { @@
             assertEquals(2001, disconnectedPeers.take().getAddress().getPort());
         }
-        @Ignore
         @Test
         public void testBloomOnP2PK() throws Exception {
             // Cover bug 513. When a relevant transaction with a P2PK output is found, the Bloom filter should be
@@ Expand Down @@