diff --git a/src/pg.ml b/src/pg.ml index 29e8f73f..2579af2a 100644 --- a/src/pg.ml +++ b/src/pg.ml @@ -39,15 +39,12 @@ let preflight = in fun (module Conn : CONN) -> Syntax.list_iter (fun p -> Conn.exec p ()) l -(* TODO revoked_sig - check left join *) +(* TODO revocation master_sig *) let find_signkey = let find_signkey = Caqti_type.(eddsa_pub ->? signkey_data) - "SELECT exchange_pub, valid_from, expire_sign, expire_legal, \ - exchange_sign_keys.master_sig, signkey_revocations.master_sig FROM \ - exchange_sign_keys WHERE exchange_pub=$1 LEFT JOIN signkey_revocations \ - USING (esk_serial)" + "SELECT exchange_pub, valid_from, expire_sign, expire_legal, master_sig, \ + NULL FROM exchange_sign_keys WHERE exchange_pub=$1" in fun (module Conn : CONN) (exchange_pub : EddsaPublicKey.t) -> Conn.find_opt find_signkey exchange_pub @@ -73,7 +70,7 @@ let insert_signkey = in fun (module Conn : CONN) v -> Conn.exec insert_signkey v -(* TODO revokation master_sig *) +(* TODO revocation master_sig *) let find_denom = let find_denom = Caqti_type.(denomination_hash ->? denom_data) diff --git a/src/secmod.ml b/src/secmod.ml index 37078298..6c0090dc 100644 --- a/src/secmod.ml +++ b/src/secmod.ml @@ -78,7 +78,7 @@ module Make (Conn : Pg.CONN) = struct match opt with | None -> Fmt.error - "load_signkey error: no associated data found in database for \ + "load_signkey error, no associated data found in database for \ signkey `%s`." (Fpath.to_string fname) | Some sk_data -> Ok sk_data