chia-blockchain 2.5.4rc2__py3-none-any.whl → 2.5.5rc2__py3-none-any.whl

chia/_tests/core/full_node/full_sync/test_full_sync.py

@@ -5,433 +5,473 @@ import logging
 import time
 
 import pytest
-from chia_rs.sized_ints import uint16
+from chia_rs import ConsensusConstants, FullBlock, SubEpochSummary
+from chia_rs.sized_ints import uint16, uint32, uint64
 
+from chia._tests.conftest import ConsensusMode
 from chia._tests.core.node_height import node_height_between, node_height_exactly
 from chia._tests.util.time_out_assert import time_out_assert
 from chia.full_node.full_node_api import FullNodeAPI
 from chia.protocols import full_node_protocol
 from chia.protocols.shared_protocol import Capability
-from chia.types.blockchain_format.sub_epoch_summary import SubEpochSummary
-from chia.types.full_block import FullBlock
+from chia.server.server import ChiaServer
+from chia.simulator.block_tools import BlockTools
 from chia.types.peer_info import PeerInfo
 from chia.util.hash import std_hash
 
 log = logging.getLogger(__name__)
 
 
-class TestFullSync:
-    @pytest.mark.anyio
-    async def test_long_sync_from_zero(self, five_nodes, default_400_blocks, bt, self_hostname):
-        # Must be larger than "sync_block_behind_threshold" in the config
-        num_blocks = len(default_400_blocks)
-        blocks: list[FullBlock] = default_400_blocks
-        full_node_1, full_node_2, full_node_3, full_node_4, full_node_5 = five_nodes
-        server_1 = full_node_1.full_node.server
-        server_2 = full_node_2.full_node.server
-        server_3 = full_node_3.full_node.server
-        server_4 = full_node_4.full_node.server
-        server_5 = full_node_5.full_node.server
-
-        # If this constant is changed, update the tests to use more blocks
-        assert bt.constants.WEIGHT_PROOF_RECENT_BLOCKS < 400
-
-        # Syncs up less than recent blocks
-        for block in blocks[: bt.constants.WEIGHT_PROOF_RECENT_BLOCKS - 5]:
+@pytest.mark.anyio
+async def test_long_sync_from_zero(
+    five_nodes: list[FullNodeAPI], default_400_blocks: list[FullBlock], bt: BlockTools, self_hostname: str
+) -> None:
+    # Must be larger than "sync_block_behind_threshold" in the config
+    num_blocks = len(default_400_blocks)
+    blocks: list[FullBlock] = default_400_blocks
+    full_node_1, full_node_2, full_node_3, full_node_4, full_node_5 = five_nodes
+    server_1 = full_node_1.full_node.server
+    server_2 = full_node_2.full_node.server
+    server_3 = full_node_3.full_node.server
+    server_4 = full_node_4.full_node.server
+    server_5 = full_node_5.full_node.server
+
+    # If this constant is changed, update the tests to use more blocks
+    assert bt.constants.WEIGHT_PROOF_RECENT_BLOCKS < 400
+
+    # Syncs up less than recent blocks
+    for block in blocks[: bt.constants.WEIGHT_PROOF_RECENT_BLOCKS - 5]:
+        await full_node_1.full_node.add_block(block)
+
+    await server_2.start_client(
+        PeerInfo(self_hostname, server_1.get_port()), on_connect=full_node_2.full_node.on_connect
+    )
+
+    timeout_seconds = 250
+
+    # The second node should eventually catch up to the first one
+    await time_out_assert(
+        timeout_seconds, node_height_exactly, True, full_node_2, bt.constants.WEIGHT_PROOF_RECENT_BLOCKS - 5 - 1
+    )
+
+    for block in blocks[bt.constants.WEIGHT_PROOF_RECENT_BLOCKS - 5 : bt.constants.WEIGHT_PROOF_RECENT_BLOCKS + 5]:
+        await full_node_1.full_node.add_block(block)
+
+    await server_3.start_client(
+        PeerInfo(self_hostname, server_1.get_port()), on_connect=full_node_3.full_node.on_connect
+    )
+
+    # Node 3 and Node 2 sync up to node 1
+    await time_out_assert(
+        timeout_seconds, node_height_exactly, True, full_node_2, bt.constants.WEIGHT_PROOF_RECENT_BLOCKS + 5 - 1
+    )
+    await time_out_assert(
+        timeout_seconds, node_height_exactly, True, full_node_3, bt.constants.WEIGHT_PROOF_RECENT_BLOCKS + 5 - 1
+    )
+
+    cons = list(server_1.all_connections.values())[:]
+    for con in cons:
+        await con.close()
+    for block in blocks[bt.constants.WEIGHT_PROOF_RECENT_BLOCKS + 5 :]:
+        await full_node_1.full_node.add_block(block)
+
+    await server_2.start_client(
+        PeerInfo(self_hostname, server_1.get_port()), on_connect=full_node_2.full_node.on_connect
+    )
+    await server_3.start_client(
+        PeerInfo(self_hostname, server_1.get_port()), on_connect=full_node_3.full_node.on_connect
+    )
+    await server_4.start_client(
+        PeerInfo(self_hostname, server_1.get_port()), on_connect=full_node_4.full_node.on_connect
+    )
+    await server_3.start_client(
+        PeerInfo(self_hostname, server_2.get_port()), on_connect=full_node_3.full_node.on_connect
+    )
+    await server_4.start_client(
+        PeerInfo(self_hostname, server_3.get_port()), on_connect=full_node_4.full_node.on_connect
+    )
+    await server_4.start_client(
+        PeerInfo(self_hostname, server_2.get_port()), on_connect=full_node_4.full_node.on_connect
+    )
+
+    # All four nodes are synced
+    await time_out_assert(timeout_seconds, node_height_exactly, True, full_node_1, num_blocks - 1)
+    await time_out_assert(timeout_seconds, node_height_exactly, True, full_node_2, num_blocks - 1)
+    await time_out_assert(timeout_seconds, node_height_exactly, True, full_node_3, num_blocks - 1)
+    await time_out_assert(timeout_seconds, node_height_exactly, True, full_node_4, num_blocks - 1)
+
+    # Deep reorg, fall back from batch sync to long sync
+    blocks_node_5 = bt.get_consecutive_blocks(60, block_list_input=blocks[:350], seed=b"node5")
+    for block in blocks_node_5:
+        await full_node_5.full_node.add_block(block)
+    await server_5.start_client(
+        PeerInfo(self_hostname, server_1.get_port()), on_connect=full_node_5.full_node.on_connect
+    )
+    await time_out_assert(timeout_seconds, node_height_exactly, True, full_node_5, 409)
+    await time_out_assert(timeout_seconds, node_height_exactly, True, full_node_1, 409)
+
+
+@pytest.mark.anyio
+async def test_sync_from_fork_point_and_weight_proof(
+    three_nodes: list[FullNodeAPI],
+    default_1000_blocks: list[FullBlock],
+    default_400_blocks: list[FullBlock],
+    self_hostname: str,
+) -> None:
+    # Must be larger than "sync_block_behind_threshold" in the config
+    num_blocks_initial = len(default_1000_blocks) - 50
+    blocks_950 = default_1000_blocks[:num_blocks_initial]
+    blocks_rest = default_1000_blocks[num_blocks_initial:]
+    blocks_400 = default_400_blocks
+    full_node_1, full_node_2, full_node_3 = three_nodes
+    server_1 = full_node_1.full_node.server
+    server_2 = full_node_2.full_node.server
+    server_3 = full_node_3.full_node.server
+
+    for block in blocks_950:
+        await full_node_1.full_node.add_block(block)
+
+    # Node 2 syncs from halfway
+    for i in range(int(len(default_1000_blocks) / 2)):
+        await full_node_2.full_node.add_block(default_1000_blocks[i])
+
+    # Node 3 syncs from a different blockchain
+    for block in blocks_400:
+        await full_node_3.full_node.add_block(block)
+
+    await server_2.start_client(PeerInfo(self_hostname, server_1.get_port()), full_node_2.full_node.on_connect)
+    await server_3.start_client(PeerInfo(self_hostname, server_1.get_port()), full_node_3.full_node.on_connect)
+
+    # Also test request proof of weight
+    # Have the request header hash
+    res = await full_node_1.request_proof_of_weight(
+        full_node_protocol.RequestProofOfWeight(uint32(blocks_950[-1].height + 1), blocks_950[-1].header_hash)
+    )
+    assert res is not None
+    assert full_node_1.full_node.weight_proof_handler is not None
+    validated, _, _ = await full_node_1.full_node.weight_proof_handler.validate_weight_proof(
+        full_node_protocol.RespondProofOfWeight.from_bytes(res.data).wp
+    )
+    assert validated
+
+    # Don't have the request header hash
+    res = await full_node_1.request_proof_of_weight(
+        full_node_protocol.RequestProofOfWeight(uint32(blocks_950[-1].height + 1), std_hash(b"12"))
+    )
+    assert res is None
+
+    # The second node should eventually catch up to the first one, and have the
+    # same tip at height num_blocks - 1
+    await time_out_assert(300, node_height_exactly, True, full_node_2, num_blocks_initial - 1)
+    await time_out_assert(180, node_height_exactly, True, full_node_3, num_blocks_initial - 1)
+
+    def fn3_is_not_syncing() -> bool:
+        return not full_node_3.full_node.sync_store.get_sync_mode()
+
+    await time_out_assert(180, fn3_is_not_syncing)
+    cons = list(server_1.all_connections.values())[:]
+    for con in cons:
+        await con.close()
+    for block in blocks_rest:
+        await full_node_3.full_node.add_block(block)
+        peak = full_node_3.full_node.blockchain.get_peak()
+        assert peak is not None
+        assert peak.height >= block.height
+
+    peak = full_node_3.full_node.blockchain.get_peak()
+    assert peak is not None
+    log.warning(f"FN3 height {peak.height}")
+
+    # TODO: fix this flaky test
+    await time_out_assert(180, node_height_exactly, True, full_node_3, 999)
+
+    await server_2.start_client(PeerInfo(self_hostname, server_1.get_port()), full_node_2.full_node.on_connect)
+    await server_3.start_client(PeerInfo(self_hostname, server_1.get_port()), full_node_3.full_node.on_connect)
+    await server_3.start_client(PeerInfo(self_hostname, server_2.get_port()), full_node_3.full_node.on_connect)
+    await time_out_assert(180, node_height_exactly, True, full_node_1, 999)
+    await time_out_assert(180, node_height_exactly, True, full_node_2, 999)
+
+
+@pytest.mark.anyio
+async def test_batch_sync(
+    two_nodes: tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools], self_hostname: str
+) -> None:
+    # Must be below "sync_block_behind_threshold" in the config
+    num_blocks = 20
+    num_blocks_2 = 9
+    full_node_1, full_node_2, server_1, server_2, bt = two_nodes
+    blocks = bt.get_consecutive_blocks(num_blocks)
+    blocks_2 = bt.get_consecutive_blocks(num_blocks_2, seed=b"123")
+
+    # 12 blocks to node_1
+    for block in blocks:
+        await full_node_1.full_node.add_block(block)
+
+    # 9 different blocks to node_2
+    for block in blocks_2:
+        await full_node_2.full_node.add_block(block)
+
+    await server_2.start_client(
+        PeerInfo(self_hostname, server_1.get_port()),
+        on_connect=full_node_2.full_node.on_connect,
+    )
+    await time_out_assert(60, node_height_exactly, True, full_node_2, num_blocks - 1)
+
+
+@pytest.mark.anyio
+async def test_backtrack_sync_1(
+    two_nodes: tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools], self_hostname: str
+) -> None:
+    full_node_1, full_node_2, server_1, server_2, bt = two_nodes
+    blocks = bt.get_consecutive_blocks(1, skip_slots=1)
+    blocks = bt.get_consecutive_blocks(1, blocks, skip_slots=0)
+    blocks = bt.get_consecutive_blocks(1, blocks, skip_slots=0)
+
+    # 3 blocks to node_1 in different sub slots
+    for block in blocks:
+        await full_node_1.full_node.add_block(block)
+
+    await server_2.start_client(
+        PeerInfo(self_hostname, server_1.get_port()),
+        on_connect=full_node_2.full_node.on_connect,
+    )
+    await time_out_assert(60, node_height_exactly, True, full_node_2, 2)
+
+
+@pytest.mark.anyio
+async def test_backtrack_sync_2(
+    two_nodes: tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools], self_hostname: str
+) -> None:
+    full_node_1, full_node_2, server_1, server_2, bt = two_nodes
+    blocks = bt.get_consecutive_blocks(1, skip_slots=3)
+    blocks = bt.get_consecutive_blocks(8, blocks, skip_slots=0)
+
+    # 3 blocks to node_1 in different sub slots
+    for block in blocks:
+        await full_node_1.full_node.add_block(block)
+
+    await server_2.start_client(
+        PeerInfo(self_hostname, server_1.get_port()),
+        on_connect=full_node_2.full_node.on_connect,
+    )
+    await time_out_assert(60, node_height_exactly, True, full_node_2, 8)
+
+
+@pytest.mark.anyio
+async def test_close_height_but_big_reorg(three_nodes: list[FullNodeAPI], bt: BlockTools, self_hostname: str) -> None:
+    blocks_a = bt.get_consecutive_blocks(50)
+    blocks_b = bt.get_consecutive_blocks(51, seed=b"B")
+    blocks_c = bt.get_consecutive_blocks(90, seed=b"C")
+    full_node_1, full_node_2, full_node_3 = three_nodes
+    server_1 = full_node_1.full_node.server
+    server_2 = full_node_2.full_node.server
+    server_3 = full_node_3.full_node.server
+
+    for block in blocks_a:
+        await full_node_1.full_node.add_block(block)
+    for block in blocks_b:
+        await full_node_2.full_node.add_block(block)
+    for block in blocks_c:
+        await full_node_3.full_node.add_block(block)
+
+    await server_2.start_client(
+        PeerInfo(self_hostname, server_1.get_port()),
+        on_connect=full_node_2.full_node.on_connect,
+    )
+    await time_out_assert(80, node_height_exactly, True, full_node_1, 50)
+    await time_out_assert(80, node_height_exactly, True, full_node_2, 50)
+    await time_out_assert(80, node_height_exactly, True, full_node_3, 89)
+
+    await server_3.start_client(
+        PeerInfo(self_hostname, server_1.get_port()),
+        on_connect=full_node_3.full_node.on_connect,
+    )
+
+    await server_3.start_client(
+        PeerInfo(self_hostname, server_2.get_port()),
+        on_connect=full_node_3.full_node.on_connect,
+    )
+    await time_out_assert(80, node_height_exactly, True, full_node_1, 89)
+    await time_out_assert(80, node_height_exactly, True, full_node_2, 89)
+    await time_out_assert(80, node_height_exactly, True, full_node_3, 89)
+
+
+@pytest.mark.anyio
+async def test_sync_bad_peak_while_synced(
+    three_nodes: list[FullNodeAPI],
+    default_1000_blocks: list[FullBlock],
+    default_1500_blocks: list[FullBlock],
+    self_hostname: str,
+) -> None:
+    # Must be larger than "sync_block_behind_threshold" in the config
+    num_blocks_initial = len(default_1000_blocks) - 250
+    blocks_750 = default_1000_blocks[:num_blocks_initial]
+    full_node_1, full_node_2, full_node_3 = three_nodes
+    server_1 = full_node_1.full_node.server
+    server_2 = full_node_2.full_node.server
+    server_3 = full_node_3.full_node.server
+    full_node_3.full_node.weight_proof_handler = None
+    for block in blocks_750:
+        await full_node_1.full_node.add_block(block)
+    # Node 3 syncs from a different blockchain
+
+    for block in default_1500_blocks[:1100]:
+        await full_node_3.full_node.add_block(block)
+
+    await server_2.start_client(PeerInfo(self_hostname, server_1.get_port()), full_node_2.full_node.on_connect)
+
+    # The second node should eventually catch up to the first one, and have the
+    # same tip at height num_blocks - 1
+    await time_out_assert(180, node_height_exactly, True, full_node_2, num_blocks_initial - 1)
+    # set new heavy peak, fn3 cannot serve wp's
+    # node 2 should keep being synced and receive blocks
+    await server_3.start_client(PeerInfo(self_hostname, server_3.get_port()), full_node_3.full_node.on_connect)
+    # trigger long sync in full node 2
+    peak_block = default_1500_blocks[1050]
+    await server_2.start_client(PeerInfo(self_hostname, server_3.get_port()), full_node_2.full_node.on_connect)
+    con = server_2.all_connections[full_node_3.full_node.server.node_id]
+    peak = full_node_protocol.NewPeak(
+        peak_block.header_hash,
+        peak_block.height,
+        peak_block.weight,
+        peak_block.height,
+        peak_block.reward_chain_block.get_unfinished().get_hash(),
+    )
+    await full_node_2.full_node.new_peak(peak, con)
+    await asyncio.sleep(2)
+    assert not full_node_2.full_node.sync_store.get_sync_mode()
+    for block in default_1000_blocks[1000 - num_blocks_initial :]:
+        await full_node_2.full_node.add_block(block)
+
+    assert node_height_exactly(full_node_2, uint32(999))
+
+
+@pytest.mark.anyio
+async def test_block_ses_mismatch(
+    two_nodes: tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools],
+    default_1000_blocks: list[FullBlock],
+    self_hostname: str,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    full_node_1, full_node_2, server_1, server_2, _ = two_nodes
+    blocks = default_1000_blocks
+
+    # mock for full node _sync
+    async def async_mock() -> None:
+        log.info("do nothing")
+
+    with monkeypatch.context() as monkeypatch_context:
+        monkeypatch_context.setattr(full_node_2.full_node, "_sync", async_mock)
+        # load blocks into node 1
+        for block in blocks[:501]:
             await full_node_1.full_node.add_block(block)
 
-        await server_2.start_client(
-            PeerInfo(self_hostname, server_1.get_port()), on_connect=full_node_2.full_node.on_connect
-        )
-
-        timeout_seconds = 250
-
-        # The second node should eventually catch up to the first one
-        await time_out_assert(
-            timeout_seconds, node_height_exactly, True, full_node_2, bt.constants.WEIGHT_PROOF_RECENT_BLOCKS - 5 - 1
-        )
-
-        for block in blocks[bt.constants.WEIGHT_PROOF_RECENT_BLOCKS - 5 : bt.constants.WEIGHT_PROOF_RECENT_BLOCKS + 5]:
-            await full_node_1.full_node.add_block(block)
-
-        await server_3.start_client(
-            PeerInfo(self_hostname, server_1.get_port()), on_connect=full_node_3.full_node.on_connect
-        )
-
-        # Node 3 and Node 2 sync up to node 1
-        await time_out_assert(
-            timeout_seconds, node_height_exactly, True, full_node_2, bt.constants.WEIGHT_PROOF_RECENT_BLOCKS + 5 - 1
-        )
-        await time_out_assert(
-            timeout_seconds, node_height_exactly, True, full_node_3, bt.constants.WEIGHT_PROOF_RECENT_BLOCKS + 5 - 1
-        )
-
-        cons = list(server_1.all_connections.values())[:]
-        for con in cons:
-            await con.close()
-        for block in blocks[bt.constants.WEIGHT_PROOF_RECENT_BLOCKS + 5 :]:
-            await full_node_1.full_node.add_block(block)
-
-        await server_2.start_client(
-            PeerInfo(self_hostname, server_1.get_port()), on_connect=full_node_2.full_node.on_connect
-        )
-        await server_3.start_client(
-            PeerInfo(self_hostname, server_1.get_port()), on_connect=full_node_3.full_node.on_connect
-        )
-        await server_4.start_client(
-            PeerInfo(self_hostname, server_1.get_port()), on_connect=full_node_4.full_node.on_connect
-        )
-        await server_3.start_client(
-            PeerInfo(self_hostname, server_2.get_port()), on_connect=full_node_3.full_node.on_connect
-        )
-        await server_4.start_client(
-            PeerInfo(self_hostname, server_3.get_port()), on_connect=full_node_4.full_node.on_connect
-        )
-        await server_4.start_client(
-            PeerInfo(self_hostname, server_2.get_port()), on_connect=full_node_4.full_node.on_connect
-        )
-
-        # All four nodes are synced
-        await time_out_assert(timeout_seconds, node_height_exactly, True, full_node_1, num_blocks - 1)
-        await time_out_assert(timeout_seconds, node_height_exactly, True, full_node_2, num_blocks - 1)
-        await time_out_assert(timeout_seconds, node_height_exactly, True, full_node_3, num_blocks - 1)
-        await time_out_assert(timeout_seconds, node_height_exactly, True, full_node_4, num_blocks - 1)
-
-        # Deep reorg, fall back from batch sync to long sync
-        blocks_node_5 = bt.get_consecutive_blocks(60, block_list_input=blocks[:350], seed=b"node5")
-        for block in blocks_node_5:
-            await full_node_5.full_node.add_block(block)
-        await server_5.start_client(
-            PeerInfo(self_hostname, server_1.get_port()), on_connect=full_node_5.full_node.on_connect
-        )
-        await time_out_assert(timeout_seconds, node_height_exactly, True, full_node_5, 409)
-        await time_out_assert(timeout_seconds, node_height_exactly, True, full_node_1, 409)
-
-    @pytest.mark.anyio
-    async def test_sync_from_fork_point_and_weight_proof(
-        self, three_nodes, default_1000_blocks, default_400_blocks, self_hostname
-    ):
-        # Must be larger than "sync_block_behind_threshold" in the config
-        num_blocks_initial = len(default_1000_blocks) - 50
-        blocks_950 = default_1000_blocks[:num_blocks_initial]
-        blocks_rest = default_1000_blocks[num_blocks_initial:]
-        blocks_400 = default_400_blocks
-        full_node_1, full_node_2, full_node_3 = three_nodes
-        server_1 = full_node_1.full_node.server
-        server_2 = full_node_2.full_node.server
-        server_3 = full_node_3.full_node.server
-
-        for block in blocks_950:
-            await full_node_1.full_node.add_block(block)
-
-        # Node 2 syncs from halfway
-        for i in range(int(len(default_1000_blocks) / 2)):
-            await full_node_2.full_node.add_block(default_1000_blocks[i])
-
-        # Node 3 syncs from a different blockchain
-        for block in blocks_400:
-            await full_node_3.full_node.add_block(block)
-
-        await server_2.start_client(PeerInfo(self_hostname, server_1.get_port()), full_node_2.full_node.on_connect)
-        await server_3.start_client(PeerInfo(self_hostname, server_1.get_port()), full_node_3.full_node.on_connect)
-
-        # Also test request proof of weight
-        # Have the request header hash
-        res = await full_node_1.request_proof_of_weight(
-            full_node_protocol.RequestProofOfWeight(blocks_950[-1].height + 1, blocks_950[-1].header_hash)
-        )
-        assert res is not None
-        validated, _, _ = await full_node_1.full_node.weight_proof_handler.validate_weight_proof(
-            full_node_protocol.RespondProofOfWeight.from_bytes(res.data).wp
-        )
-        assert validated
-
-        # Don't have the request header hash
-        res = await full_node_1.request_proof_of_weight(
-            full_node_protocol.RequestProofOfWeight(blocks_950[-1].height + 1, std_hash(b"12"))
-        )
-        assert res is None
-
-        # The second node should eventually catch up to the first one, and have the
-        # same tip at height num_blocks - 1
-        await time_out_assert(300, node_height_exactly, True, full_node_2, num_blocks_initial - 1)
-        await time_out_assert(180, node_height_exactly, True, full_node_3, num_blocks_initial - 1)
-
-        def fn3_is_not_syncing():
-            return not full_node_3.full_node.sync_store.get_sync_mode()
-
-        await time_out_assert(180, fn3_is_not_syncing)
-        cons = list(server_1.all_connections.values())[:]
-        for con in cons:
-            await con.close()
-        for block in blocks_rest:
-            await full_node_3.full_node.add_block(block)
-            assert full_node_3.full_node.blockchain.get_peak().height >= block.height
-
-        log.warning(f"FN3 height {full_node_3.full_node.blockchain.get_peak().height}")
-
-        # TODO: fix this flaky test
-        await time_out_assert(180, node_height_exactly, True, full_node_3, 999)
-
-        await server_2.start_client(PeerInfo(self_hostname, server_1.get_port()), full_node_2.full_node.on_connect)
-        await server_3.start_client(PeerInfo(self_hostname, server_1.get_port()), full_node_3.full_node.on_connect)
-        await server_3.start_client(PeerInfo(self_hostname, server_2.get_port()), full_node_3.full_node.on_connect)
-        await time_out_assert(180, node_height_exactly, True, full_node_1, 999)
-        await time_out_assert(180, node_height_exactly, True, full_node_2, 999)
-
-    @pytest.mark.anyio
-    async def test_batch_sync(self, two_nodes, self_hostname):
-        # Must be below "sync_block_behind_threshold" in the config
-        num_blocks = 20
-        num_blocks_2 = 9
-        full_node_1, full_node_2, server_1, server_2, bt = two_nodes
-        blocks = bt.get_consecutive_blocks(num_blocks)
-        blocks_2 = bt.get_consecutive_blocks(num_blocks_2, seed=b"123")
-
-        # 12 blocks to node_1
-        for block in blocks:
-            await full_node_1.full_node.add_block(block)
-
-        # 9 different blocks to node_2
-        for block in blocks_2:
-            await full_node_2.full_node.add_block(block)
-
-        await server_2.start_client(
-            PeerInfo(self_hostname, server_1.get_port()),
-            on_connect=full_node_2.full_node.on_connect,
-        )
-        await time_out_assert(60, node_height_exactly, True, full_node_2, num_blocks - 1)
-
-    @pytest.mark.anyio
-    async def test_backtrack_sync_1(self, two_nodes, self_hostname):
-        full_node_1, full_node_2, server_1, server_2, bt = two_nodes
-        blocks = bt.get_consecutive_blocks(1, skip_slots=1)
-        blocks = bt.get_consecutive_blocks(1, blocks, skip_slots=0)
-        blocks = bt.get_consecutive_blocks(1, blocks, skip_slots=0)
-
-        # 3 blocks to node_1 in different sub slots
-        for block in blocks:
-            await full_node_1.full_node.add_block(block)
+        peak1 = full_node_1.full_node.blockchain.get_peak()
+        assert peak1 is not None
 
-        await server_2.start_client(
-            PeerInfo(self_hostname, server_1.get_port()),
-            on_connect=full_node_2.full_node.on_connect,
-        )
-        await time_out_assert(60, node_height_exactly, True, full_node_2, 2)
-
-    @pytest.mark.anyio
-    async def test_backtrack_sync_2(self, two_nodes, self_hostname):
-        full_node_1, full_node_2, server_1, server_2, bt = two_nodes
-        blocks = bt.get_consecutive_blocks(1, skip_slots=3)
-        blocks = bt.get_consecutive_blocks(8, blocks, skip_slots=0)
-
-        # 3 blocks to node_1 in different sub slots
-        for block in blocks:
-            await full_node_1.full_node.add_block(block)
-
-        await server_2.start_client(
-            PeerInfo(self_hostname, server_1.get_port()),
-            on_connect=full_node_2.full_node.on_connect,
-        )
-        await time_out_assert(60, node_height_exactly, True, full_node_2, 8)
-
-    @pytest.mark.anyio
-    async def test_close_height_but_big_reorg(self, three_nodes, bt, self_hostname):
-        blocks_a = bt.get_consecutive_blocks(50)
-        blocks_b = bt.get_consecutive_blocks(51, seed=b"B")
-        blocks_c = bt.get_consecutive_blocks(90, seed=b"C")
-        full_node_1, full_node_2, full_node_3 = three_nodes
-        server_1 = full_node_1.full_node.server
-        server_2 = full_node_2.full_node.server
-        server_3 = full_node_3.full_node.server
-
-        for block in blocks_a:
-            await full_node_1.full_node.add_block(block)
-        for block in blocks_b:
-            await full_node_2.full_node.add_block(block)
-        for block in blocks_c:
-            await full_node_3.full_node.add_block(block)
-
-        await server_2.start_client(
-            PeerInfo(self_hostname, server_1.get_port()),
-            on_connect=full_node_2.full_node.on_connect,
-        )
-        await time_out_assert(80, node_height_exactly, True, full_node_1, 50)
-        await time_out_assert(80, node_height_exactly, True, full_node_2, 50)
-        await time_out_assert(80, node_height_exactly, True, full_node_3, 89)
+        summary_heights = full_node_1.full_node.blockchain.get_ses_heights()
+        summaries: list[SubEpochSummary] = []
 
