simplify diffs

Author: richardkiss

chia/_tests/blockchain/blockchain_test_utils.py

@@ -16,13 +16,9 @@
 
 
 async def check_block_store_invariant(bc: Blockchain):
-    # This function checks the invariant of the sqlite database.
-    # Only operate on the sqlite block store.
     assert isinstance(bc.consensus_store, ConsensusStoreSQLite3)
 
-    db_wrapper = bc.consensus_store.block_store.db_wrapper
-
-    if db_wrapper.db_version == 1:
+    if bc.consensus_store.block_store.db_wrapper == 1:
         return
 
     in_chain = set()

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

@@ -18,12 +18,10 @@
 from chia._tests.blockchain.blockchain_test_utils import _validate_and_add_block
 from chia._tests.util.db_connection import DBConnection, PathDBConnection
 from chia.consensus.block_body_validation import ForkInfo
-from chia.consensus.block_height_map import BlockHeightMap
 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.full_node.block_store import BlockStore
-from chia.full_node.coin_store import CoinStore
 from chia.full_node.consensus_store_sqlite3 import ConsensusStoreSQLite3
 from chia.full_node.full_block_utils import GeneratorBlockInfo
 from chia.simulator.block_tools import BlockTools
@@ -72,10 +70,7 @@ async def test_block_store(tmp_dir: Path, db_version: int, bt: BlockTools, use_c
 
     async with DBConnection(db_version) as db_wrapper, DBConnection(db_version) as db_wrapper_2:
         # Use a different file for the blockchain
-        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 = ConsensusStoreSQLite3(store_2, coin_store_2, height_map)
+        consensus_store = await ConsensusStoreSQLite3.create(db_wrapper_2, tmp_dir, use_cache=use_cache)
         bc = await Blockchain.create(consensus_store, bt.constants, 2)
 
         store = await BlockStore.create(db_wrapper, use_cache=use_cache)
@@ -233,10 +228,7 @@ async def test_deadlock(tmp_dir: Path, db_version: int, bt: BlockTools, use_cach
 
     async with PathDBConnection(db_version) as wrapper, PathDBConnection(db_version) as wrapper_2:
         store = await BlockStore.create(wrapper, use_cache=use_cache)
-        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 = ConsensusStoreSQLite3(store_2, coin_store_2, height_map)
+        consensus_store = await ConsensusStoreSQLite3.create(wrapper_2, tmp_dir, use_cache=use_cache)
         bc = await Blockchain.create(consensus_store, bt.constants, 2)
         block_records = []
         for block in blocks:
@@ -327,10 +319,8 @@ async def test_count_compactified_blocks(bt: BlockTools, tmp_dir: Path, db_versi
     blocks = bt.get_consecutive_blocks(10)
 
     async with DBConnection(db_version) as db_wrapper:
-        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 = ConsensusStoreSQLite3(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 = await block_store.count_compactified_blocks()
@@ -349,10 +339,8 @@ async def test_count_uncompactified_blocks(bt: BlockTools, tmp_dir: Path, db_ver
     blocks = bt.get_consecutive_blocks(10)
 
     async with DBConnection(db_version) as db_wrapper:
-        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 = ConsensusStoreSQLite3(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 = await block_store.count_uncompactified_blocks()
@@ -378,10 +366,8 @@ def rand_vdf_proof() -> VDFProof:
         )
 
     async with DBConnection(db_version) as db_wrapper:
-        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 = ConsensusStoreSQLite3(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)
         for block in blocks:
             await _validate_and_add_block(bc, block)
@@ -460,10 +446,7 @@ async def test_get_blocks_by_hash(tmp_dir: Path, bt: BlockTools, db_version: int
 
     async with DBConnection(db_version) as db_wrapper, DBConnection(db_version) as db_wrapper_2:
         # Use a different file for the blockchain
-        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 = ConsensusStoreSQLite3(store_2, coin_store_2, height_map)
+        consensus_store = await ConsensusStoreSQLite3.create(db_wrapper_2, tmp_dir, use_cache=use_cache)
         bc = await Blockchain.create(consensus_store, bt.constants, 2)
 
         store = await BlockStore.create(db_wrapper, use_cache=use_cache)
@@ -501,10 +484,8 @@ async def test_get_block_bytes_in_range(tmp_dir: Path, bt: BlockTools, db_versio
 
     async with DBConnection(db_version) as db_wrapper_2:
         # Use a different file for the blockchain
-        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 = ConsensusStoreSQLite3(store_2, coin_store_2, height_map)
+        consensus_store = await ConsensusStoreSQLite3.create(db_wrapper_2, tmp_dir, use_cache=use_cache)
+        store_2 = consensus_store.block_store
         bc = await Blockchain.create(consensus_store, bt.constants, 2)
 
         await BlockStore.create(db_wrapper_2)
@@ -575,10 +556,7 @@ async def test_get_prev_hash(tmp_dir: Path, bt: BlockTools, db_version: int, use
 
     async with DBConnection(db_version) as db_wrapper, DBConnection(db_version) as db_wrapper_2:
         # Use a different file for the blockchain
-        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 = ConsensusStoreSQLite3(store_2, coin_store_2, height_map)
+        consensus_store = await ConsensusStoreSQLite3.create(db_wrapper_2, tmp_dir, use_cache=use_cache)
         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

@@ -16,11 +16,9 @@
 from chia._tests.util.db_connection import DBConnection
 from chia._tests.util.misc import Marks, datacases
 from chia.consensus.block_body_validation import ForkInfo
-from chia.consensus.block_height_map import BlockHeightMap
 from chia.consensus.block_rewards import calculate_base_farmer_reward, calculate_pool_reward
 from chia.consensus.blockchain import AddBlockResult, Blockchain
 from chia.consensus.coinbase import create_farmer_coin, create_pool_coin
-from chia.full_node.block_store import BlockStore
 from chia.full_node.coin_store import CoinStore
 from chia.full_node.consensus_store_sqlite3 import ConsensusStoreSQLite3
 from chia.full_node.hint_store import HintStore
@@ -316,10 +314,8 @@ async def test_basic_reorg(tmp_dir: Path, db_version: int, bt: BlockTools) -> No
         initial_block_count = 30
         reorg_length = 15
         blocks = bt.get_consecutive_blocks(initial_block_count)
-        coin_store = await CoinStore.create(db_wrapper)
-        store = await BlockStore.create(db_wrapper)
-        height_map = await BlockHeightMap.create(tmp_dir, db_wrapper)
-        consensus_store = ConsensusStoreSQLite3(store, coin_store, height_map)
+        consensus_store = await ConsensusStoreSQLite3.create(db_wrapper, tmp_dir)
+        coin_store = consensus_store.coin_store
         b: Blockchain = await Blockchain.create(consensus_store, bt.constants, 2)
         try:
             records: list[Optional[CoinRecord]] = []
@@ -384,10 +380,8 @@ async def test_get_puzzle_hash(tmp_dir: Path, db_version: int, bt: BlockTools) -
             pool_reward_puzzle_hash=pool_ph,
             guarantee_transaction_block=True,
         )
-        coin_store = await CoinStore.create(db_wrapper)
-        store = await BlockStore.create(db_wrapper)
-        height_map = await BlockHeightMap.create(tmp_dir, db_wrapper)
-        consensus_store = ConsensusStoreSQLite3(store, coin_store, height_map)
+        consensus_store = await ConsensusStoreSQLite3.create(db_wrapper, tmp_dir)
+        coin_store = consensus_store.coin_store
         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

@@ -10,11 +10,8 @@
 from chia._tests.util.temp_file import TempFile
 from chia.cmds.db_upgrade_func import convert_v1_to_v2
 from chia.consensus.block_body_validation import ForkInfo
-from chia.consensus.block_height_map import BlockHeightMap
 from chia.consensus.blockchain import Blockchain
 from chia.consensus.multiprocess_validation import PreValidationResult
-from chia.full_node.block_store import BlockStore
-from chia.full_node.coin_store import CoinStore
 from chia.full_node.consensus_store_sqlite3 import ConsensusStoreSQLite3
 from chia.full_node.hint_store import HintStore
 from chia.simulator.block_tools import test_constants
@@ -55,15 +52,11 @@ async def test_blocks(default_1000_blocks, with_hints: bool):
             journal_mode="OFF",
             synchronous="OFF",
         ) as db_wrapper1:
-            block_store1 = await BlockStore.create(db_wrapper1)
-            coin_store1 = await CoinStore.create(db_wrapper1)
+            consensus_store = await ConsensusStoreSQLite3.create(db_wrapper1, Path("."))
             hint_store1 = await HintStore.create(db_wrapper1)
             if with_hints:
                 for h in hints:
                     await hint_store1.add_hints([(h[0], h[1])])
-
-            height_map = await BlockHeightMap.create(Path("."), db_wrapper1)
-            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:
@@ -81,12 +74,14 @@ async def test_blocks(default_1000_blocks, with_hints: bool):
 
         async with DBWrapper2.managed(database=in_file, reader_count=1, db_version=1) as db_wrapper1:
             async with DBWrapper2.managed(database=out_file, reader_count=1, db_version=2) as db_wrapper2:
-                block_store1 = await BlockStore.create(db_wrapper1)
-                coin_store1 = await CoinStore.create(db_wrapper1)
+                consensus_store1 = await ConsensusStoreSQLite3.create(db_wrapper1, Path("."))
+                block_store1 = consensus_store1.block_store
+                coin_store1 = consensus_store1.coin_store
                 hint_store1 = await HintStore.create(db_wrapper1)
 
-                block_store2 = await BlockStore.create(db_wrapper2)
-                coin_store2 = await CoinStore.create(db_wrapper2)
+                consensus_store2 = await ConsensusStoreSQLite3.create(db_wrapper2, Path("."))
+                block_store2 = consensus_store2.block_store
+                coin_store2 = consensus_store2.coin_store
                 hint_store2 = await HintStore.create(db_wrapper2)
 
                 if with_hints:

chia/_tests/core/test_db_validation.py

@@ -13,12 +13,9 @@
 from chia._tests.util.temp_file import TempFile
 from chia.cmds.db_validate_func import validate_v2
 from chia.consensus.block_body_validation import ForkInfo
-from chia.consensus.block_height_map import BlockHeightMap
 from chia.consensus.blockchain import Blockchain
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.consensus.multiprocess_validation import PreValidationResult
-from chia.full_node.block_store import BlockStore
-from chia.full_node.coin_store import CoinStore
 from chia.full_node.consensus_store_sqlite3 import ConsensusStoreSQLite3
 from chia.simulator.block_tools import test_constants
 from chia.util.db_wrapper import DBWrapper2
@@ -139,10 +136,7 @@ async def make_db(db_file: Path, blocks: list[FullBlock]) -> None:
             await conn.execute("CREATE TABLE database_version(version int)")
             await conn.execute("INSERT INTO database_version VALUES (2)")
 
-        block_store = await BlockStore.create(db_wrapper)
-        coin_store = await CoinStore.create(db_wrapper)
-        height_map = await BlockHeightMap.create(Path("."), db_wrapper)
-        consensus_store = ConsensusStoreSQLite3(block_store, coin_store, height_map)
+        consensus_store = await ConsensusStoreSQLite3.create(db_wrapper, Path("."))
         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/full_node/full_node.py

@@ -267,7 +267,7 @@ async def manage(self) -> AsyncIterator[None]:
             multiprocessing_start_method = process_config_start_method(config=self.config, log=self.log)
             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)
+            height_map = await BlockHeightMap.create(self.db_path.parent, self._db_wrapper, selected_network)
             consensus_store = ConsensusStoreSQLite3(self.block_store, self.coin_store, height_map)
             self._blockchain = await Blockchain.create(
                 consensus_store=consensus_store,