lib

commit 657801e29b2f719ab42aaaacc48f7f4ba73cd1f1
parent 8a693dd5f37c036cbcb49d5def2909fb7ff2436d
Author: triesap <tyson@radroots.org>
Date:   Sat,  5 Sep 2026 15:07:04 +0000

xtask: admit semantic advisory decision order

Diffstat:
M
tools/xtask/src/advisory_snapshot.rs
 | 
29
+++++++++++++++++++----------

1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/tools/xtask/src/advisory_snapshot.rs b/tools/xtask/src/advisory_snapshot.rs
@@ -1567,11 +1567,11 @@ pub(crate) fn validate_decision(root: &Path) -> Result<(), String> {
     if bytes != DECISION_BYTES {
         return Err("advisory snapshot decision differs from compiled authority".to_owned());
     }
-    let value: Value = serde_json::from_slice(&bytes)
+    let _: Value = serde_json::from_slice(&bytes)
         .map_err(|_| "advisory snapshot decision is invalid".to_owned())?;
-    if canonical_pretty_json(&value).as_slice() != bytes {
-        return Err("advisory snapshot decision is not canonical pretty JSON".to_owned());
-    }
+    // Exact equality with the compiled authority above already binds whitespace
+    // and object-member order. Re-serializing through `Value` would instead sort
+    // object keys and reject the repository's intentional semantic key order.
     Ok(())
 }
 
@@ -5593,12 +5593,6 @@ fn canonical_json(value: &Value) -> Vec<u8> {
     bytes
 }
 
-fn canonical_pretty_json(value: &Value) -> Vec<u8> {
-    let mut bytes = serde_json::to_vec_pretty(value).unwrap_or_default();
-    bytes.push(b'\n');
-    bytes
-}
-
 fn canonical_json_without_lf(value: &Value) -> Vec<u8> {
     serde_json::to_vec(value).unwrap_or_default()
 }
@@ -7545,3 +7539,18 @@ mod tests {
         expired_suppression_vector().expect("expired suppression must fail closed");
     }
 }
+
+#[cfg(test)]
+mod step_296_tests {
+    use super::*;
+
+    #[test]
+    fn checked_in_semantically_ordered_decision_is_accepted() {
+        assert!(DECISION_BYTES.starts_with(b"{\n  \"schema\""));
+        let root = Path::new(env!("CARGO_MANIFEST_DIR"))
+            .parent()
+            .and_then(Path::parent)
+            .expect("xtask manifest must be beneath the workspace root");
+        validate_decision(root).expect("checked-in advisory decision must be accepted");
+    }
+}