test/validate_response.ml

@@ -35,29 +35,18 @@ let keys content =
              })
   in
 
+  let sk_l = List.map SignKey.to_signkey v.signkeys in
   let* () =
-    let open SignKey in
-    v.signkeys
+    sk_l
     |> list_iter
-         (fun { key; stamp_start; stamp_expire; stamp_end; master_sig } ->
-           let open Signatures.ExchangeSigningKeyValidity in
-           verify v.master_public_key master_sig
-             {
-               R.start= stamp_start;
-               expire= stamp_expire;
-               end_= stamp_end;
-               signkey_pub= key;
-             })
+         (Signkey.verify_exchange_signing_key_validity ~key:v.exchange_pub)
   in
 
   let* () =
-    let opt =
-      List.find_opt (fun sk -> sk.SignKey.key = v.exchange_pub) v.signkeys
-    in
+    let opt = List.find_opt (fun sk -> sk.Signkey.pub = v.exchange_pub) sk_l in
     match opt with
     | None -> Fmt.error "exchange_pub is not in signkeys list"
     | Some sk ->
-        let sk = SignKey.to_signkey sk in
         (* TODO will need to fake time to validate expired data *)
         let now = Timestamp.of_ptime (Ptime_clock.now ()) in
         if Signkey.is_valid_at ~timestamp:now sk then Ok ()