tdb2: unify tdb1_store into tdb_store

[ccan] / ccan / tdb2 / test / run-tdb1-readonly-check.c

diff --git a/ccan/tdb2/test/run-tdb1-readonly-check.c b/ccan/tdb2/test/run-tdb1-readonly-check.c
index 6bfa0dc3f5ad4ac434c88c24c5c4b56532094a71..6e1b57323c7f05db1c62f73b2a02289b759f1d3a 100644 (file)
--- a/ccan/tdb2/test/run-tdb1-readonly-check.c
+++ b/ccan/tdb2/test/run-tdb1-readonly-check.c
@@ -4,17 +4,22 @@
 #include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <err.h>
-#include "tdb1-logging.h"
+#include "logging.h"
 
 int main(int argc, char *argv[])
 {
-       struct tdb1_context *tdb;
-       TDB1_DATA key, data;
+       struct tdb_context *tdb;
+       TDB_DATA key, data;
+       union tdb_attribute hsize;
 
-       plan_tests(11);
-       tdb = tdb1_open_ex("run-readonly-check.tdb", 1024,
-                         TDB1_DEFAULT,
-                         O_CREAT|O_TRUNC|O_RDWR, 0600, &taplogctx, NULL);
+       hsize.base.attr = TDB_ATTRIBUTE_TDB1_HASHSIZE;
+       hsize.base.next = &tap_log_attr;
+       hsize.tdb1_hashsize.hsize = 1024;
+
+       plan_tests(10);
+       tdb = tdb_open("run-readonly-check.tdb1",
+                      TDB_VERSION1,
+                      O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
 
        ok1(tdb);
        key.dsize = strlen("hi");
@@ -22,22 +27,21 @@ int main(int argc, char *argv[])
        data.dsize = strlen("world");
        data.dptr = (void *)"world";
 
-       ok1(tdb1_store(tdb, key, data, TDB1_INSERT) == 0);
+       ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS);
        ok1(tdb1_check(tdb, NULL, NULL) == 0);
 
        /* We are also allowed to do a check inside a transaction. */
        ok1(tdb1_transaction_start(tdb) == 0);
        ok1(tdb1_check(tdb, NULL, NULL) == 0);
-       ok1(tdb1_close(tdb) == 0);
+       ok1(tdb_close(tdb) == 0);
 
-       tdb = tdb1_open_ex("run-readonly-check.tdb", 1024,
-                         TDB1_DEFAULT, O_RDONLY, 0, &taplogctx, NULL);
+       tdb = tdb_open("run-readonly-check.tdb1",
+                      TDB_DEFAULT, O_RDONLY, 0, &tap_log_attr);
 
        ok1(tdb);
-       ok1(tdb1_store(tdb, key, data, TDB1_MODIFY) == -1);
-       ok1(tdb_error(tdb) == TDB_ERR_RDONLY);
+       ok1(tdb_store(tdb, key, data, TDB_MODIFY) == TDB_ERR_RDONLY);
        ok1(tdb1_check(tdb, NULL, NULL) == 0);
-       ok1(tdb1_close(tdb) == 0);
+       ok1(tdb_close(tdb) == 0);
 
        return exit_status();
 }