src/keys.ml

@@ -4,6 +4,8 @@ type 'a result = ('a, string) Result.t
 module type S = Mod_intf.S
 
 module Make (Conn : Pg.CONN) = struct
+  let conn = (module Conn : Pg.CONN)
+
   open Syntax
   open Crypto
 
@@ -28,7 +30,6 @@ module Make (Conn : Pg.CONN) = struct
     | Ok v -> v
 
   (* - *)
-  let conn = (module Conn : Pg.CONN)
   let find_signkey pub = Pg.find_signkey conn pub |> unwrap_err_caqti
   let find_denomination h_pub = Pg.find_denom conn h_pub |> unwrap_err_caqti
 
@@ -270,25 +271,21 @@ module Make (Conn : Pg.CONN) = struct
 
   let revoke_signkey pub revoked_sig =
     let* opt = find_signkey pub in
-    match opt with
+    let* _sk = Option.to_result ~none:"signkey not found" opt in
-    | None -> Error "signkey not found"
+    let* () = Secmod_eddsa.revoke pub in
-    | Some _sk ->
+    let+ () =
-        let* () = Secmod_eddsa.revoke pub in
+      Pg.insert_signkey_revocation conn pub revoked_sig |> unwrap_err_caqti
-        let+ () =
+    in
-          Pg.insert_signkey_revocation conn pub revoked_sig |> unwrap_err_caqti
+    ()
-        in
-        ()
 
   let revoke_denomination h_pub revoked_sig =
     let* opt = find_denomination h_pub in
-    match opt with
+    let* dn = Option.to_result ~none:"denomination not found" opt in
-    | None -> Error "denomination not found"
+    let pub = dn.pub in
-    | Some sk ->
+    let* () = Secmod_rsa.revoke pub in
-        let pub = sk.pub in
+    let+ () =
-        let* () = Secmod_rsa.revoke pub in
+      Pg.insert_denomination_revocation conn h_pub revoked_sig
-        let+ () =
+      |> unwrap_err_caqti
-          Pg.insert_denomination_revocation conn h_pub revoked_sig
+    in
-          |> unwrap_err_caqti
+    ()
-        in
-        ()
 end