further defunctorise

Author: hannesm

app/dune

@@ -3,7 +3,7 @@
  (public_name server)
  (modules server)
  (libraries utcp mirage-net-unix cstruct lwt logs ethernet arp.mirage
-   tcpip.ipv4 mirage-crypto-rng-mirage mirage-unix mirage-clock-unix lwt.unix
+   tcpip.ipv4 mirage-crypto-rng.unix mirage-unix lwt.unix
    cmdliner logs.fmt fmt.cli logs.cli fmt.tty mtime.clock.os)
  (optional))
 
@@ -12,8 +12,8 @@
  (public_name single)
  (modules single)
  (libraries utcp mirage-net-unix cstruct lwt logs ethernet arp.mirage
-   mirage-crypto-rng-mirage tcpip.ipv4 mirage-crypto-rng mirage-unix
-   mirage-clock-unix lwt.unix cmdliner logs.fmt fmt.cli logs.cli fmt.tty
+   mirage-crypto-rng.unix tcpip.ipv4 mirage-crypto-rng mirage-unix
+   lwt.unix cmdliner logs.fmt fmt.cli logs.cli fmt.tty
    mtime.clock.os)
  (optional))
 

app/server.ml

@@ -27,7 +27,7 @@ let cb ~proto ~src ~dst payload =
 let jump () =
   Printexc.record_backtrace true;
   Lwt_main.run (
-    Mirage_crypto_rng_mirage.initialize (module Mirage_crypto_rng.Fortuna) >>= fun () ->
+    Mirage_crypto_rng_unix.use_default ();
     Netif.connect "tap2" >>= fun tap ->
     Ethernet.connect tap >>= fun eth ->
     ARP.connect eth >>= fun arp ->

app/single.ml

@@ -31,7 +31,7 @@ let tcp_cb ~src ~dst payload =
 let jump _ src src_port dst dst_port syn fin rst push ack seq window data =
   Printexc.record_backtrace true;
   Lwt_main.run (
-    Mirage_crypto_rng_mirage.initialize (module Mirage_crypto_rng.Fortuna) >>= fun () ->
+    Mirage_crypto_rng_unix.use_default ();
     let cidr = Ipaddr.V4.Prefix.of_string_exn src
     and dst = Ipaddr.(V4 (V4.of_string_exn dst))
     in

mirage/dune

@@ -1,4 +1,4 @@
 (library
  (name utcp_mirage)
  (public_name utcp.mirage)
- (libraries utcp lwt tcpip mirage-crypto-rng-mirage mirage-time mirage-clock))
+ (libraries utcp lwt tcpip mirage-mtime mirage-crypto-rng mirage-sleep))

mirage/utcp_mirage.ml

@@ -3,9 +3,9 @@ open Lwt.Infix
 let src = Logs.Src.create "tcp.mirage" ~doc:"TCP mirage"
 module Log = (val Logs.src_log src : Logs.LOG)
 
-module Make (Mclock : Mirage_clock.MCLOCK) (Time : Mirage_time.S) (Ip : Tcpip.Ip.S with type ipaddr = Ipaddr.t) = struct
+module Make (Ip : Tcpip.Ip.S with type ipaddr = Ipaddr.t) = struct
 
-  let now () = Mtime.of_uint64_ns (Mclock.elapsed_ns ())
+  let now () = Mtime.of_uint64_ns (Mirage_mtime.elapsed_ns ())
 
   type error = Tcpip.Tcp.error
 
@@ -209,7 +209,7 @@ module Make (Mclock : Mirage_clock.MCLOCK) (Time : Mirage_time.S) (Ip : Tcpip.Ip
             drops;
           (* TODO do not ignore IP write error *)
           Lwt_list.iter_p (fun data -> output_ip t data >|= ignore) outs >>= fun () ->
-          Time.sleep_ns (Duration.of_ms 100) >>= fun () ->
+          Mirage_sleep.ns (Duration.of_ms 100) >>= fun () ->
           (timer [@tailcall]) (succ n)
         in
         timer 0);

mirage/utcp_mirage.mli

@@ -1,5 +1,5 @@
 
-module Make (Mclock : Mirage_clock.MCLOCK) (Time : Mirage_time.S) (Ip : Tcpip.Ip.S with type ipaddr = Ipaddr.t) : sig
+module Make (Ip : Tcpip.Ip.S with type ipaddr = Ipaddr.t) : sig
   include Tcpip.Tcp.S with type ipaddr = Ip.ipaddr
 
   val connect : string -> Ip.t -> t

utcp.opam

@@ -22,19 +22,17 @@ depends: [
   #for mirage sublibrary
   "lwt" {>= "5.4.2"}
   "mirage-crypto-rng-mirage" {>= "1.0.0"}
-  "mirage-time" {>= "2.0.1"}
-  "mirage-clock" {>= "3.1.0"}
-  "tcpip" {>= "8.0.1"}
+  "mirage-sleep" {>= "4.0.0"}
+  "mirage-mtime" {>= "5.0.0"}
+  "tcpip" {>= "9.0.0"}
   "mirage-flow" {>= "4.0.0"}
   #for apps
-  "mirage-crypto-rng" {>= "1.0.0" & dev}
-  "mirage-crypto-rng-mirage"
+  "mirage-crypto-rng" {>= "1.2.0" & dev}
   "cmdliner" {>= "1.1.0" & dev}
   "mirage-net-unix" {>= "2.8.0" & dev}
   "ethernet" {>= "2.2.1" & dev}
-  "arp" {>= "2.3.0" & dev}
+  "arp" {>= "4.0.0" & dev}
   "mirage-unix" {>= "5.0.0" & dev}
-  "mirage-clock-unix" {>= "3.1.0" & dev}
   "pcap-format" {>= "0.6.0" & dev}
   "alcotest" {>= "1.5.0" & with-test}
   "crowbar" {>= "0.2.1" & with-test}