swrup/mte
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add Syntax.list_filter_map

Browse source
This commit is contained in:
swrup 2026-02-23 11:45:27 +01:00
parent c8863e1a95
commit 08d18467f8
4 changed files with 76 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

86
src/keys.ml
View file

@ -140,56 +140,46 @@ module Make (Conn : Pg.CONN) : S = struct
}
let future_signkeys () =
let l : Sm_eddsa.info list = Sm_eddsa.keys () in
let+ l =
list_map
(fun (pub, t1, t2) ->
let* opt = find_signkey pub in
match opt with
| None ->
let future_sk = make_future_sk ~pub ~start:t1 ~expire:t2 in
Ok (Some future_sk)
| Some sk -> (
match Timestamp.of_absolute t1 = sk.stamp_start with
| false ->
Fmt.error
"secmod/database stamp_start mismatch for signkey `%s`"
(EddsaPublicKey.to_b32 pub)
| true -> Ok None))
l
in
List.filter_map Fun.id l
Sm_eddsa.keys ()
|> list_filter_map (fun (pub, t1, t2) ->
let* opt = find_signkey pub in
match opt with
| None ->
let future_sk = make_future_sk ~pub ~start:t1 ~expire:t2 in
Ok (Some future_sk)
| Some sk -> (
match Timestamp.of_absolute t1 = sk.stamp_start with
| false ->
Fmt.error
"secmod/database stamp_start mismatch for signkey `%s`"
(EddsaPublicKey.to_b32 pub)
| true -> Ok None))
let future_denominations () =
let+ l =
list_map
(fun (section_name, pub, t1) ->
let h_pub = Hash.DenominationHash.hash (RsaPublicKey.to_octets pub) in
let* opt = find_denomination h_pub in
match opt with
| None ->
let* coin =
Config.Coin.all_coins
|> List.find_opt (fun coin ->
coin.Config.Coin.section_name = section_name)
|> function
| Some v -> Ok v
| None ->
Fmt.error "coin `%s` not found in configuration"
section_name
in
let future_dn = make_future_dn ~coin ~pub ~start:t1 in
Ok (Some future_dn)
| Some sk -> (
match Timestamp.of_absolute t1 = sk.stamp_start with
| false ->
Fmt.error
"secmod/database stamp_start mismatch for denomination `%s`"
section_name
| true -> Ok None))
(Sm_rsa.keys ())
in
List.filter_map Fun.id l
Sm_rsa.keys ()
|> list_filter_map (fun (section_name, pub, t1) ->
let h_pub = Hash.DenominationHash.hash (RsaPublicKey.to_octets pub) in
let* opt = find_denomination h_pub in
match opt with
| None ->
let* coin =
Config.Coin.all_coins
|> List.find_opt (fun coin ->
coin.Config.Coin.section_name = section_name)
|> function
| Some v -> Ok v
| None ->
Fmt.error "coin `%s` not found in configuration" section_name
in
let future_dn = make_future_dn ~coin ~pub ~start:t1 in
Ok (Some future_dn)
| Some sk -> (
match Timestamp.of_absolute t1 = sk.stamp_start with
| false ->
Fmt.error
"secmod/database stamp_start mismatch for denomination `%s`"
section_name
| true -> Ok None))
let make_future_keys_response () =
let* future_signkeys = future_signkeys () in