repo: Make sure signature order stays reproducible

Unfortunately I'm not sure if I can reproduce the same order as before... This now sorts by keyid
theupdateframework · Oct 19, 2023 · 7899655 · 7899655
1 parent 18de53d
commit 7899655
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/repo/tuf_on_ci/_repository.py b/repo/tuf_on_ci/_repository.py
@@ -76,7 +76,9 @@ def from_verification_result(
         cls, original: VerificationResult, delegator: Root | Targets
     ):
         signed = [delegator.get_key(keyid) for keyid in original.signed]
+        signed.sort(key=lambda key: key.keyid)
         unsigned = [delegator.get_key(keyid) for keyid in original.unsigned]
+        unsigned.sort(key=lambda key: key.keyid)
         return VerificationResultWithKeys(original.verified, signed, unsigned)
 
     def __bool__(self) -> bool:

diff --git a/tests/expected/target-file-changes/metadata/3.targets.json b/tests/expected/target-file-changes/metadata/3.targets.json
@@ -1,11 +1,11 @@
 {
  "signatures": [
   {
-   "keyid": "95da323daa78f7b2557ae91e23be619ff932f9aec035abd4e40301405b363999",
+   "keyid": "204fd0866b874c8ba288726cb9c3e41fcdf22dd36c95816d31b7cbfb7b68b198",
    "sig": "XXX"
   },
   {
-   "keyid": "204fd0866b874c8ba288726cb9c3e41fcdf22dd36c95816d31b7cbfb7b68b198",
+   "keyid": "95da323daa78f7b2557ae91e23be619ff932f9aec035abd4e40301405b363999",
    "sig": "XXX"
   }
  ],