Merge pull request #2 from hannesm/easy

adapt to mirage-kv 3.0.0 API
mirage · Oct 30, 2019 · 883bd6b · 883bd6b
2 parents f6db534 + 91652fd
commit 883bd6b
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,10 +6,11 @@ services:
 sudo: false
 env:
  global:
-   - PRE_INSTALL_HOOK="cd /home/opam/opam-repository && git pull origin master && opam update -u -y"
    - PACKAGE="mirage-kv-unix"
    - TESTS="true"
+   - DISTRO=alpine
  matrix:
-   - DISTRO=alpine OCAML_VERSION=4.05
-   - DISTRO=alpine OCAML_VERSION=4.06
-   - DISTRO=alpine OCAML_VERSION=4.07
+   - OCAML_VERSION=4.06
+   - OCAML_VERSION=4.07
+   - OCAML_VERSION=4.08
+   - OCAML_VERSION=4.09
diff --git a/README.md b/README.md
@@ -2,8 +2,9 @@
 
 This is a Mirage key-value store backed by an underlying Unix directory.
 
-The current version supports the `Mirage_kv.S` and `Mirage_kv_lwt.S` signatures
-defined in the `mirage-kv` package.
+The current version supports the `Mirage_kv.RO` and `Mirage_kv_lwt.RW`
+signatures defined in the `[mirage-kv-lwt](https://github.com/mirage/mirage-kv)`
+package.
 
 * WWW: <https://mirage.io>
 * E-mail: <mirageos-devel@lists.xenproject.org>
diff --git a/mirage-kv-unix.opam b/mirage-kv-unix.opam
@@ -15,19 +15,19 @@ build: [
 
 depends: [
   "dune" {>= "1.0"}
-  "ocaml" {>= "4.05.0"}
-  "cstruct" {>= "3.2.0"}
-  "mirage-kv-lwt" {>= "1.0.0"}
+  "ocaml" {>= "4.06.0"}
+  "mirage-kv" {>= "3.0.0"}
   "lwt"
   "ptime"
+  "cstruct" {with-test & >= "3.2.0"}
   "rresult" {with-test}
-  "mirage-clock-unix" {with-test & >= "2.0.0"}
+  "mirage-clock-unix" {with-test & >= "3.0.0"}
   "alcotest" {with-test & >= "0.7.1"}
 ]
 synopsis: "Key-value store for MirageOS backed by Unix filesystem"
 description: """
 This is a Mirage key-value store backed by an underlying Unix directory.
 
-The current version supports the `Mirage_kv.S` and `Mirage_kv_lwt.S` signatures
-defined in the `mirage-kv` package.
+The current version supports the `Mirage_kv_lwt.RO` and `Mirage_kv_lwt.RW`
+signatures defined in the `mirage-kv-lwt` package.
 """
diff --git a/src/dune b/src/dune
@@ -1,4 +1,4 @@
 (library
  (name mirage_kv_unix)
  (public_name mirage-kv-unix)
- (libraries mirage-kv-lwt lwt.unix ptime))
+ (libraries mirage-kv lwt.unix ptime))
diff --git a/src/mirage_kv_unix.ml b/src/mirage_kv_unix.ml
@@ -18,10 +18,7 @@
 
 open Lwt.Infix
 
-type +'a io = 'a Lwt.t
-
 type key = Mirage_kv.Key.t
-type value = string
 
 type t = {
   base: string

diff --git a/src/mirage_kv_unix.mli b/src/mirage_kv_unix.mli
@@ -22,7 +22,7 @@
 type error = [ Mirage_kv.error | `Storage_error of Mirage_kv.Key.t * string ]
 type write_error = [ Mirage_kv.write_error | `Storage_error of Mirage_kv.Key.t * string | `Key_exists of Mirage_kv.Key.t ]
 
-include Mirage_kv_lwt.RW
+include Mirage_kv.RW
   with type error := error
    and type write_error := write_error
 

diff --git a/test/dune b/test/dune
@@ -1,7 +1,7 @@
 (executables
  (names test_kv_unix)
- (libraries unix ptime mirage-clock-unix alcotest rresult mirage-kv-lwt
-   mirage-kv-unix))
+ (libraries unix ptime mirage-clock-unix alcotest rresult mirage-kv
+   mirage-kv-unix cstruct))
 
 (alias
  (name runtest)

diff --git a/test/test_kv_unix.ml b/test/test_kv_unix.ml
@@ -35,10 +35,8 @@ let assert_write_fail e = failf "%a" KV.pp_write_error e
 let connect_present_dir () =
   KV.connect test_kv >>= fun _kv -> Lwt.return_unit
 
-let clock = lwt_run (fun () -> Pclock.connect ()) ()
-
 let append_timestamp s =
-  let now = Ptime.v (Pclock.now_d_ps clock) in
+  let now = Ptime.v (Pclock.now_d_ps ()) in
   let str = Fmt.strf "%s-%a" s (Ptime.pp_rfc3339 ~space:false ()) now in
   Mirage_kv.Key.v str