diff --git a/src/http_keys.ml b/src/http_keys.ml index c94d4ca9..6cedefca 100644 --- a/src/http_keys.ml +++ b/src/http_keys.ml @@ -4,6 +4,9 @@ open Syntax open Api module String_map = Stdlib.Map.Make (Stdlib.String) +(* TODO + 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. { @@ -100,20 +103,14 @@ let mk_keys ~db_conn (module Sm : Secmod.S) ~last_issue_date = (*Pg.get_denominations db_conn |> unwrap_err_caqti *) Sm.get_denoms_data () in - (* TODO check order!! *) let denom_data_l = + (* reverse chronological order *) List.sort - (fun a b -> - let open Denom_data in - Stdlib.compare a.stamp_start b.stamp_start) + (fun a b -> Stdlib.compare b.Denom_data.stamp_start a.stamp_start) denom_data_l in let list_issue_date = - (* TODO is this the last [stamp_start] value? *) - (* date when the denomination keys were last updated *) - match denom_data_l with - | [] -> None - | v :: _ -> v.stamp_start + match denom_data_l with [] -> None | v :: _ -> v.stamp_start in let denominations = (* TODO really need to understand and correctly group denoms @@ -130,7 +127,7 @@ let mk_keys ~db_conn (module Sm : Secmod.S) ~last_issue_date = List.sort (fun a b -> let open Signkey_data in - Stdlib.compare a.stamp_start b.stamp_start) + Stdlib.compare b.stamp_start a.stamp_start) signkey_data_l in List.filter_map