+ signkey caqti

src/secmod.ml

@@ -92,9 +92,7 @@ let add_signkey_master_signatures conn t l =
       | Some signkey ->
           let sk_data = { signkey.sk_data with master_sig= Some master_sig } in
           let signkey = { signkey with sk_data } in
-          let* () =
-            Pg.activate_signing_key conn ~master_sig sk_data |> unwrap_err_caqti
-          in
+          let* () = Pg.insert_signkey conn sk_data |> unwrap_err_caqti in
           Hashtbl.replace t.sk_ht pub signkey;
           Ok ())
     l
@@ -137,20 +135,14 @@ let dir = Fpath.(v "data" / "secmod ")
 
 let db_lookup_signkey_data conn fname priv =
   let pub = EddsaPrivateKey.pub_of_priv priv in
-  let* opt = Pg.lookup_signing_key conn pub in
+  let* opt = Pg.find_signkey conn pub in
   match opt with
   | None ->
       Fmt.error_msg
-        "load_signkey error no associated metadata found in database for \
-         signkey `%s`."
+        "load_signkey error: no associated data found in database for signkey \
+         `%s`."
         (Fpath.to_string fname)
-  | Some (stamp_start, stamp_expire, stamp_end) ->
-      (* TODO master_sig *)
-      let master_sig = None in
-      let v =
-        Signkey_data.{ pub; stamp_start; stamp_expire; stamp_end; master_sig }
-      in
-      Ok v
+  | Some sk_data -> Ok sk_data
 
 let db_lookup_denom_data conn ~section_name priv =
   let pub = RsaPrivateKey.pub_of_priv priv in