rename
This commit is contained in:
parent
24b9adc300
commit
f6cf06591b
7 changed files with 30 additions and 30 deletions
|
|
@ -11,10 +11,10 @@ module type S = sig
|
|||
|
||||
(* TODO query database instead? *)
|
||||
val get_sm_key_pub : unit -> eddsa_pub
|
||||
val get_signkeys_data : unit -> Signkey_data.t list
|
||||
val get_denoms_data : unit -> Denom_data.t list
|
||||
val find_signkey_data : eddsa_pub -> Signkey_data.t option
|
||||
val find_denom_data : denomination_hash -> Denom_data.t option
|
||||
val get_signkeys_data : unit -> Signkey.t list
|
||||
val get_denoms_data : unit -> Denomination.t list
|
||||
val find_signkey_data : eddsa_pub -> Signkey.t option
|
||||
val find_denomination : denomination_hash -> Denomination.t option
|
||||
val find_denom_section_name : denomination_hash -> string option
|
||||
|
||||
(* - management operations - *)
|
||||
|
|
@ -57,12 +57,12 @@ module Make (Conn : Pg.CONN) = struct
|
|||
|
||||
type signkey = {
|
||||
priv: eddsa_priv;
|
||||
sk_data: Signkey_data.t;
|
||||
sk_data: Signkey.t;
|
||||
}
|
||||
|
||||
type denom = {
|
||||
priv: rsa_priv;
|
||||
dn_data: Denom_data.t;
|
||||
dn_data: Denomination.t;
|
||||
}
|
||||
|
||||
type t = {
|
||||
|
|
@ -84,7 +84,7 @@ module Make (Conn : Pg.CONN) = struct
|
|||
(Fpath.to_string fname)
|
||||
| Some sk_data -> Ok sk_data
|
||||
|
||||
let db_lookup_denom_data conn ~section_name priv =
|
||||
let db_lookup_denomination conn ~section_name priv =
|
||||
let pub = RsaPrivateKey.pub_of_priv priv in
|
||||
let h_pub = Hash.DenominationHash.hash (RsaPublicKey.to_octets pub) in
|
||||
let* opt = Pg.find_denom conn h_pub |> unwrap_err_caqti in
|
||||
|
|
@ -133,7 +133,7 @@ module Make (Conn : Pg.CONN) = struct
|
|||
| None -> Ok None
|
||||
| Some priv ->
|
||||
(* todo: could check that coin config match db values *)
|
||||
let* dn_data = db_lookup_denom_data conn ~section_name priv in
|
||||
let* dn_data = db_lookup_denomination conn ~section_name priv in
|
||||
Hashtbl.replace dn_section_name_ht dn_data.h_pub section_name;
|
||||
let denom = { priv; dn_data } in
|
||||
Ok (Some denom))
|
||||
|
|
@ -177,7 +177,7 @@ module Make (Conn : Pg.CONN) = struct
|
|||
let master_sig = None in
|
||||
let revoked_sig = None in
|
||||
let sk_data =
|
||||
Signkey_data.
|
||||
Signkey.
|
||||
{ pub; stamp_start; stamp_expire; stamp_end; master_sig; revoked_sig }
|
||||
in
|
||||
{ priv; sk_data }
|
||||
|
|
@ -217,7 +217,7 @@ module Make (Conn : Pg.CONN) = struct
|
|||
let master_sig = None in
|
||||
let revoked_sig = None in
|
||||
let dn_data =
|
||||
Denom_data.
|
||||
Denomination.
|
||||
{
|
||||
pub;
|
||||
value;
|
||||
|
|
@ -317,7 +317,7 @@ module Make (Conn : Pg.CONN) = struct
|
|||
let find_signkey_data pub =
|
||||
find_signkey pub |> Option.map (fun v -> v.sk_data)
|
||||
|
||||
let find_denom_data h_denom =
|
||||
let find_denomination h_denom =
|
||||
find_denom h_denom |> Option.map (fun v -> v.dn_data)
|
||||
|
||||
let find_denom_section_name h_denom =
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue