|
22 | 22 | from labtrust_gym.pcs.handoff_manifest import ( |
23 | 23 | HANDOFF_TO_CERTIFYEDGE_NAME, |
24 | 24 | HANDOFF_TO_PF_NAME, |
25 | | - emit_handoff_to_certifyedge, |
| 25 | + LABTRUST_TO_CERTIFYEDGE_HANDOFF_NAME, |
26 | 26 | emit_handoff_to_pf, |
| 27 | + write_certifyedge_chain_handoffs, |
27 | 28 | ) |
28 | 29 | from labtrust_gym.pcs.manifest import resolve_pcs_core_root |
29 | 30 | from labtrust_gym.pcs.release_fragment import ( |
|
48 | 49 |
|
49 | 50 | LABTRUST_PROTOCOL_HANDOFF_ARTIFACTS: tuple[str, ...] = ( |
50 | 51 | HANDOFF_TO_CERTIFYEDGE_NAME, |
| 52 | + LABTRUST_TO_CERTIFYEDGE_HANDOFF_NAME, |
51 | 53 | HANDOFF_TO_PF_NAME, |
52 | 54 | LABTRUST_RELEASE_FRAGMENT_NAME, |
53 | 55 | ) |
@@ -136,25 +138,24 @@ def regenerate_release_protocol( |
136 | 138 | export_runtime_receipt(demo_run, work / "runtime_receipt.json", policy_root=root) |
137 | 139 | export_pcs_bundle(demo_run, work / "science_claim_bundle.pending.json", policy_root=root) |
138 | 140 |
|
139 | | - emit_handoff_to_certifyedge( |
| 141 | + write_certifyedge_chain_handoffs( |
140 | 142 | trace_path=work / "trace.json", |
141 | 143 | runtime_receipt_path=work / "runtime_receipt.json", |
142 | | - out_path=work / HANDOFF_TO_CERTIFYEDGE_NAME, |
| 144 | + work_dir=work, |
143 | 145 | policy_root=root, |
144 | 146 | property_id=property_id, |
145 | 147 | release_mode=True, |
146 | 148 | ) |
147 | 149 |
|
148 | 150 | cert_path = work / "trace_certificate.json" |
| 151 | + handoff_ce = work / LABTRUST_TO_CERTIFYEDGE_HANDOFF_NAME |
149 | 152 | subprocess.run( |
150 | 153 | [ |
151 | 154 | ce_bin, |
152 | 155 | "--release-mode", |
153 | 156 | "emit-pcs-certificate", |
154 | | - "--spec", |
155 | | - str(spec), |
156 | | - "--trace", |
157 | | - str(work / "trace.json"), |
| 157 | + "--handoff", |
| 158 | + str(handoff_ce), |
158 | 159 | "--out", |
159 | 160 | str(cert_path), |
160 | 161 | ], |
@@ -241,10 +242,10 @@ def emit_protocol_package_from_release( |
241 | 242 | Returns summary dict with paths and digests. |
242 | 243 | """ |
243 | 244 | release_dir = release_dir.resolve() |
244 | | - emit_handoff_to_certifyedge( |
| 245 | + write_certifyedge_chain_handoffs( |
245 | 246 | trace_path=release_dir / "trace.json", |
246 | 247 | runtime_receipt_path=release_dir / "runtime_receipt.json", |
247 | | - out_path=release_dir / HANDOFF_TO_CERTIFYEDGE_NAME, |
| 248 | + work_dir=release_dir, |
248 | 249 | policy_root=policy_root, |
249 | 250 | property_id=property_id, |
250 | 251 | release_mode=True, |
|
0 commit comments