Comprehensive audit: 20 proven bugs fixed, HTTP/2 enabled, 3-10x performance gains

py_hamt/encryption_hamt_store.py

@@ -183,13 +183,13 @@ async def get(
             return None
 
     async def set(self, key: str, value: zarr.core.buffer.Buffer) -> None:
-        """@private"""
+        """Encrypt and store a value, then update cached metadata."""
         if self.read_only:
             raise Exception("Cannot write to a read-only store.")
 
         raw_bytes = value.to_bytes()
-        if key in self.metadata_read_cache:
-            self.metadata_read_cache[key] = raw_bytes
         # Encrypt it
         encrypted_bytes = self._encrypt(raw_bytes)
         await self.hamt.set(key, encrypted_bytes)
+        if key in self.metadata_read_cache:
+            self.metadata_read_cache[key] = raw_bytes

py_hamt/zarr_hamt_store.py

@@ -234,13 +234,14 @@ def supports_partial_writes(self) -> bool:
         return False
 
     async def set(self, key: str, value: zarr.core.buffer.Buffer) -> None:
-        """@private"""
+        """Store a value and update any existing metadata cache entry."""
         if self.read_only:
             raise Exception("Cannot write to a read-only store.")
 
+        raw_bytes = value.to_bytes()
+        await self.hamt.set(key, raw_bytes)
         if key in self.metadata_read_cache:
-            self.metadata_read_cache[key] = value.to_bytes()
-        await self.hamt.set(key, value.to_bytes())
+            self.metadata_read_cache[key] = raw_bytes
 
     async def set_if_not_exists(self, key: str, value: zarr.core.buffer.Buffer) -> None:
         """@private"""
@@ -259,18 +260,16 @@ def supports_deletes(self) -> bool:
         return not self.hamt.read_only
 
     async def delete(self, key: str) -> None:
-        """@private"""
+        """Delete a key and evict any cached metadata for it."""
         if self.read_only:
             raise Exception("Cannot write to a read-only store.")
         try:
             await self.hamt.delete(key)
-            # In practice these lines never seem to be needed, creating and appending data are the only operations most zarrs actually undergo
-            # if key in self.metadata_read_cache:
-            #     del self.metadata_read_cache[key]
         # It's fine if the key was not in the HAMT
         # Sometimes zarr v3 calls deletes on keys that don't exist (or have already been deleted) for some reason, probably concurrency issues
         except KeyError:
-            return
+            pass
+        self.metadata_read_cache.pop(key, None)
 
     @property
     def supports_listing(self) -> bool:

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "py-hamt"
-version = "3.4.1"
+version = "3.5.0"
 description = "HAMT implementation for a content-addressed storage system."
 readme = "README.md"
 requires-python = ">=3.12"
@@ -36,6 +36,7 @@ dev = [
     "docker>=7.1.0",
     "types-docker>=7.1.0.20250523",
     "pre-commit>=4.2.0",
+    "trustme>=1.2.1",
 ]
 
 [tool.ruff]

pytest.ini

@@ -1,6 +1,6 @@
 # pytest.ini
 [pytest]
 asyncio_mode = auto
-asyncio_default_fixture_loop_scope = session
+asyncio_default_fixture_loop_scope = function
 filterwarnings =
     ignore:sharded_zarr_v1 is deprecated.*:FutureWarning

tests/conftest.py

@@ -5,9 +5,11 @@
 from testing_utils import create_ipfs, ipld_strategy  # noqa: F401
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture
 async def global_client_session():
-    """One httpx.AsyncClient shared by the whole test run."""
+    """A fresh httpx.AsyncClient per test (function-scoped to match the
+    function-scoped event loop; a session-scoped client bound to one test's
+    loop breaks later tests once that loop closes)."""
     async with httpx.AsyncClient() as client:
         yield client
     # httpx's async context manager awaits client.aclose() for us

tests/fixtures/z1_legacy_single_var_store.json

@@ -0,0 +1,21 @@
+{
+ "blocks": {
+  "bafkr4iamm5aavgo5molhsg5z4f254ajp3kz3khdmvrzueombleskssbg7a": "ewogICJhdHRyaWJ1dGVzIjoge30sCiAgInphcnJfZm9ybWF0IjogMywKICAiY29uc29saWRhdGVkX21ldGFkYXRhIjogbnVsbCwKICAibm9kZV90eXBlIjogImdyb3VwIgp9",
+  "bafkr4ibxty4gbihdefvbos7sjo75crb7el3rmbd7rsjvh5n5p3agetbona": "KLUv/WCAAO0DANQDAADwPwBAAAgQFBgcICIkJigqLC4wMTIzNDU2Nzg5Ojs8PT4/QIAAQYAAQoAAQ4AARIAARYAARoAAR4BHQC8g4NcDMxsti4GZjZbFwMxGy2JgZkPyZZYln8yy5MssS77MsuTLLEu+zLLkyyxLvsyyyJdZFpFvyVrDHPfa",
+  "bafkr4ick6fvm7ckmt2c6rfyl3aajcx3p3mdvugrihlinfmui3c5h2uei5q": "ewogICJzaGFwZSI6IFsKICAgIDQsCiAgICA0LAogICAgNgogIF0sCiAgImRhdGFfdHlwZSI6ICJmbG9hdDY0IiwKICAiY2h1bmtfZ3JpZCI6IHsKICAgICJuYW1lIjogInJlZ3VsYXIiLAogICAgImNvbmZpZ3VyYXRpb24iOiB7CiAgICAgICJjaHVua19zaGFwZSI6IFsKICAgICAgICAyLAogICAgICAgIDQsCiAgICAgICAgNgogICAgICBdCiAgICB9CiAgfSwKICAiY2h1bmtfa2V5X2VuY29kaW5nIjogewogICAgIm5hbWUiOiAiZGVmYXVsdCIsCiAgICAiY29uZmlndXJhdGlvbiI6IHsKICAgICAgInNlcGFyYXRvciI6ICIvIgogICAgfQogIH0sCiAgImZpbGxfdmFsdWUiOiAwLjAsCiAgImNvZGVjcyI6IFsKICAgIHsKICAgICAgIm5hbWUiOiAiYnl0ZXMiLAogICAgICAiY29uZmlndXJhdGlvbiI6IHsKICAgICAgICAiZW5kaWFuIjogImxpdHRsZSIKICAgICAgfQogICAgfSwKICAgIHsKICAgICAgIm5hbWUiOiAienN0ZCIsCiAgICAgICJjb25maWd1cmF0aW9uIjogewogICAgICAgICJsZXZlbCI6IDAsCiAgICAgICAgImNoZWNrc3VtIjogZmFsc2UKICAgICAgfQogICAgfQogIF0sCiAgImF0dHJpYnV0ZXMiOiB7fSwKICAiZGltZW5zaW9uX25hbWVzIjogWwogICAgInRpbWUiLAogICAgImxhdCIsCiAgICAibG9uIgogIF0sCiAgInphcnJfZm9ybWF0IjogMywKICAibm9kZV90eXBlIjogImFycmF5IiwKICAic3RvcmFnZV90cmFuc2Zvcm1lcnMiOiBbXQp9",
+  "bafkr4icpnkpo3pserbi4nekr2ldezdajzdc2z2kq2auxkqvs5pv5lnnvxa": "ewogICJzaGFwZSI6IFsKICAgIDQsCiAgICA0LAogICAgNgogIF0sCiAgImRhdGFfdHlwZSI6ICJmbG9hdDY0IiwKICAiY2h1bmtfZ3JpZCI6IHsKICAgICJuYW1lIjogInJlZ3VsYXIiLAogICAgImNvbmZpZ3VyYXRpb24iOiB7CiAgICAgICJjaHVua19zaGFwZSI6IFsKICAgICAgICAyLAogICAgICAgIDQsCiAgICAgICAgNgogICAgICBdCiAgICB9CiAgfSwKICAiY2h1bmtfa2V5X2VuY29kaW5nIjogewogICAgIm5hbWUiOiAiZGVmYXVsdCIsCiAgICAiY29uZmlndXJhdGlvbiI6IHsKICAgICAgInNlcGFyYXRvciI6ICIvIgogICAgfQogIH0sCiAgImZpbGxfdmFsdWUiOiAwLjAsCiAgImNvZGVjcyI6IFsKICAgIHsKICAgICAgIm5hbWUiOiAiYnl0ZXMiLAogICAgICAiY29uZmlndXJhdGlvbiI6IHsKICAgICAgICAiZW5kaWFuIjogImxpdHRsZSIKICAgICAgfQogICAgfSwKICAgIHsKICAgICAgIm5hbWUiOiAienN0ZCIsCiAgICAgICJjb25maWd1cmF0aW9uIjogewogICAgICAgICJsZXZlbCI6IDAsCiAgICAgICAgImNoZWNrc3VtIjogZmFsc2UKICAgICAgfQogICAgfQogIF0sCiAgImF0dHJpYnV0ZXMiOiB7CiAgICAiX0ZpbGxWYWx1ZSI6ICJBQUFBQUFBQStIOD0iCiAgfSwKICAiZGltZW5zaW9uX25hbWVzIjogWwogICAgInRpbWUiLAogICAgImxhdCIsCiAgICAibG9uIgogIF0sCiAgInphcnJfZm9ybWF0IjogMywKICAibm9kZV90eXBlIjogImFycmF5IiwKICAic3RvcmFnZV90cmFuc2Zvcm1lcnMiOiBbXQp9",
+  "bafkr4iczmsrm27icvtifxcvwogorby6a32jhv4r4sall3cvqvfvpud4kmu": "ewogICJzaGFwZSI6IFsKICAgIDQKICBdLAogICJkYXRhX3R5cGUiOiAiaW50NjQiLAogICJjaHVua19ncmlkIjogewogICAgIm5hbWUiOiAicmVndWxhciIsCiAgICAiY29uZmlndXJhdGlvbiI6IHsKICAgICAgImNodW5rX3NoYXBlIjogWwogICAgICAgIDQKICAgICAgXQogICAgfQogIH0sCiAgImNodW5rX2tleV9lbmNvZGluZyI6IHsKICAgICJuYW1lIjogImRlZmF1bHQiLAogICAgImNvbmZpZ3VyYXRpb24iOiB7CiAgICAgICJzZXBhcmF0b3IiOiAiLyIKICAgIH0KICB9LAogICJmaWxsX3ZhbHVlIjogMCwKICAiY29kZWNzIjogWwogICAgewogICAgICAibmFtZSI6ICJieXRlcyIsCiAgICAgICJjb25maWd1cmF0aW9uIjogewogICAgICAgICJlbmRpYW4iOiAibGl0dGxlIgogICAgICB9CiAgICB9LAogICAgewogICAgICAibmFtZSI6ICJ6c3RkIiwKICAgICAgImNvbmZpZ3VyYXRpb24iOiB7CiAgICAgICAgImxldmVsIjogMCwKICAgICAgICAiY2hlY2tzdW0iOiBmYWxzZQogICAgICB9CiAgICB9CiAgXSwKICAiYXR0cmlidXRlcyI6IHt9LAogICJkaW1lbnNpb25fbmFtZXMiOiBbCiAgICAidGltZSIKICBdLAogICJ6YXJyX2Zvcm1hdCI6IDMsCiAgIm5vZGVfdHlwZSI6ICJhcnJheSIsCiAgInN0b3JhZ2VfdHJhbnNmb3JtZXJzIjogW10KfQ==",
+  "bafkr4idbvkz7l3nb376a6hkrn4jhfeiakhx7bohuqhtin3selkns2vjnt4": "ewogICJzaGFwZSI6IFsKICAgIDYKICBdLAogICJkYXRhX3R5cGUiOiAiZmxvYXQ2NCIsCiAgImNodW5rX2dyaWQiOiB7CiAgICAibmFtZSI6ICJyZWd1bGFyIiwKICAgICJjb25maWd1cmF0aW9uIjogewogICAgICAiY2h1bmtfc2hhcGUiOiBbCiAgICAgICAgNgogICAgICBdCiAgICB9CiAgfSwKICAiY2h1bmtfa2V5X2VuY29kaW5nIjogewogICAgIm5hbWUiOiAiZGVmYXVsdCIsCiAgICAiY29uZmlndXJhdGlvbiI6IHsKICAgICAgInNlcGFyYXRvciI6ICIvIgogICAgfQogIH0sCiAgImZpbGxfdmFsdWUiOiAwLjAsCiAgImNvZGVjcyI6IFsKICAgIHsKICAgICAgIm5hbWUiOiAiYnl0ZXMiLAogICAgICAiY29uZmlndXJhdGlvbiI6IHsKICAgICAgICAiZW5kaWFuIjogImxpdHRsZSIKICAgICAgfQogICAgfSwKICAgIHsKICAgICAgIm5hbWUiOiAienN0ZCIsCiAgICAgICJjb25maWd1cmF0aW9uIjogewogICAgICAgICJsZXZlbCI6IDAsCiAgICAgICAgImNoZWNrc3VtIjogZmFsc2UKICAgICAgfQogICAgfQogIF0sCiAgImF0dHJpYnV0ZXMiOiB7CiAgICAiX0ZpbGxWYWx1ZSI6ICJBQUFBQUFBQStIOD0iCiAgfSwKICAiZGltZW5zaW9uX25hbWVzIjogWwogICAgImxvbiIKICBdLAogICJ6YXJyX2Zvcm1hdCI6IDMsCiAgIm5vZGVfdHlwZSI6ICJhcnJheSIsCiAgInN0b3JhZ2VfdHJhbnNmb3JtZXJzIjogW10KfQ==",
+  "bafkr4idj3cpeoiwwyy5rdpx7tidnlehl3etnb77dbxvkferhp2cwyiwpve": "ewogICJzaGFwZSI6IFsKICAgIDQKICBdLAogICJkYXRhX3R5cGUiOiAiZmxvYXQ2NCIsCiAgImNodW5rX2dyaWQiOiB7CiAgICAibmFtZSI6ICJyZWd1bGFyIiwKICAgICJjb25maWd1cmF0aW9uIjogewogICAgICAiY2h1bmtfc2hhcGUiOiBbCiAgICAgICAgNAogICAgICBdCiAgICB9CiAgfSwKICAiY2h1bmtfa2V5X2VuY29kaW5nIjogewogICAgIm5hbWUiOiAiZGVmYXVsdCIsCiAgICAiY29uZmlndXJhdGlvbiI6IHsKICAgICAgInNlcGFyYXRvciI6ICIvIgogICAgfQogIH0sCiAgImZpbGxfdmFsdWUiOiAwLjAsCiAgImNvZGVjcyI6IFsKICAgIHsKICAgICAgIm5hbWUiOiAiYnl0ZXMiLAogICAgICAiY29uZmlndXJhdGlvbiI6IHsKICAgICAgICAiZW5kaWFuIjogImxpdHRsZSIKICAgICAgfQogICAgfSwKICAgIHsKICAgICAgIm5hbWUiOiAienN0ZCIsCiAgICAgICJjb25maWd1cmF0aW9uIjogewogICAgICAgICJsZXZlbCI6IDAsCiAgICAgICAgImNoZWNrc3VtIjogZmFsc2UKICAgICAgfQogICAgfQogIF0sCiAgImF0dHJpYnV0ZXMiOiB7CiAgICAiX0ZpbGxWYWx1ZSI6ICJBQUFBQUFBQStIOD0iCiAgfSwKICAiZGltZW5zaW9uX25hbWVzIjogWwogICAgImxhdCIKICBdLAogICJ6YXJyX2Zvcm1hdCI6IDMsCiAgIm5vZGVfdHlwZSI6ICJhcnJheSIsCiAgInN0b3JhZ2VfdHJhbnNmb3JtZXJzIjogW10KfQ==",
+  "bafkr4iejghfjnobiycewyqcqbr5zcjskim4lc5t3czkqjo2vcmopq5y2sa": "KLUv/SAgrQAAcAAAAQACAAMAAAAAAAAAA1QCAAMB",
+  "bafkr4iekekhcnomg3irwttcrotdo2ztgzjffxiaixwvan4tgindj7xebdy": "KLUv/SAw7QAAgAAAAAAAgGbAAFtCQFuAZkAFAGAIGAcIW0nRgiM=",
+  "bafkr4iem6twzkgh63qzeph75im4udb3xdbkfnnda62j6r2myc4p6tpwpzq": "KLUv/WCAAL0DAFIEDRawNcMBDMMAkzlnm3UTERER0UFjGM5TOlvHrYBbALcatxi3FrcUtxJH/HDDCyd8cMFVoAEwIODXWfIdmFmWfAdmliXfgZllyXdgZlnyHSizLPkOzCxLvgMzy5LvwMxGy2JgZqNlMVBmo2UxMDMy2lLYsBoW",
+  "bafkr4ifhaszbondcaw3nvy7lbco56htp7ogybo45iqdl6i4bfqedtlpine": "ewogICJhdHRyaWJ1dGVzIjoge30sCiAgInphcnJfZm9ybWF0IjogMywKICAiY29uc29saWRhdGVkX21ldGFkYXRhIjogewogICAgImtpbmQiOiAiaW5saW5lIiwKICAgICJtdXN0X3VuZGVyc3RhbmQiOiBmYWxzZSwKICAgICJtZXRhZGF0YSI6IHsKICAgICAgInRlbXAiOiB7CiAgICAgICAgInNoYXBlIjogWwogICAgICAgICAgNCwKICAgICAgICAgIDQsCiAgICAgICAgICA2CiAgICAgICAgXSwKICAgICAgICAiZGF0YV90eXBlIjogImZsb2F0NjQiLAogICAgICAgICJjaHVua19ncmlkIjogewogICAgICAgICAgIm5hbWUiOiAicmVndWxhciIsCiAgICAgICAgICAiY29uZmlndXJhdGlvbiI6IHsKICAgICAgICAgICAgImNodW5rX3NoYXBlIjogWwogICAgICAgICAgICAgIDIsCiAgICAgICAgICAgICAgNCwKICAgICAgICAgICAgICA2CiAgICAgICAgICAgIF0KICAgICAgICAgIH0KICAgICAgICB9LAogICAgICAgICJjaHVua19rZXlfZW5jb2RpbmciOiB7CiAgICAgICAgICAibmFtZSI6ICJkZWZhdWx0IiwKICAgICAgICAgICJjb25maWd1cmF0aW9uIjogewogICAgICAgICAgICAic2VwYXJhdG9yIjogIi8iCiAgICAgICAgICB9CiAgICAgICAgfSwKICAgICAgICAiZmlsbF92YWx1ZSI6IDAuMCwKICAgICAgICAiY29kZWNzIjogWwogICAgICAgICAgewogICAgICAgICAgICAibmFtZSI6ICJieXRlcyIsCiAgICAgICAgICAgICJjb25maWd1cmF0aW9uIjogewogICAgICAgICAgICAgICJlbmRpYW4iOiAibGl0dGxlIgogICAgICAgICAgICB9CiAgICAgICAgICB9LAogICAgICAgICAgewogICAgICAgICAgICAibmFtZSI6ICJ6c3RkIiwKICAgICAgICAgICAgImNvbmZpZ3VyYXRpb24iOiB7CiAgICAgICAgICAgICAgImxldmVsIjogMCwKICAgICAgICAgICAgICAiY2hlY2tzdW0iOiBmYWxzZQogICAgICAgICAgICB9CiAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiYXR0cmlidXRlcyI6IHsKICAgICAgICAgICJfRmlsbFZhbHVlIjogIkFBQUFBQUFBK0g4PSIKICAgICAgICB9LAogICAgICAgICJkaW1lbnNpb25fbmFtZXMiOiBbCiAgICAgICAgICAidGltZSIsCiAgICAgICAgICAibGF0IiwKICAgICAgICAgICJsb24iCiAgICAgICAgXSwKICAgICAgICAiemFycl9mb3JtYXQiOiAzLAogICAgICAgICJub2RlX3R5cGUiOiAiYXJyYXkiLAogICAgICAgICJzdG9yYWdlX3RyYW5zZm9ybWVycyI6IFtdCiAgICAgIH0sCiAgICAgICJ0aW1lIjogewogICAgICAgICJzaGFwZSI6IFsKICAgICAgICAgIDQKICAgICAgICBdLAogICAgICAgICJkYXRhX3R5cGUiOiAiaW50NjQiLAogICAgICAgICJjaHVua19ncmlkIjogewogICAgICAgICAgIm5hbWUiOiAicmVndWxhciIsCiAgICAgICAgICAiY29uZmlndXJhdGlvbiI6IHsKICAgICAgICAgICAgImNodW5rX3NoYXBlIjogWwogICAgICAgICAgICAgIDQKICAgICAgICAgICAgXQogICAgICAgICAgfQogICAgICAgIH0sCiAgICAgICAgImNodW5rX2tleV9lbmNvZGluZyI6IHsKICAgICAgICAgICJuYW1lIjogImRlZmF1bHQiLAogICAgICAgICAgImNvbmZpZ3VyYXRpb24iOiB7CiAgICAgICAgICAgICJzZXBhcmF0b3IiOiAiLyIKICAgICAgICAgIH0KICAgICAgICB9LAogICAgICAgICJmaWxsX3ZhbHVlIjogMCwKICAgICAgICAiY29kZWNzIjogWwogICAgICAgICAgewogICAgICAgICAgICAibmFtZSI6ICJieXRlcyIsCiAgICAgICAgICAgICJjb25maWd1cmF0aW9uIjogewogICAgICAgICAgICAgICJlbmRpYW4iOiAibGl0dGxlIgogICAgICAgICAgICB9CiAgICAgICAgICB9LAogICAgICAgICAgewogICAgICAgICAgICAibmFtZSI6ICJ6c3RkIiwKICAgICAgICAgICAgImNvbmZpZ3VyYXRpb24iOiB7CiAgICAgICAgICAgICAgImxldmVsIjogMCwKICAgICAgICAgICAgICAiY2hlY2tzdW0iOiBmYWxzZQogICAgICAgICAgICB9CiAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiYXR0cmlidXRlcyI6IHt9LAogICAgICAgICJkaW1lbnNpb25fbmFtZXMiOiBbCiAgICAgICAgICAidGltZSIKICAgICAgICBdLAogICAgICAgICJ6YXJyX2Zvcm1hdCI6IDMsCiAgICAgICAgIm5vZGVfdHlwZSI6ICJhcnJheSIsCiAgICAgICAgInN0b3JhZ2VfdHJhbnNmb3JtZXJzIjogW10KICAgICAgfSwKICAgICAgImxhdCI6IHsKICAgICAgICAic2hhcGUiOiBbCiAgICAgICAgICA0CiAgICAgICAgXSwKICAgICAgICAiZGF0YV90eXBlIjogImZsb2F0NjQiLAogICAgICAgICJjaHVua19ncmlkIjogewogICAgICAgICAgIm5hbWUiOiAicmVndWxhciIsCiAgICAgICAgICAiY29uZmlndXJhdGlvbiI6IHsKICAgICAgICAgICAgImNodW5rX3NoYXBlIjogWwogICAgICAgICAgICAgIDQKICAgICAgICAgICAgXQogICAgICAgICAgfQogICAgICAgIH0sCiAgICAgICAgImNodW5rX2tleV9lbmNvZGluZyI6IHsKICAgICAgICAgICJuYW1lIjogImRlZmF1bHQiLAogICAgICAgICAgImNvbmZpZ3VyYXRpb24iOiB7CiAgICAgICAgICAgICJzZXBhcmF0b3IiOiAiLyIKICAgICAgICAgIH0KICAgICAgICB9LAogICAgICAgICJmaWxsX3ZhbHVlIjogMC4wLAogICAgICAgICJjb2RlY3MiOiBbCiAgICAgICAgICB7CiAgICAgICAgICAgICJuYW1lIjogImJ5dGVzIiwKICAgICAgICAgICAgImNvbmZpZ3VyYXRpb24iOiB7CiAgICAgICAgICAgICAgImVuZGlhbiI6ICJsaXR0bGUiCiAgICAgICAgICAgIH0KICAgICAgICAgIH0sCiAgICAgICAgICB7CiAgICAgICAgICAgICJuYW1lIjogInpzdGQiLAogICAgICAgICAgICAiY29uZmlndXJhdGlvbiI6IHsKICAgICAgICAgICAgICAibGV2ZWwiOiAwLAogICAgICAgICAgICAgICJjaGVja3N1bSI6IGZhbHNlCiAgICAgICAgICAgIH0KICAgICAgICAgIH0KICAgICAgICBdLAogICAgICAgICJhdHRyaWJ1dGVzIjogewogICAgICAgICAgIl9GaWxsVmFsdWUiOiAiQUFBQUFBQUErSDg9IgogICAgICAgIH0sCiAgICAgICAgImRpbWVuc2lvbl9uYW1lcyI6IFsKICAgICAgICAgICJsYXQiCiAgICAgICAgXSwKICAgICAgICAiemFycl9mb3JtYXQiOiAzLAogICAgICAgICJub2RlX3R5cGUiOiAiYXJyYXkiLAogICAgICAgICJzdG9yYWdlX3RyYW5zZm9ybWVycyI6IFtdCiAgICAgIH0sCiAgICAgICJsb24iOiB7CiAgICAgICAgInNoYXBlIjogWwogICAgICAgICAgNgogICAgICAgIF0sCiAgICAgICAgImRhdGFfdHlwZSI6ICJmbG9hdDY0IiwKICAgICAgICAiY2h1bmtfZ3JpZCI6IHsKICAgICAgICAgICJuYW1lIjogInJlZ3VsYXIiLAogICAgICAgICAgImNvbmZpZ3VyYXRpb24iOiB7CiAgICAgICAgICAgICJjaHVua19zaGFwZSI6IFsKICAgICAgICAgICAgICA2CiAgICAgICAgICAgIF0KICAgICAgICAgIH0KICAgICAgICB9LAogICAgICAgICJjaHVua19rZXlfZW5jb2RpbmciOiB7CiAgICAgICAgICAibmFtZSI6ICJkZWZhdWx0IiwKICAgICAgICAgICJjb25maWd1cmF0aW9uIjogewogICAgICAgICAgICAic2VwYXJhdG9yIjogIi8iCiAgICAgICAgICB9CiAgICAgICAgfSwKICAgICAgICAiZmlsbF92YWx1ZSI6IDAuMCwKICAgICAgICAiY29kZWNzIjogWwogICAgICAgICAgewogICAgICAgICAgICAibmFtZSI6ICJieXRlcyIsCiAgICAgICAgICAgICJjb25maWd1cmF0aW9uIjogewogICAgICAgICAgICAgICJlbmRpYW4iOiAibGl0dGxlIgogICAgICAgICAgICB9CiAgICAgICAgICB9LAogICAgICAgICAgewogICAgICAgICAgICAibmFtZSI6ICJ6c3RkIiwKICAgICAgICAgICAgImNvbmZpZ3VyYXRpb24iOiB7CiAgICAgICAgICAgICAgImxldmVsIjogMCwKICAgICAgICAgICAgICAiY2hlY2tzdW0iOiBmYWxzZQogICAgICAgICAgICB9CiAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiYXR0cmlidXRlcyI6IHsKICAgICAgICAgICJfRmlsbFZhbHVlIjogIkFBQUFBQUFBK0g4PSIKICAgICAgICB9LAogICAgICAgICJkaW1lbnNpb25fbmFtZXMiOiBbCiAgICAgICAgICAibG9uIgogICAgICAgIF0sCiAgICAgICAgInphcnJfZm9ybWF0IjogMywKICAgICAgICAibm9kZV90eXBlIjogImFycmF5IiwKICAgICAgICAic3RvcmFnZV90cmFuc2Zvcm1lcnMiOiBbXQogICAgICB9CiAgICB9CiAgfSwKICAibm9kZV90eXBlIjogImdyb3VwIgp9",
+  "bafkr4ifysp246qb32nooik7bsg3xqc5olxqxdhy2dibb4c3xxxpakqy36e": "ewogICJzaGFwZSI6IFsKICAgIDQKICBdLAogICJkYXRhX3R5cGUiOiAiZmxvYXQ2NCIsCiAgImNodW5rX2dyaWQiOiB7CiAgICAibmFtZSI6ICJyZWd1bGFyIiwKICAgICJjb25maWd1cmF0aW9uIjogewogICAgICAiY2h1bmtfc2hhcGUiOiBbCiAgICAgICAgNAogICAgICBdCiAgICB9CiAgfSwKICAiY2h1bmtfa2V5X2VuY29kaW5nIjogewogICAgIm5hbWUiOiAiZGVmYXVsdCIsCiAgICAiY29uZmlndXJhdGlvbiI6IHsKICAgICAgInNlcGFyYXRvciI6ICIvIgogICAgfQogIH0sCiAgImZpbGxfdmFsdWUiOiAwLjAsCiAgImNvZGVjcyI6IFsKICAgIHsKICAgICAgIm5hbWUiOiAiYnl0ZXMiLAogICAgICAiY29uZmlndXJhdGlvbiI6IHsKICAgICAgICAiZW5kaWFuIjogImxpdHRsZSIKICAgICAgfQogICAgfSwKICAgIHsKICAgICAgIm5hbWUiOiAienN0ZCIsCiAgICAgICJjb25maWd1cmF0aW9uIjogewogICAgICAgICJsZXZlbCI6IDAsCiAgICAgICAgImNoZWNrc3VtIjogZmFsc2UKICAgICAgfQogICAgfQogIF0sCiAgImF0dHJpYnV0ZXMiOiB7fSwKICAiZGltZW5zaW9uX25hbWVzIjogWwogICAgImxhdCIKICBdLAogICJ6YXJyX2Zvcm1hdCI6IDMsCiAgIm5vZGVfdHlwZSI6ICJhcnJheSIsCiAgInN0b3JhZ2VfdHJhbnNmb3JtZXJzIjogW10KfQ==",
+  "bafkr4ihmv4rapvqddmvhiy3l2zc5vnlavxnjwiqhpgr26q7723ymyi6c74": "ewogICJzaGFwZSI6IFsKICAgIDYKICBdLAogICJkYXRhX3R5cGUiOiAiZmxvYXQ2NCIsCiAgImNodW5rX2dyaWQiOiB7CiAgICAibmFtZSI6ICJyZWd1bGFyIiwKICAgICJjb25maWd1cmF0aW9uIjogewogICAgICAiY2h1bmtfc2hhcGUiOiBbCiAgICAgICAgNgogICAgICBdCiAgICB9CiAgfSwKICAiY2h1bmtfa2V5X2VuY29kaW5nIjogewogICAgIm5hbWUiOiAiZGVmYXVsdCIsCiAgICAiY29uZmlndXJhdGlvbiI6IHsKICAgICAgInNlcGFyYXRvciI6ICIvIgogICAgfQogIH0sCiAgImZpbGxfdmFsdWUiOiAwLjAsCiAgImNvZGVjcyI6IFsKICAgIHsKICAgICAgIm5hbWUiOiAiYnl0ZXMiLAogICAgICAiY29uZmlndXJhdGlvbiI6IHsKICAgICAgICAiZW5kaWFuIjogImxpdHRsZSIKICAgICAgfQogICAgfSwKICAgIHsKICAgICAgIm5hbWUiOiAienN0ZCIsCiAgICAgICJjb25maWd1cmF0aW9uIjogewogICAgICAgICJsZXZlbCI6IDAsCiAgICAgICAgImNoZWNrc3VtIjogZmFsc2UKICAgICAgfQogICAgfQogIF0sCiAgImF0dHJpYnV0ZXMiOiB7fSwKICAiZGltZW5zaW9uX25hbWVzIjogWwogICAgImxvbiIKICBdLAogICJ6YXJyX2Zvcm1hdCI6IDMsCiAgIm5vZGVfdHlwZSI6ICJhcnJheSIsCiAgInN0b3JhZ2VfdHJhbnNmb3JtZXJzIjogW10KfQ==",
+  "bafkr4ihwfbcpgt5veqn7hw2pgzkf6z34nrhc4hkscreq7z4bqn2zhqg65e": "KLUv/SAgxQAAcAAAAAAAgFbAAD5AgFZAAwBAyArdCxwB",
+  "bafyr4ien3weyp7qrsanvp5dwr6b427dwjb4unrxrrxr3jsemlzuam2yksq": "iNgqWCUAAVUeIDeeOGCg4yFqF0vyS7/RRD8i9xYEf4yTU/W9fsBiTC5o2CpYJQABVR4gjPTtlRj+3DJHn/1DOUGHdxhUVrRg9pPo6ZgXH+m+z8z29vb29vY=",
+  "bafyr4iglueebu33cpmsrmbrl6lm65ltvoyd6wmxvlbeo7kilq6xy5kzdeu": "o2ZjaHVua3OlanNoYXJkX2NpZHOB2CpYJQABcR4gjd2Jh/4RkBtX9HaPg818dkh5RsbxjeO0yIxeaAZrCpRrYXJyYXlfc2hhcGWDBAQGa2NodW5rX3NoYXBlgwIEBm9zaGFyZGluZ19jb25maWehcGNodW5rc19wZXJfc2hhcmQIcnByaW1hcnlfYXJyYXlfcGF0aGR0ZW1waG1ldGFkYXRhqGdsYXQvYy8w2CpYJQABVR4g9ihE80+1JBvz2082VF9nfGxOLh1SFEkP54GDdZPA3ulnbG9uL2MvMNgqWCUAAVUeIIoijia5htojacxRdMbtZmbKSlugCL2qBvJmQ0af3IEeaHRpbWUvYy8w2CpYJQABVR4giTHKlrgowIlsQFAMe5EmSkM4sXZ7FlUEu1UTHPh3GpBpemFyci5qc29u2CpYJQABVR4gpwSyFzRiBbba4+sInd8eb/uNgLudRAa/I4EsCDmt6GltbGF0L3phcnIuanNvbtgqWCUAAVUeIGnYnkci1sY7Eb7/mgbVkOvZJtD/4w3qopInfoVsIs+pbWxvbi96YXJyLmpzb27YKlglAAFVHiBhqrP17aHf/A8dUW8ScpEAUe/wuPSB5obuRFqbLVUtn250ZW1wL3phcnIuanNvbtgqWCUAAVUeIE9qnu2+RIhRxpFR0sZMjAnIxazpUNApdUKy6+vVtbW4bnRpbWUvemFyci5qc29u2CpYJQABVR4gWWSizX0CrNBbirZxnRDjwN6SevI8kBa9irCpavoPimVwbWFuaWZlc3RfdmVyc2lvbm9zaGFyZGVkX3phcnJfdjE="
+ },
+ "root_cid": "bafyr4iglueebu33cpmsrmbrl6lm65ltvoyd6wmxvlbeo7kilq6xy5kzdeu"
+}

tests/test_converter.py

@@ -48,7 +48,7 @@ def converter_test_dataset():
     yield ds
 
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_converter_produces_identical_dataset(
     create_ipfs: tuple[str, str],
     converter_test_dataset: xr.Dataset,
@@ -141,7 +141,7 @@ async def test_converter_produces_identical_dataset(
         print("=" * 80)
 
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_hamt_to_sharded_cli_success(
     create_ipfs: tuple[str, str], converter_test_dataset: xr.Dataset, capsys
 ):
@@ -192,7 +192,7 @@ async def test_hamt_to_sharded_cli_success(
         xr.testing.assert_identical(test_ds, ds_from_sharded)
 
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_hamt_to_sharded_cli_default_args(
     create_ipfs: tuple[str, str], converter_test_dataset: xr.Dataset, capsys
 ):
@@ -238,7 +238,7 @@ async def test_hamt_to_sharded_cli_default_args(
         xr.testing.assert_identical(test_ds, ds_from_sharded)
 
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_hamt_to_sharded_cli_invalid_cid(create_ipfs: tuple[str, str], capsys):
     """
     Tests the CLI with an invalid hamt_cid.