catchup: into main from long_lived/datalayer_merkle_blob @ eadce7954e10a649e402bb6a11d4987c938de796

chia/_tests/core/data_layer/conftest.py

@@ -61,8 +61,13 @@ def store_id_fixture() -> bytes32:
 
 
 @pytest.fixture(name="raw_data_store", scope="function")
-async def raw_data_store_fixture(database_uri: str) -> AsyncIterable[DataStore]:
-    async with DataStore.managed(database=database_uri, uri=True) as store:
+async def raw_data_store_fixture(database_uri: str, tmp_path: pathlib.Path) -> AsyncIterable[DataStore]:
+    async with DataStore.managed(
+        database=database_uri,
+        uri=True,
+        merkle_blobs_path=tmp_path.joinpath("merkle-blobs"),
+        key_value_blobs_path=tmp_path.joinpath("key-value-blobs"),
+    ) as store:
         yield store
 
 

chia/_tests/core/data_layer/test_data_layer_util.py

@@ -7,15 +7,14 @@
 
 # TODO: update after resolution in https://github.com/pytest-dev/pytest/issues/7469
 from _pytest.fixtures import SubRequest
+from chia_rs.datalayer import ProofOfInclusion, ProofOfInclusionLayer
 from chia_rs.sized_bytes import bytes32
 
 from chia._tests.util.misc import Marks, datacases, measure_runtime
 from chia.data_layer.data_layer_rpc_util import MarshallableProtocol
 from chia.data_layer.data_layer_util import (
     ClearPendingRootsRequest,
     ClearPendingRootsResponse,
-    ProofOfInclusion,
-    ProofOfInclusionLayer,
     Root,
     Side,
     Status,
@@ -38,10 +37,15 @@ def create_valid_proof_of_inclusion(layer_count: int, other_hash_side: Side) ->
     other_hashes = [bytes32([i] * 32) for i in range(layer_count)]
 
     for other_hash in other_hashes:
-        new_layer = ProofOfInclusionLayer.from_hashes(
-            primary_hash=existing_hash,
+        if other_hash_side == Side.LEFT:
+            combined_hash = internal_hash(other_hash, existing_hash)
+        else:
+            combined_hash = internal_hash(existing_hash, other_hash)
+
+        new_layer = ProofOfInclusionLayer(
             other_hash_side=other_hash_side,
             other_hash=other_hash,
+            combined_hash=combined_hash,
         )
 
         layers.append(new_layer)
@@ -72,16 +76,16 @@ def invalid_proof_of_inclusion_fixture(request: SubRequest, side: Side) -> Proof
     a_hash = bytes32(b"f" * 32)
 
     if request.param == "bad root hash":
-        layers[-1] = dataclasses.replace(layers[-1], combined_hash=a_hash)
-        return dataclasses.replace(valid_proof_of_inclusion, layers=layers)
+        layers[-1] = layers[-1].replace(combined_hash=a_hash)
+        return valid_proof_of_inclusion.replace(layers=layers)
     elif request.param == "bad other hash":
-        layers[1] = dataclasses.replace(layers[1], other_hash=a_hash)
-        return dataclasses.replace(valid_proof_of_inclusion, layers=layers)
+        layers[1] = layers[1].replace(other_hash=a_hash)
+        return valid_proof_of_inclusion.replace(layers=layers)
     elif request.param == "bad other side":
-        layers[1] = dataclasses.replace(layers[1], other_hash_side=layers[1].other_hash_side.other())
-        return dataclasses.replace(valid_proof_of_inclusion, layers=layers)
+        layers[1] = layers[1].replace(other_hash_side=Side(layers[1].other_hash_side).other())
+        return valid_proof_of_inclusion.replace(layers=layers)
     elif request.param == "bad node hash":
-        return dataclasses.replace(valid_proof_of_inclusion, node_hash=a_hash)
+        return valid_proof_of_inclusion.replace(node_hash=a_hash)
 
     raise Exception(f"Unhandled parametrization: {request.param!r}")  # pragma: no cover