check filter for both plot versions

Author: almogdepaz

chia/_tests/plotting/test_prover.py

@@ -5,6 +5,7 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
+from chia_rs.sized_bytes import bytes32
 
 from chia.plotting.prover import PlotVersion, V1Prover, V2Prover, get_prover_from_bytes, get_prover_from_file
 
@@ -27,7 +28,7 @@ def test_v2_prover_get_memo_raises_error(self) -> None:
 
     def test_v2_prover_get_compression_level_raises_error(self) -> None:
         prover = V2Prover("/nonexistent/path/test.plot2")
-        with pytest.raises(NotImplementedError, match="V2 plot format is not yet implemented"):
+        with pytest.raises(NotImplementedError, match="V2 plot format does not support compression level"):
             prover.get_compression_level()
 
     def test_v2_prover_get_id_raises_error(self) -> None:
@@ -38,12 +39,12 @@ def test_v2_prover_get_id_raises_error(self) -> None:
     def test_v2_prover_get_qualities_for_challenge_raises_error(self) -> None:
         prover = V2Prover("/nonexistent/path/test.plot2")
         with pytest.raises(NotImplementedError, match="V2 plot format is not yet implemented"):
-            prover.get_qualities_for_challenge(b"challenge")
+            prover.get_qualities_for_challenge(bytes32(b"1" * 32))
 
     def test_v2_prover_get_full_proof_raises_error(self) -> None:
         prover = V2Prover("/nonexistent/path/test.plot2")
         with pytest.raises(NotImplementedError, match="V2 plot format require solver to get full proof"):
-            prover.get_full_proof(b"challenge", 0)
+            prover.get_full_proof(bytes32(b"1" * 32), 0)
 
     def test_v2_prover_bytes_raises_error(self) -> None:
         prover = V2Prover("/nonexistent/path/test.plot2")

chia/harvester/harvester_api.py

@@ -52,6 +52,19 @@ def __init__(self, harvester: Harvester):
     def ready(self) -> bool:
         return True
 
+    def _plot_passes_filter(self, plot_info: PlotInfo, challenge: harvester_protocol.NewSignagePointHarvester) -> bool:
+        filter_prefix_bits = calculate_prefix_bits(
+            self.harvester.constants,
+            challenge.peak_height,
+            plot_info.prover.get_size(),
+        )
+        return passes_plot_filter(
+            filter_prefix_bits,
+            plot_info.prover.get_id(),
+            challenge.challenge_hash,
+            challenge.sp_hash,
+        )
+
     @metadata.request(peer_required=True)
     async def harvester_handshake(
         self, harvester_handshake: harvester_protocol.HarvesterHandshake, peer: WSChiaConnection
@@ -318,26 +331,19 @@ async def lookup_challenge(
                 # Passes the plot filter (does not check sp filter yet though, since we have not reached sp)
                 # This is being executed at the beginning of the slot
                 total += 1
-                if try_plot_info.prover.get_version() == PlotVersion.V2:
-                    # TODO: todo_v2_plots need to check v2 filter
-                    v2_awaitables.append(
-                        loop.run_in_executor(
-                            self.harvester.executor, blocking_lookup_v2_partial_proofs, try_plot_filename, try_plot_info
+                if self._plot_passes_filter(try_plot_info, new_challenge):
+                    if try_plot_info.prover.get_version() == PlotVersion.V2:
+                        # TODO: todo_v2_plots need to check v2 filter
+                        v2_awaitables.append(
+                            loop.run_in_executor(
+                                self.harvester.executor,
+                                blocking_lookup_v2_partial_proofs,
+                                try_plot_filename,
+                                try_plot_info,
+                            )
                         )
-                    )
-                    passed += 1
-                else:
-                    filter_prefix_bits = calculate_prefix_bits(
-                        self.harvester.constants,
-                        new_challenge.peak_height,
-                        try_plot_info.prover.get_size(),
-                    )
-                    if passes_plot_filter(
-                        filter_prefix_bits,
-                        try_plot_info.prover.get_id(),
-                        new_challenge.challenge_hash,
-                        new_challenge.sp_hash,
-                    ):
+                        passed += 1
+                    else:
                         passed += 1
                         awaitables.append(lookup_challenge(try_plot_filename, try_plot_info))
             self.harvester.log.debug(f"new_signage_point_harvester {passed} plots passed the plot filter")