rename calculate_plot_strength() -> calculate_required_plot_strength()

Author: arvidn

chia/_tests/core/custom_types/test_proof_of_space.py

@@ -12,8 +12,8 @@
 from chia._tests.util.misc import Marks, datacases
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.types.blockchain_format.proof_of_space import (
-    calculate_plot_strength,
     calculate_prefix_bits,
+    calculate_required_plot_strength,
     check_plot_size,
     make_pos,
     passes_plot_filter,
@@ -220,7 +220,7 @@ def test_verify_and_get_quality_string_v2(caplog: pytest.LogCaptureFixture, case
     ],
 )
 def test_calculate_plot_strength(height: uint32, strength: uint8) -> None:
-    assert calculate_plot_strength(DEFAULT_CONSTANTS, height) == strength
+    assert calculate_required_plot_strength(DEFAULT_CONSTANTS, height) == strength
 
 
 @pytest.mark.parametrize(

chia/harvester/harvester_api.py

@@ -26,9 +26,9 @@
 from chia.server.api_protocol import ApiMetadata
 from chia.server.ws_connection import WSChiaConnection
 from chia.types.blockchain_format.proof_of_space import (
-    calculate_plot_strength,
     calculate_pos_challenge,
     calculate_prefix_bits,
+    calculate_required_plot_strength,
     generate_plot_public_key,
     make_pos,
     passes_plot_filter,
@@ -153,7 +153,7 @@ async def new_signage_point_harvester(
         start = time.monotonic()
         assert len(new_challenge.challenge_hash) == 32
 
-        plot_strength = calculate_plot_strength(self.harvester.constants, new_challenge.last_tx_height)
+        plot_strength = calculate_required_plot_strength(self.harvester.constants, new_challenge.last_tx_height)
 
         loop = asyncio.get_running_loop()
 

chia/simulator/block_tools.py

@@ -89,9 +89,9 @@
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.program import DEFAULT_FLAGS, INFINITE_COST, Program, _run, run_with_cost
 from chia.types.blockchain_format.proof_of_space import (
-    calculate_plot_strength,
     calculate_pos_challenge,
     calculate_prefix_bits,
+    calculate_required_plot_strength,
     generate_plot_public_key,
     generate_taproot_sk,
     make_pos,
@@ -1502,7 +1502,7 @@ def get_pospaces_for_challenge(
         rng = random.Random()
         rng.seed(seed)
 
-        plot_strength = calculate_plot_strength(constants, height)
+        plot_strength = calculate_required_plot_strength(constants, height)
         for plot_info in self.plot_manager.plots.values():
             plot_id: bytes32 = plot_info.prover.get_id()
             if force_plot_id is not None and plot_id != force_plot_id:

chia/types/blockchain_format/proof_of_space.py

@@ -142,7 +142,7 @@ def verify_and_get_quality_string(
         # === V2 plots ===
         assert plot_size.size_v2 is not None
 
-        plot_strength = calculate_plot_strength(constants, height)
+        plot_strength = calculate_required_plot_strength(constants, height)
         return validate_proof_v2(plot_id, plot_size.size_v2, plot_strength, pos.challenge, bytes(pos.proof))
 
 
@@ -181,7 +181,7 @@ def calculate_prefix_bits(constants: ConsensusConstants, height: uint32, plot_si
     return max(0, prefix_bits)
 
 
-def calculate_plot_strength(constants: ConsensusConstants, height: uint32) -> uint8:
+def calculate_required_plot_strength(constants: ConsensusConstants, height: uint32) -> uint8:
     if height < constants.PLOT_DIFFICULTY_4_HEIGHT:
         return constants.PLOT_DIFFICULTY_INITIAL
     if height < constants.PLOT_DIFFICULTY_5_HEIGHT: