simplify

Author: richardkiss

benchmarks/block_ref.py

@@ -71,7 +71,7 @@ async def main(db_path: Path) -> None:
         # make configurable
         reserved_cores = 4
         height_map = await BlockHeightMap.create(db_path.parent, db_wrapper)
-        consensus_store = await ConsensusStoreSQLite3.create(block_store, coin_store, height_map)
+        consensus_store = ConsensusStoreSQLite3(block_store, coin_store, height_map)
         blockchain = await Blockchain.create(consensus_store, DEFAULT_CONSTANTS, reserved_cores)
 
         peak = blockchain.get_peak()

chia/_tests/core/full_node/ram_db.py

@@ -21,10 +21,7 @@ async def create_ram_blockchain(
 ) -> AsyncIterator[tuple[DBWrapper2, Blockchain]]:
     uri = f"file:db_{random.randint(0, 99999999)}?mode=memory&cache=shared"
     async with DBWrapper2.managed(database=uri, uri=True, reader_count=1, db_version=2) as db_wrapper:
-        block_store = await BlockStore.create(db_wrapper)
-        coin_store = await CoinStore.create(db_wrapper)
-        height_map = await BlockHeightMap.create(Path("."), db_wrapper)
-        consensus_store = await ConsensusStoreSQLite3.create(block_store, coin_store, height_map)
+        consensus_store = await ConsensusStoreSQLite3.create(db_wrapper, Path("."))
         blockchain = await Blockchain.create(consensus_store, consensus_constants, 2)
         try:
             yield db_wrapper, blockchain

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

