From 348f6beb0fc94da587021cab5a3b03a2a4de431f Mon Sep 17 00:00:00 2001
From: swrup <swrup@protonmail.com>
Date: Sun, 2 Nov 2025 18:58:23 +0100
Subject: [PATCH] ~

---
 unikernel/unikernel.ml | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/unikernel/unikernel.ml b/unikernel/unikernel.ml
index 6e8ce596..ea9a90be 100644
--- a/unikernel/unikernel.ml
+++ b/unikernel/unikernel.ml
@@ -29,31 +29,32 @@ let alpn =
 let ( <.> ) f g x = f (g x)
 let always x _ = x
 
+let map_err_to_string pp_err res =
+  Lwt.map (R.reword_error (R.msgf "%a" pp_err)) res
+
 module Make
-    (Certificate : Mirage_kv.RO)
-    (Key : Mirage_kv.RO)
+    (Certificates_ro : Mirage_kv.RO)
+    (Keys_ro : Mirage_kv.RO)
     (Tcp : Tcpip.Tcp.S with type ipaddr = Ipaddr.t)
     (Connect : Connect.S)
     (HTTP_server : Paf_mirage.S) =
 struct
   let tls certificate_ro key_ro =
     let ( >>= ) = Lwt_result.bind in
-    Key.list key_ro Mirage_kv.Key.empty
-    |> Lwt.map (R.reword_error (R.msgf "%a" Key.pp_error))
+    Keys_ro.list key_ro Mirage_kv.Key.empty
+    |> map_err_to_string Keys_ro.pp_error
     >>= fun keys ->
-    let keys, _ = List.partition (fun (_, t) -> t = `Value) keys in
-    Certificate.list certificate_ro Mirage_kv.Key.empty
-    |> Lwt.map (R.reword_error (R.msgf "%a" Certificate.pp_error))
+    let keys = List.filter (fun (_, t) -> t = `Value) keys in
+    Certificates_ro.list certificate_ro Mirage_kv.Key.empty
+    |> map_err_to_string Certificates_ro.pp_error
     >>= fun certificates ->
-    let certificates, _ =
-      List.partition (fun (_, t) -> t = `Value) certificates
-    in
+    let certificates = List.filter (fun (_, t) -> t = `Value) certificates in
     let fold acc (name, _) =
       match Mirage_kv.Key.basename name with
       | ".gitkeep" -> Lwt.return acc
       | _ ->
-          Certificate.get certificate_ro name
-          |> Lwt.map (R.reword_error (R.msgf "%a" Certificate.pp_error))
+          Certificates_ro.get certificate_ro name
+          |> map_err_to_string Certificates_ro.pp_error
           >>= (Lwt.return <.> X509.Certificate.decode_pem_multiple)
           >>= fun certificates ->
           Lwt.return acc >>= fun acc ->
@@ -64,8 +65,8 @@ struct
       match Mirage_kv.Key.basename name with
       | ".gitkeep" -> Lwt.return acc
       | _ ->
-          Key.get key_ro name
-          |> Lwt.map (R.reword_error (R.msgf "%a" Key.pp_error))
+          Keys_ro.get key_ro name
+          |> map_err_to_string Keys_ro.pp_error
           >>= (Lwt.return <.> X509.Private_key.decode_pem)
           >>= fun key ->
           Lwt.return acc >>= fun acc -> Lwt.return_ok ((name, key) :: acc)