-        await server_3.start_client(
-            PeerInfo(self_hostname, server_1.get_port()),
-            on_connect=full_node_3.full_node.on_connect,
-        )
+        # get ses list
+        for sub_epoch_n, ses_height in enumerate(summary_heights):
+            summaries.append(full_node_1.full_node.blockchain.get_ses(ses_height))
 
-        await server_3.start_client(
-            PeerInfo(self_hostname, server_2.get_port()),
-            on_connect=full_node_3.full_node.on_connect,
-        )
-        await time_out_assert(80, node_height_exactly, True, full_node_1, 89)
-        await time_out_assert(80, node_height_exactly, True, full_node_2, 89)
-        await time_out_assert(80, node_height_exactly, True, full_node_3, 89)
-
-    @pytest.mark.anyio
-    async def test_sync_bad_peak_while_synced(
-        self, three_nodes, default_1000_blocks, default_1500_blocks, self_hostname
-    ):
-        # Must be larger than "sync_block_behind_threshold" in the config
-        num_blocks_initial = len(default_1000_blocks) - 250
-        blocks_750 = default_1000_blocks[:num_blocks_initial]
-        full_node_1, full_node_2, full_node_3 = three_nodes
-        server_1 = full_node_1.full_node.server
-        server_2 = full_node_2.full_node.server
-        server_3 = full_node_3.full_node.server
-        full_node_3.full_node.weight_proof_handler = None
-        for block in blocks_750:
-            await full_node_1.full_node.add_block(block)
-        # Node 3 syncs from a different blockchain
-
-        for block in default_1500_blocks[:1100]:
-            await full_node_3.full_node.add_block(block)
-
-        await server_2.start_client(PeerInfo(self_hostname, server_1.get_port()), full_node_2.full_node.on_connect)
-
-        # The second node should eventually catch up to the first one, and have the
-        # same tip at height num_blocks - 1
-        await time_out_assert(180, node_height_exactly, True, full_node_2, num_blocks_initial - 1)
-        # set new heavy peak, fn3 cannot serve wp's
-        # node 2 should keep being synced and receive blocks
-        await server_3.start_client(PeerInfo(self_hostname, server_3.get_port()), full_node_3.full_node.on_connect)
-        # trigger long sync in full node 2
-        peak_block = default_1500_blocks[1050]
-        await server_2.start_client(PeerInfo(self_hostname, server_3.get_port()), full_node_2.full_node.on_connect)
-        con = server_2.all_connections[full_node_3.full_node.server.node_id]
-        peak = full_node_protocol.NewPeak(
-            peak_block.header_hash,
-            peak_block.height,
-            peak_block.weight,
-            peak_block.height,
-            peak_block.reward_chain_block.get_unfinished().get_hash(),
+        # change summary so check would fail on sub epoch 1
+        s = summaries[1]
+        summaries[1] = SubEpochSummary(
+            s.prev_subepoch_summary_hash,
+            s.reward_chain_hash,
+            s.num_blocks_overflow,
+            uint64(s.new_difficulty * 2) if s.new_difficulty is not None else None,
+            uint64(s.new_sub_slot_iters * 2) if s.new_sub_slot_iters is not None else None,
         )
-        await full_node_2.full_node.new_peak(peak, con)
-        await asyncio.sleep(2)
-        assert not full_node_2.full_node.sync_store.get_sync_mode()
-        for block in default_1000_blocks[1000 - num_blocks_initial :]:
-            await full_node_2.full_node.add_block(block)
-
-        assert node_height_exactly(full_node_2, 999)
-
-    @pytest.mark.anyio
-    async def test_block_ses_mismatch(self, two_nodes, default_1000_blocks, self_hostname, monkeypatch):
-        full_node_1, full_node_2, server_1, server_2, _ = two_nodes
-        blocks = default_1000_blocks
-
-        # mock for full node _sync
-        async def async_mock():
-            log.info("do nothing")
-
-        with monkeypatch.context() as monkeypatch_context:
-            monkeypatch_context.setattr(full_node_2.full_node, "_sync", async_mock)
-            # load blocks into node 1
-            for block in blocks[:501]:
-                await full_node_1.full_node.add_block(block)
-
-            peak1 = full_node_1.full_node.blockchain.get_peak()
-            assert peak1 is not None
-
-            summary_heights = full_node_1.full_node.blockchain.get_ses_heights()
-            summaries: list[SubEpochSummary] = []
-
-            # get ses list
-            for sub_epoch_n, ses_height in enumerate(summary_heights):
-                summaries.append(full_node_1.full_node.blockchain.get_ses(ses_height))
-
-            # change summary so check would fail on sub epoch 1
-            s = summaries[1]
-            summaries[1] = SubEpochSummary(
-                s.prev_subepoch_summary_hash,
-                s.reward_chain_hash,
-                s.num_blocks_overflow,
-                s.new_difficulty * 2,
-                s.new_sub_slot_iters * 2,
-            )
-            # manually try sync with wrong sub epoch summary list
-            await server_2.start_client(PeerInfo(self_hostname, server_1.get_port()), None)
-
-            # call peer has block to populate peer_to_peak
-            full_node_2.full_node.sync_store.peer_has_block(
-                peak1.header_hash, full_node_1.full_node.server.node_id, peak1.weight, peak1.height, True
-            )
-            # sync using bad ses list
-            await full_node_2.full_node.sync_from_fork_point(0, peak1.height, peak1.header_hash, summaries)
-            # assert we failed somewhere between sub epoch 0 to sub epoch 1
-            assert node_height_between(full_node_2, summary_heights[0], summary_heights[1])
-
-    @pytest.mark.anyio
-    @pytest.mark.skip("skipping until we re-enable the capability in chia.protocols.shared_protocol")
-    async def test_sync_none_wp_response_backward_comp(self, three_nodes, default_1000_blocks, self_hostname):
-        num_blocks_initial = len(default_1000_blocks) - 50
-        blocks_950 = default_1000_blocks[:num_blocks_initial]
-        full_node_1, full_node_2, full_node_3 = three_nodes
-        server_1 = full_node_1.full_node.server
-        server_2 = full_node_2.full_node.server
-        server_3 = full_node_3.full_node.server
-        server_3.set_capabilities(
-            [
-                (uint16(Capability.BASE.value), "1"),
-                (uint16(Capability.BLOCK_HEADERS.value), "1"),
-                (uint16(Capability.RATE_LIMITS_V2.value), "1"),
-            ]
-        )
-
-        for block in blocks_950:
-            await full_node_1.full_node.add_block(block)
-
-        await server_2.start_client(PeerInfo(self_hostname, server_1.get_port()), full_node_2.full_node.on_connect)
-        await server_3.start_client(PeerInfo(self_hostname, server_1.get_port()), full_node_3.full_node.on_connect)
+        # manually try sync with wrong sub epoch summary list
+        await server_2.start_client(PeerInfo(self_hostname, server_1.get_port()), None)
 
-        peers: list = [c for c in full_node_2.full_node.server.all_connections.values()]
-        request = full_node_protocol.RequestProofOfWeight(
-            blocks_950[-1].height + 1, default_1000_blocks[-1].header_hash
+        # call peer has block to populate peer_to_peak
+        full_node_2.full_node.sync_store.peer_has_block(
+            peak1.header_hash, full_node_1.full_node.server.node_id, peak1.weight, peak1.height, True
         )
-        start = time.time()
-        res = await peers[0].call_api(FullNodeAPI.request_proof_of_weight, request, timeout=5)
-        assert res is None
-        duration = time.time() - start
-        log.info(f"result was {res}")
-        assert duration < 1
-
-        peers: list = [c for c in full_node_3.full_node.server.all_connections.values()]
-        request = full_node_protocol.RequestProofOfWeight(
-            blocks_950[-1].height + 1, default_1000_blocks[-1].header_hash
+        # sync using bad ses list
+        await full_node_2.full_node.sync_from_fork_point(uint32(0), peak1.height, peak1.header_hash, summaries)
+        # assert we failed somewhere between sub epoch 0 to sub epoch 1
+        assert node_height_between(full_node_2, summary_heights[0], summary_heights[1])
+
+
+@pytest.mark.anyio
+@pytest.mark.skip("skipping until we re-enable the capability in chia.protocols.shared_protocol")
+async def test_sync_none_wp_response_backward_comp(
+    three_nodes: list[FullNodeAPI], default_1000_blocks: list[FullBlock], self_hostname: str
+) -> None:
+    num_blocks_initial = len(default_1000_blocks) - 50
+    blocks_950 = default_1000_blocks[:num_blocks_initial]
+    full_node_1, full_node_2, full_node_3 = three_nodes
+    server_1 = full_node_1.full_node.server
+    server_2 = full_node_2.full_node.server
+    server_3 = full_node_3.full_node.server
+    server_3.set_capabilities(
+        [
+            (uint16(Capability.BASE.value), "1"),
+            (uint16(Capability.BLOCK_HEADERS.value), "1"),
+            (uint16(Capability.RATE_LIMITS_V2.value), "1"),
+        ]
+    )
+
+    for block in blocks_950:
+        await full_node_1.full_node.add_block(block)
+
+    await server_2.start_client(PeerInfo(self_hostname, server_1.get_port()), full_node_2.full_node.on_connect)
+    await server_3.start_client(PeerInfo(self_hostname, server_1.get_port()), full_node_3.full_node.on_connect)
+
+    peers = [c for c in full_node_2.full_node.server.all_connections.values()]
+    request = full_node_protocol.RequestProofOfWeight(
+        uint32(blocks_950[-1].height + 1), default_1000_blocks[-1].header_hash
+    )
+    start = time.time()
+    res = await peers[0].call_api(FullNodeAPI.request_proof_of_weight, request, timeout=5)
+    assert res is None
+    duration = time.time() - start
+    log.info(f"result was {res}")
+    assert duration < 1
+
+    peers = [c for c in full_node_3.full_node.server.all_connections.values()]
+    request = full_node_protocol.RequestProofOfWeight(
+        uint32(blocks_950[-1].height + 1), default_1000_blocks[-1].header_hash
+    )
+    start = time.time()
+    res = await peers[0].call_api(FullNodeAPI.request_proof_of_weight, request, timeout=6)
+    assert res is None
+    duration = time.time() - start
+    assert duration > 5
+
+
+@pytest.mark.anyio
+async def test_bad_peak_cache_invalidation(
+    two_nodes: tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools],
+    default_1000_blocks: list[FullBlock],
+    blockchain_constants: ConsensusConstants,
+    consensus_mode: ConsensusMode,
+) -> None:
+    full_node_1, _full_node_2, _server_1, _server_2, bt = two_nodes
+
+    for block in default_1000_blocks[:-500]:
+        await full_node_1.full_node.add_block(block)
+
+    cache_size = full_node_1.full_node.config.get("bad_peak_cache_size")
+    assert cache_size is not None
+    for x in range(cache_size + 10):
+        blocks = bt.get_consecutive_blocks(
+            num_blocks=1, block_list_input=default_1000_blocks[:-500], seed=x.to_bytes(2, "big")
         )
-        start = time.time()
-        res = await peers[0].call_api(FullNodeAPI.request_proof_of_weight, request, timeout=6)
-        assert res is None
-        duration = time.time() - start
-        assert duration > 5
-
-    @pytest.mark.anyio
-    async def test_bad_peak_cache_invalidation(
-        self, two_nodes, default_1000_blocks, blockchain_constants, consensus_mode
-    ):
-        full_node_1, _full_node_2, _server_1, _server_2, bt = two_nodes
-
-        for block in default_1000_blocks[:-500]:
-            await full_node_1.full_node.add_block(block)
+        block = blocks[-1]
+        full_node_1.full_node.add_to_bad_peak_cache(block.header_hash, block.height)
 
-        cache_size = full_node_1.full_node.config.get("bad_peak_cache_size")
-        for x in range(cache_size + 10):
-            blocks = bt.get_consecutive_blocks(
-                num_blocks=1, block_list_input=default_1000_blocks[:-500], seed=x.to_bytes(2, "big")
-            )
-            block = blocks[-1]
-            full_node_1.full_node.add_to_bad_peak_cache(block.header_hash, block.height)
+    assert len(full_node_1.full_node.bad_peak_cache) == cache_size
 
-        assert len(full_node_1.full_node.bad_peak_cache) == cache_size
+    for block in default_1000_blocks[500:]:
+        await full_node_1.full_node.add_block(block)
 
-        for block in default_1000_blocks[500:]:
-            await full_node_1.full_node.add_block(block)
-
-        blocks = bt.get_consecutive_blocks(num_blocks=1, block_list_input=default_1000_blocks[:-1])
-        block = blocks[-1]
-        full_node_1.full_node.add_to_bad_peak_cache(block.header_hash, block.height)
-        assert len(full_node_1.full_node.bad_peak_cache) == 1
+    blocks = bt.get_consecutive_blocks(num_blocks=1, block_list_input=default_1000_blocks[:-1])
+    block = blocks[-1]
+    full_node_1.full_node.add_to_bad_peak_cache(block.header_hash, block.height)
+    assert len(full_node_1.full_node.bad_peak_cache) == 1