Merge pull request #298 from hannesm/mirage-random-c

use Mirage_random.C instead of 'S with type buffer'
mirage · Mar 6, 2017 · ea77329 · ea77329
2 parents efd0156 + 3122f8d
commit ea77329
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/lib/tcp/flow.ml b/lib/tcp/flow.ml
@@ -20,7 +20,7 @@ open Result
 let src = Logs.Src.create "flow" ~doc:"Mirage TCP Flow module"
 module Log = (val Logs.src_log src : Logs.LOG)
 
-module Make(IP:Mirage_protocols_lwt.IP)(TM:Mirage_time_lwt.S)(C:Mirage_clock.MCLOCK)(R:Mirage_random.S with type buffer = Cstruct.t) = struct
+module Make(IP:Mirage_protocols_lwt.IP)(TM:Mirage_time_lwt.S)(C:Mirage_clock.MCLOCK)(R:Mirage_random.C) = struct
 
   module Pcb = Pcb.Make(IP)(TM)(C)(R)
 

diff --git a/lib/tcp/flow.mli b/lib/tcp/flow.mli
@@ -17,7 +17,7 @@
 module Make (IP:Mirage_protocols_lwt.IP)
             (TM:Mirage_time_lwt.S)
             (C:Mirage_clock.MCLOCK)
-            (R:Mirage_random.S with type buffer = Cstruct.t) : sig
+            (R:Mirage_random.C) : sig
   include Mirage_protocols_lwt.TCP
     with type ip = IP.t
      and type ipaddr = IP.ipaddr

diff --git a/lib/tcp/pcb.ml b/lib/tcp/pcb.ml
@@ -21,7 +21,7 @@ open !Result
 let src = Logs.Src.create "pcb" ~doc:"Mirage TCP PCB module"
 module Log = (val Logs.src_log src : Logs.LOG)
 
-module Make(Ip:Mirage_protocols_lwt.IP)(Time:Mirage_time_lwt.S)(Clock:Mirage_clock.MCLOCK)(Random:Mirage_random.S with type buffer = Cstruct.t) =
+module Make(Ip:Mirage_protocols_lwt.IP)(Time:Mirage_time_lwt.S)(Clock:Mirage_clock.MCLOCK)(Random:Mirage_random.C) =
 struct
 
   module RXS = Segment.Rx(Time)

diff --git a/lib/tcp/pcb.mli b/lib/tcp/pcb.mli
@@ -16,7 +16,7 @@
 
 open !Result
 
-module Make(Ip:Mirage_protocols_lwt.IP)(Time:Mirage_time_lwt.S)(Clock:Mirage_clock.MCLOCK)(Random:Mirage_random.S with type buffer = Cstruct.t) : sig
+module Make(Ip:Mirage_protocols_lwt.IP)(Time:Mirage_time_lwt.S)(Clock:Mirage_clock.MCLOCK)(Random:Mirage_random.C) : sig
 
   (** Overall state of the TCP stack *)
   type t

diff --git a/lib/tcpip_stack_direct.ml b/lib/tcpip_stack_direct.ml
@@ -29,7 +29,7 @@ module type TCPV4_DIRECT = Mirage_protocols_lwt.TCPV4
 
 module Make
     (Time    : Mirage_time.S)
-    (Random  : Mirage_random.S)
+    (Random  : Mirage_random.C)
     (Netif   : Mirage_net_lwt.S)
     (Ethif   : Mirage_protocols_lwt.ETHIF with type netif = Netif.t)
     (Arpv4   : Mirage_protocols_lwt.ARP)

diff --git a/lib/tcpip_stack_direct.mli b/lib/tcpip_stack_direct.mli
@@ -23,7 +23,7 @@ module type TCPV4_DIRECT = Mirage_protocols_lwt.TCPV4
 
 module Make
     (Time    : Mirage_time.S)
-    (Random  : Mirage_random.S)
+    (Random  : Mirage_random.C)
     (Netif   : Mirage_net_lwt.S)
     (Ethif   : Mirage_protocols_lwt.ETHIF with type netif = Netif.t)
     (Arpv4   : Mirage_protocols_lwt.ARP)

diff --git a/lib/udp/udp.ml b/lib/udp/udp.ml
@@ -22,7 +22,7 @@ module Log = (val Logs.src_log src : Logs.LOG)
 
 let pp_ips = Format.pp_print_list Ipaddr.pp_hum
 
-module Make(Ip: Mirage_protocols_lwt.IP)(Random:Mirage_random.S with type buffer = Cstruct.t) = struct
+module Make(Ip: Mirage_protocols_lwt.IP)(Random:Mirage_random.C) = struct
 
   type 'a io = 'a Lwt.t
   type buffer = Cstruct.t

diff --git a/lib/udp/udp.mli b/lib/udp/udp.mli
@@ -15,7 +15,7 @@
  *)
 
 
-module Make (IP:Mirage_protocols_lwt.IP)(R:Mirage_random.S with type buffer = Cstruct.t) : sig
+module Make (IP:Mirage_protocols_lwt.IP)(R:Mirage_random.C) : sig
   include Mirage_protocols_lwt.UDP
     with type ip = IP.t
      and type ipaddr = IP.ipaddr