remoteRF-server 1.1.0.dev33__py3-none-any.whl → 1.1.0.dev34__py3-none-any.whl

remoteRF_server/server/federation/cluster.py

@@ -623,22 +623,28 @@ def _sync_contract(party: dict, peer: str, directory: list[dict]) -> str:
             parties = {terms.get("deployment_a"), terms.get("deployment_b")}
             if parties != {peer, store.local_deployment_id} or item["version"] != 1 or not item.get("events"):
                 continue
-            store.import_bundle(canonical_json({
-                "protocol_version": "2", "terms": terms, "events": item["events"],
-            }))
-            if store.show(item["contract_id"], 1)["state"] != "revoked":
+            if _import(store, terms, item["events"]) != "revoked":
                 candidates.append((terms["valid_from"], item["contract_id"]))
         if not candidates:
             return party["state"]
         party["contract_id"] = max(candidates)[1]
     for item in directory:
         if item["contract_id"] == party["contract_id"] and item.get("terms"):
-            store.import_bundle(canonical_json({
-                "protocol_version": "2", "terms": item["terms"], "events": item["events"],
-            }))
+            _import(store, item["terms"], item["events"])
     return store.show(party["contract_id"], 1)["state"]
 
 
+def _import(store: ContractStore, terms: dict, events: list) -> str:
+    """Import a directory entry; a contract already revoked here (an earlier
+    cluster between the same labs) is simply reported as such."""
+    try:
+        store.import_bundle(canonical_json({"protocol_version": "2", "terms": terms, "events": events}))
+    except ContractError as exc:
+        if exc.code not in ("contract_revoked", "contract_terminal", "invalid_transition"):
+            raise
+    return store.show(terms["contract_id"], 1)["state"]
+
+
 def _advance(party: dict, peer: str, directory: list[dict], *, label: str, notify, is_member: bool) -> None:
     """Move one bilateral contract one step; notify on active / revoked."""
     before = party.get("state")

{remoterf_server-1.1.0.dev33.dist-info → remoterf_server-1.1.0.dev34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 1.1.0.dev33
+Version: 1.1.0.dev34
 Summary: RemoteRF server-side control package
 License: GPL-3.0-or-later
 Classifier: Programming Language :: Python :: 3

{remoterf_server-1.1.0.dev33.dist-info → remoterf_server-1.1.0.dev34.dist-info}/RECORD

@@ -71,7 +71,7 @@ remoteRF_server/server/deployment/capabilities.py,sha256=20RxmGG03VoQQZnV3jGhc-3
 remoteRF_server/server/federation/__init__.py,sha256=auqdGiGnEGIKQiXX2jFVt8iWmfyZ-V3w4dUmtWDKAZE,735
 remoteRF_server/server/federation/admin.py,sha256=t3F17FIytekzclPICmaFJEA4-F5OuWcDx3rgmFga17A,9187
 remoteRF_server/server/federation/cli.py,sha256=nFlUGmhpndw0RafjeRQjz7cYieKtKy7U60_n738g-s0,9021
-remoteRF_server/server/federation/cluster.py,sha256=dsraUf7wKG4GdqcyhdO195v1ypwSRpFcJdyY5uatHCM,32932
+remoteRF_server/server/federation/cluster.py,sha256=yKGFRAI-RHB_xZivJkxaK_Fniz2XGRUfArJXM_DH2WQ,33207
 remoteRF_server/server/federation/contracts.py,sha256=NYh7lb_9etJHFfzXwevjC4HfSBUypLxg5xGeBgydLF4,29305
 remoteRF_server/server/federation/destination.py,sha256=XawmGCiVbL_MfNNn8xwV9_bYxUDW1L7efCpL11K2JAc,35909
 remoteRF_server/server/federation/devices.py,sha256=n5MvnD0UZyl4sFpiekG9ProanWXTYizYq6YchCflLgY,18061
@@ -90,9 +90,9 @@ remoteRF_server/tools/gen_certs.py,sha256=Vbyu8JjRu__UYPVmyCRXt5SOw0Za1HV7g1md3G
 remoteRF_server/tools/gist_status.py,sha256=SFv2iQgQrIKT9gxKrU-_Dr7S0p0rE4wQM6J3OC6FcoM,4649
 remoteRF_server/tools/gist_status_testing.py,sha256=IYw7UkPjAUpKDTtIlnYGb5g6SJkwz4TRGUfJJ6f4LhQ,2690
 remoteRF_server/tools/introspect_uhd.py,sha256=vUpPb0rM9tsHPxWadS3EfMDE-gMd-TvNV0TjrZOQqBY,4531
-remoterf_server-1.1.0.dev33.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-remoterf_server-1.1.0.dev33.dist-info/METADATA,sha256=4m84njQmG2sgUH0guTvQ-t5pjjbnq7nrcPj7EMKqxmU,42069
-remoterf_server-1.1.0.dev33.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-remoterf_server-1.1.0.dev33.dist-info/entry_points.txt,sha256=_bbKk65PfYi-n6zUjqOiOwcalf_Ws1TCGATIe1TukxE,136
-remoterf_server-1.1.0.dev33.dist-info/top_level.txt,sha256=NuYWe8dSx3qdbxshWBwOgx68EHmJ9I8Zvxam4ARsQ_I,30
-remoterf_server-1.1.0.dev33.dist-info/RECORD,,
+remoterf_server-1.1.0.dev34.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+remoterf_server-1.1.0.dev34.dist-info/METADATA,sha256=HF3Nrx8Y6Id4gZt4THauRMrCve0ZazMtLrMtVsYpyWU,42069
+remoterf_server-1.1.0.dev34.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+remoterf_server-1.1.0.dev34.dist-info/entry_points.txt,sha256=_bbKk65PfYi-n6zUjqOiOwcalf_Ws1TCGATIe1TukxE,136
+remoterf_server-1.1.0.dev34.dist-info/top_level.txt,sha256=NuYWe8dSx3qdbxshWBwOgx68EHmJ9I8Zvxam4ARsQ_I,30
+remoterf_server-1.1.0.dev34.dist-info/RECORD,,