This commit is contained in:
parent
24b9adc300
commit
4af1b0227e
7 changed files with 30 additions and 30 deletions
|
|
@ -24,7 +24,7 @@ let config req _server _env =
|
|||
for now we only have one item in each "denom group"
|
||||
change this once we have denom/signkey rotation *)
|
||||
let denomgroup_of_denomdata
|
||||
Denom_data.
|
||||
Denomination.
|
||||
{
|
||||
pub;
|
||||
value;
|
||||
|
|
@ -120,16 +120,16 @@ let mk_keys ~db_conn (module Sm : Secmod.S) ~last_issue_date =
|
|||
let denom_data_l =
|
||||
(* reverse chronological order *)
|
||||
List.sort
|
||||
(fun a b -> Stdlib.compare b.Denom_data.stamp_start a.stamp_start)
|
||||
(fun a b -> Stdlib.compare b.Denomination.stamp_start a.stamp_start)
|
||||
denom_data_l
|
||||
in
|
||||
let list_issue_date =
|
||||
match denom_data_l with
|
||||
| [] -> Time.Timestamp.never
|
||||
| v :: _ -> v.Denom_data.stamp_start
|
||||
| v :: _ -> v.Denomination.stamp_start
|
||||
in
|
||||
let denominations =
|
||||
let open Denom_data in
|
||||
let open Denomination in
|
||||
(* if `?last_issue_date` query param does not exactly match the `stamp_start`
|
||||
of one of the denomination keys, all keys are returned *)
|
||||
let l =
|
||||
|
|
@ -162,12 +162,12 @@ let mk_keys ~db_conn (module Sm : Secmod.S) ~last_issue_date =
|
|||
let signkey_data_l =
|
||||
List.sort
|
||||
(fun a b ->
|
||||
let open Signkey_data in
|
||||
let open Signkey in
|
||||
Stdlib.compare b.stamp_start a.stamp_start)
|
||||
signkey_data_l
|
||||
in
|
||||
List.filter_map
|
||||
(fun Signkey_data.
|
||||
(fun Signkey.
|
||||
{
|
||||
pub;
|
||||
stamp_start;
|
||||
|
|
@ -197,7 +197,7 @@ let mk_keys ~db_conn (module Sm : Secmod.S) ~last_issue_date =
|
|||
chronological order by group) in the arrays under "denominations". *)
|
||||
let hc =
|
||||
denom_data_l
|
||||
|> List.filter_map (fun v -> v.Denom_data.master_sig)
|
||||
|> List.filter_map (fun v -> v.Denomination.master_sig)
|
||||
|> List.map Signatures.DenominationKeyValidity.to_octets
|
||||
|> String.concat ""
|
||||
|> Hash.H64.hash
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue