Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

parametrize datalayer proof of inclusion for rust as well #19281

Merged
merged 3 commits into from
Feb 18, 2025
Merged

parametrize datalayer proof of inclusion for rust as well #19281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e92755
parametrize datalayer proof of inclusion for rust as well
altendky Feb 17, 2025
88564d4
rs fixup
altendky Feb 17, 2025
260cbc8
update chia_rs
altendky Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions chia/_tests/core/data_layer/test_merkle_blob.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,14 +345,14 @@ def test_small_insert_deletes(merkle_types: MerkleTypes) -> None:
assert not remaining_keys_values


def test_proof_of_inclusion_merkle_blob() -> None:
def test_proof_of_inclusion_merkle_blob(merkle_types: MerkleTypes) -> None:
num_repeats = 10
seed = 0

random = Random()
random.seed(100, version=2)

merkle_blob = MerkleBlob(blob=bytearray())
merkle_blob = merkle_types.blob(blob=bytearray())
keys_values: dict[KeyId, ValueId] = {}

for repeats in range(num_repeats):
Expand Down Expand Up @@ -383,7 +383,7 @@ def test_proof_of_inclusion_merkle_blob() -> None:
del keys_values[kv_id]

for kv_id in delete_ordering:
with pytest.raises(Exception, match=f"Key {re.escape(str(kv_id))} not present in the store"):
with pytest.raises(Exception, match=f"unknown key: {re.escape(str(kv_id))}"):
merkle_blob.get_proof_of_inclusion(kv_id)

new_keys_values: dict[KeyId, ValueId] = {}
Expand Down
5 changes: 4 additions & 1 deletion chia/data_layer/util/merkle_blob.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ def __post_init__(self) -> None:
self.free_indexes = self.get_free_indexes()
self.leaf_hash_to_index = self.get_hashes_indexes(leafs_only=True)

def __len__(self) -> int:
return len(self.blob)

@classmethod
def from_node_list(
cls: type[MerkleBlob],
Expand Down Expand Up @@ -206,7 +209,7 @@ def calculate_lazy_hashes(self, index: TreeIndex = TreeIndex(0)) -> bytes32:

def get_proof_of_inclusion(self, key_id: KeyId) -> ProofOfInclusion:
if key_id not in self.key_to_index:
raise Exception(f"Key {key_id} not present in the store")
raise Exception(f"unknown key: {key_id}")

index = self.key_to_index[key_id]
node = self.get_raw_node(index)
Expand Down
2 changes: 1 addition & 1 deletion poetry.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@ typing-extensions = "*"
type = "git"
url = "https://github.com/chia-network/chia_rs"
reference = "long_lived/initial_datalayer"
resolved_reference = "b3524140bfebf59d5009d9b4db0a5e1faba5ce15"
resolved_reference = "cbbfa261633e174dfffb0b2062171e99467c366c"
subdirectory = "wheel/"

[[package]]
Expand Down
Loading