@@ -75,7 +75,7 @@ async def test_block_store(tmp_dir: Path, db_version: int, bt: BlockTools, use_c
         coin_store_2 = await CoinStore.create(db_wrapper_2)
         store_2 = await BlockStore.create(db_wrapper_2, use_cache=use_cache)
         height_map = await BlockHeightMap.create(tmp_dir, db_wrapper_2)
-        consensus_store = await ConsensusStoreSQLite3.create(store_2, coin_store_2, height_map)
+        consensus_store = ConsensusStoreSQLite3(store_2, coin_store_2, height_map)
         bc = await Blockchain.create(consensus_store, bt.constants, 2)
 
         store = await BlockStore.create(db_wrapper, use_cache=use_cache)
@@ -149,10 +149,8 @@ async def test_get_full_blocks_at(
 
     async with DBConnection(2) as db_wrapper:
         # Use a different file for the blockchain
-        coin_store = await CoinStore.create(db_wrapper)
-        block_store = await BlockStore.create(db_wrapper, use_cache=use_cache)
-        height_map = await BlockHeightMap.create(tmp_dir, db_wrapper)
-        consensus_store = await ConsensusStoreSQLite3.create(block_store, coin_store, height_map)
+        consensus_store = await ConsensusStoreSQLite3.create(db_wrapper, tmp_dir, use_cache=use_cache)
+        block_store = consensus_store.block_store
         bc = await Blockchain.create(consensus_store, bt.constants, 2)
 
         count = 0
@@ -178,10 +176,8 @@ async def test_get_block_records_in_range(
 
     async with DBConnection(2) as db_wrapper:
         # Use a different file for the blockchain
-        coin_store = await CoinStore.create(db_wrapper)
-        block_store = await BlockStore.create(db_wrapper, use_cache=use_cache)
-        height_map = await BlockHeightMap.create(tmp_dir, db_wrapper)
-        consensus_store = await ConsensusStoreSQLite3.create(block_store, coin_store, height_map)
+        consensus_store = await ConsensusStoreSQLite3.create(db_wrapper, tmp_dir, use_cache=use_cache)
+        block_store = consensus_store.block_store
         bc = await Blockchain.create(consensus_store, bt.constants, 2)
 
         count = 0
@@ -209,10 +205,8 @@ async def test_get_block_bytes_in_range_in_main_chain(
 
     async with DBConnection(2) as db_wrapper:
         # Use a different file for the blockchain
-        coin_store = await CoinStore.create(db_wrapper)
-        block_store = await BlockStore.create(db_wrapper, use_cache=use_cache)
-        height_map = await BlockHeightMap.create(tmp_dir, db_wrapper)
-        consensus_store = await ConsensusStoreSQLite3.create(block_store, coin_store, height_map)
+        consensus_store = await ConsensusStoreSQLite3.create(db_wrapper, tmp_dir, use_cache=use_cache)
+        block_store = consensus_store.block_store
         bc = await Blockchain.create(consensus_store, bt.constants, 2)
         count = 0
         fork_info = ForkInfo(-1, -1, bt.constants.GENESIS_CHALLENGE)
@@ -242,7 +236,7 @@ async def test_deadlock(tmp_dir: Path, db_version: int, bt: BlockTools, use_cach
         coin_store_2 = await CoinStore.create(wrapper_2)
         store_2 = await BlockStore.create(wrapper_2)
         height_map = await BlockHeightMap.create(tmp_dir, wrapper_2)
-        consensus_store = await ConsensusStoreSQLite3.create(store_2, coin_store_2, height_map)
+        consensus_store = ConsensusStoreSQLite3(store_2, coin_store_2, height_map)
         bc = await Blockchain.create(consensus_store, bt.constants, 2)
         block_records = []
         for block in blocks:
@@ -271,10 +265,8 @@ async def test_rollback(bt: BlockTools, tmp_dir: Path, use_cache: bool, default_
 
     async with DBConnection(2) as db_wrapper:
         # Use a different file for the blockchain
-        coin_store = await CoinStore.create(db_wrapper)
-        block_store = await BlockStore.create(db_wrapper, use_cache=use_cache)
-        height_map = await BlockHeightMap.create(tmp_dir, db_wrapper)
-        consensus_store = await ConsensusStoreSQLite3.create(block_store, coin_store, height_map)
+        consensus_store = await ConsensusStoreSQLite3.create(db_wrapper, tmp_dir, use_cache=use_cache)
+        block_store = consensus_store.block_store
         bc = await Blockchain.create(consensus_store, bt.constants, 2)
 
         # insert all blocks
@@ -338,7 +330,7 @@ async def test_count_compactified_blocks(bt: BlockTools, tmp_dir: Path, db_versi
         coin_store = await CoinStore.create(db_wrapper)
         block_store = await BlockStore.create(db_wrapper, use_cache=use_cache)
         height_map = await BlockHeightMap.create(tmp_dir, db_wrapper)
-        consensus_store = await ConsensusStoreSQLite3.create(block_store, coin_store, height_map)
+        consensus_store = ConsensusStoreSQLite3(block_store, coin_store, height_map)
         bc = await Blockchain.create(consensus_store, bt.constants, 2)
 
         count = await block_store.count_compactified_blocks()
@@ -360,7 +352,7 @@ async def test_count_uncompactified_blocks(bt: BlockTools, tmp_dir: Path, db_ver
         coin_store = await CoinStore.create(db_wrapper)
         block_store = await BlockStore.create(db_wrapper, use_cache=use_cache)
         height_map = await BlockHeightMap.create(tmp_dir, db_wrapper)
-        consensus_store = await ConsensusStoreSQLite3.create(block_store, coin_store, height_map)
+        consensus_store = ConsensusStoreSQLite3(block_store, coin_store, height_map)
         bc = await Blockchain.create(consensus_store, bt.constants, 2)
 
         count = await block_store.count_uncompactified_blocks()
@@ -389,7 +381,7 @@ def rand_vdf_proof() -> VDFProof:
         coin_store = await CoinStore.create(db_wrapper)
         block_store = await BlockStore.create(db_wrapper, use_cache=use_cache)
         height_map = await BlockHeightMap.create(tmp_dir, db_wrapper)
-        consensus_store = await ConsensusStoreSQLite3.create(block_store, coin_store, height_map)
+        consensus_store = ConsensusStoreSQLite3(block_store, coin_store, height_map)
         bc = await Blockchain.create(consensus_store, bt.constants, 2)
         for block in blocks:
             await _validate_and_add_block(bc, block)
@@ -471,7 +463,7 @@ async def test_get_blocks_by_hash(tmp_dir: Path, bt: BlockTools, db_version: int
         coin_store_2 = await CoinStore.create(db_wrapper_2)
         store_2 = await BlockStore.create(db_wrapper_2, use_cache=use_cache)
         height_map = await BlockHeightMap.create(tmp_dir, db_wrapper_2)
-        consensus_store = await ConsensusStoreSQLite3.create(store_2, coin_store_2, height_map)
+        consensus_store = ConsensusStoreSQLite3(store_2, coin_store_2, height_map)
         bc = await Blockchain.create(consensus_store, bt.constants, 2)
 
         store = await BlockStore.create(db_wrapper, use_cache=use_cache)
@@ -512,7 +504,7 @@ async def test_get_block_bytes_in_range(tmp_dir: Path, bt: BlockTools, db_versio
         coin_store_2 = await CoinStore.create(db_wrapper_2)
         store_2 = await BlockStore.create(db_wrapper_2, use_cache=use_cache)
         height_map = await BlockHeightMap.create(tmp_dir, db_wrapper_2)
-        consensus_store = await ConsensusStoreSQLite3.create(store_2, coin_store_2, height_map)
+        consensus_store = ConsensusStoreSQLite3(store_2, coin_store_2, height_map)
         bc = await Blockchain.create(consensus_store, bt.constants, 2)
 
         await BlockStore.create(db_wrapper_2)
@@ -586,7 +578,7 @@ async def test_get_prev_hash(tmp_dir: Path, bt: BlockTools, db_version: int, use
         coin_store_2 = await CoinStore.create(db_wrapper_2)
         store_2 = await BlockStore.create(db_wrapper_2, use_cache=use_cache)
         height_map = await BlockHeightMap.create(tmp_dir, db_wrapper_2)
-        consensus_store = await ConsensusStoreSQLite3.create(store_2, coin_store_2, height_map)
+        consensus_store = ConsensusStoreSQLite3(store_2, coin_store_2, height_map)
         bc = await Blockchain.create(consensus_store, bt.constants, 2)
 
         store = await BlockStore.create(db_wrapper, use_cache=use_cache)

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

@@ -319,7 +319,7 @@ async def test_basic_reorg(tmp_dir: Path, db_version: int, bt: BlockTools) -> No
         coin_store = await CoinStore.create(db_wrapper)
         store = await BlockStore.create(db_wrapper)
         height_map = await BlockHeightMap.create(tmp_dir, db_wrapper)
-        consensus_store = await ConsensusStoreSQLite3.create(store, coin_store, height_map)
+        consensus_store = ConsensusStoreSQLite3(store, coin_store, height_map)
         b: Blockchain = await Blockchain.create(consensus_store, bt.constants, 2)
         try:
             records: list[Optional[CoinRecord]] = []
@@ -387,7 +387,7 @@ async def test_get_puzzle_hash(tmp_dir: Path, db_version: int, bt: BlockTools) -
         coin_store = await CoinStore.create(db_wrapper)
         store = await BlockStore.create(db_wrapper)
         height_map = await BlockHeightMap.create(tmp_dir, db_wrapper)
-        consensus_store = await ConsensusStoreSQLite3.create(store, coin_store, height_map)
+        consensus_store = ConsensusStoreSQLite3(store, coin_store, height_map)
         b: Blockchain = await Blockchain.create(consensus_store, bt.constants, 2)
         for block in blocks:
             await _validate_and_add_block(b, block)

chia/_tests/core/test_db_conversion.py

@@ -63,7 +63,7 @@ async def test_blocks(default_1000_blocks, with_hints: bool):
                     await hint_store1.add_hints([(h[0], h[1])])
 
             height_map = await BlockHeightMap.create(Path("."), db_wrapper1)
-            consensus_store = await ConsensusStoreSQLite3.create(block_store1, coin_store1, height_map)
+            consensus_store = ConsensusStoreSQLite3(block_store1, coin_store1, height_map)
             bc = await Blockchain.create(consensus_store, test_constants, reserved_cores=0)
             sub_slot_iters = test_constants.SUB_SLOT_ITERS_STARTING
             for block in blocks:

chia/_tests/core/test_db_validation.py

@@ -142,7 +142,7 @@ async def make_db(db_file: Path, blocks: list[FullBlock]) -> None:
         block_store = await BlockStore.create(db_wrapper)
         coin_store = await CoinStore.create(db_wrapper)
         height_map = await BlockHeightMap.create(Path("."), db_wrapper)
-        consensus_store = await ConsensusStoreSQLite3.create(block_store, coin_store, height_map)
+        consensus_store = ConsensusStoreSQLite3(block_store, coin_store, height_map)
         bc = await Blockchain.create(consensus_store, test_constants, reserved_cores=0)
         sub_slot_iters = test_constants.SUB_SLOT_ITERS_STARTING
         for block in blocks:

chia/_tests/util/blockchain.py

@@ -26,10 +26,7 @@ async def create_blockchain(
 ) -> AsyncIterator[tuple[Blockchain, DBWrapper2]]:
     db_uri = generate_in_memory_db_uri()
     async with DBWrapper2.managed(database=db_uri, uri=True, reader_count=1, db_version=db_version) as wrapper:
-        block_store = await BlockStore.create(wrapper)
-        coin_store = await CoinStore.create(wrapper)
-        height_map = await BlockHeightMap.create(Path("."), wrapper, None)
-        consensus_store = await ConsensusStoreSQLite3.create(block_store, coin_store, height_map)
+        consensus_store = await ConsensusStoreSQLite3.create(wrapper, Path("."))
         bc1 = await Blockchain.create(consensus_store, constants, 3, single_threaded=True, log_coins=True)
         try:
             assert bc1.get_peak() is None

chia/full_node/consensus_store_sqlite3.py

@@ -3,6 +3,7 @@
 import dataclasses
 from collections.abc import AsyncIterator, Collection
 from contextlib import AbstractAsyncContextManager
+from pathlib import Path
 from types import TracebackType
 from typing import TYPE_CHECKING, Any, Optional
 
@@ -15,6 +16,7 @@
 from chia.full_node.coin_store import CoinStore
 from chia.types.blockchain_format.coin import Coin
 from chia.types.coin_record import CoinRecord
+from chia.util.db_wrapper import DBWrapper2
 
 
 class ConsensusStoreSQLite3Writer:
@@ -71,15 +73,25 @@ class ConsensusStoreSQLite3:
     @classmethod
     async def create(
         cls,
-        block_store: BlockStore,
-        coin_store: CoinStore,
-        height_map: BlockHeightMap,
+        db_wrapper: DBWrapper2,
+        blockchain_dir: Path,
+        *,
+        use_cache: bool = True,
+        selected_network: Optional[str] = None,
     ) -> ConsensusStoreSQLite3:
-        """Create a new ConsensusStore instance from existing sub-stores.
+        """Create a new ConsensusStore instance, creating all underlying sub-stores internally.
 
-        This factory does not create sub-stores. Construct BlockStore, CoinStore,
-        and BlockHeightMap separately and pass them in here.
+        Args:
+            db_wrapper: Database wrapper to use for all stores
+            blockchain_dir: Directory path for blockchain data (used by BlockHeightMap)
+            use_cache: Whether to enable caching in BlockStore (default: True)
+            selected_network: Network selection for BlockHeightMap (default: None)
         """
+        # Create underlying stores
+        block_store = await BlockStore.create(db_wrapper, use_cache=use_cache)
+        coin_store = await CoinStore.create(db_wrapper)
+        height_map = await BlockHeightMap.create(blockchain_dir, db_wrapper, selected_network)
+
         return cls(
             block_store=block_store,
             coin_store=coin_store,

chia/full_node/full_node.py

@@ -267,7 +267,7 @@ async def manage(self) -> AsyncIterator[None]:
             self.multiprocessing_context = multiprocessing.get_context(method=multiprocessing_start_method)
             selected_network = self.config.get("selected_network")
             height_map = await BlockHeightMap.create(self.db_path.parent, self.db_wrapper, selected_network)
-            consensus_store = await ConsensusStoreSQLite3.create(self.block_store, self.coin_store, height_map)
+            consensus_store = ConsensusStoreSQLite3(self.block_store, self.coin_store, height_map)
             self._blockchain = await Blockchain.create(
                 consensus_store=consensus_store,
                 consensus_constants=self.constants,