Revert "Move GeneratorBlockInfo."

This reverts commit f077801.

Author: richardkiss

chia/_tests/core/full_node/stores/test_block_store.py

@@ -22,9 +22,9 @@
 from chia.consensus.blockchain import AddBlockResult, Blockchain
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.consensus.full_block_to_block_record import header_block_to_sub_block_record
-from chia.consensus.generator_block_info import GeneratorBlockInfo
 from chia.full_node.block_store import BlockStore
 from chia.full_node.coin_store import CoinStore
+from chia.full_node.full_block_utils import GeneratorBlockInfo
 from chia.simulator.block_tools import BlockTools
 from chia.simulator.wallet_tools import WalletTool
 from chia.types.blockchain_format.serialized_program import SerializedProgram

chia/consensus/generator_block_info.py

@@ -12,8 +12,7 @@
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint32
 
-from chia.consensus.generator_block_info import GeneratorBlockInfo
-from chia.full_node.full_block_utils import block_info_from_block, generator_from_block
+from chia.full_node.full_block_utils import GeneratorBlockInfo, block_info_from_block, generator_from_block
 from chia.util.batches import to_batches
 from chia.util.db_wrapper import DBWrapper2, execute_fetchone
 from chia.util.errors import Err

chia/full_node/block_store.py

@@ -1,13 +1,13 @@
 from __future__ import annotations
 
+from dataclasses import dataclass
 from typing import Callable, Optional
 
 from chia_rs import G1Element, G2Element, TransactionsInfo, serialized_length
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint32
 from chiabip158 import PyBIP158
 
-from chia.consensus.generator_block_info import GeneratorBlockInfo
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.serialized_program import SerializedProgram
 
@@ -224,6 +224,14 @@ def generator_from_block(buf: memoryview) -> Optional[bytes]:
     return bytes(buf[:length])
 
 
+# this implements the BlockInfo protocol
+@dataclass(frozen=True)
+class GeneratorBlockInfo:
+    prev_header_hash: bytes32
+    transactions_generator: Optional[SerializedProgram]
+    transactions_generator_ref_list: list[uint32]
+
+
 def block_info_from_block(buf: memoryview) -> GeneratorBlockInfo:
     buf = skip_list(buf, skip_end_of_sub_slot_bundle)  # finished_sub_slots
     buf = skip_reward_chain_block(buf)  # reward_chain_block