ok compile

src/signatures.ml

@@ -155,21 +155,15 @@ end) : sig
   type r = R.r
   type t
 
-  val sign_f : f:(string -> eddsa_sig) -> r -> t
-
-  (* TODO
-     - just directly verify here?
-     - type for `theirs` and `ours` signatures? *)
-  val verify_f :
-    f:(eddsa_sig -> msg:string -> (unit, string) result) ->
-    t ->
-    r ->
-    (unit, string) result
+  val signf : (string -> EddsaSignature.t) -> r -> t
 
+  (* todo
+     - could have another functor with `verify`'s key set to config's master_public_key
+     - type for unknown/verified signatures? (nk/ok) *)
+  val verify : EddsaPublicKey.t -> t -> r -> (unit, string) result
   val jsont : t Jsont.t
   val caqti : t Caqti_type.t
 
-  (* TODO rm *)
   (* escape hatch, only needed for /keys `exchange_sig` (signature over contatentation of all of the master_sigs) *)
   val to_octets : t -> string
 end = struct
@@ -179,8 +173,8 @@ end = struct
   type t = EddsaSignature.t
 
   let to_string = Bin.to_string R.bin
-  let sign_f ~f r = f (to_string r)
-  let verify_f ~f t r = f t ~msg:(to_string r)
+  let verify key t r = EddsaSignature.verify ~key t ~msg:(to_string r)
+  let signf f r = f (to_string r)
   let jsont = EddsaSignature.jsont
   let caqti : EddsaSignature.t Caqti_type.t = EddsaSignature.caqti
   let to_octets t = EddsaSignature.to_octets t