tdb2: unify tdb1_open into tdb_open

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

diff --git a/ccan/tdb2/test/run-tdb1.c b/ccan/tdb2/test/run-tdb1.c
index 84eea75ce29e5e3221686b9de4324c81d52f2a1c..2d551dc53828151e757760696ecca106d94cdcaa 100644 (file)
--- a/ccan/tdb2/test/run-tdb1.c
+++ b/ccan/tdb2/test/run-tdb1.c
@@ -2,16 +2,21 @@
 #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;
+       struct tdb_context *tdb;
        TDB_DATA key, data;
+       union tdb_attribute hsize;
+
+       hsize.base.attr = TDB_ATTRIBUTE_TDB1_HASHSIZE;
+       hsize.base.next = &tap_log_attr;
+       hsize.tdb1_hashsize.hsize = 1024;
 
        plan_tests(10);
-       tdb = tdb1_open_ex("run.tdb", 1024, TDB_DEFAULT,
-                         O_CREAT|O_TRUNC|O_RDWR, 0600, &taplogctx, NULL);
+       tdb = tdb_open("run.tdb1", TDB_VERSION1,
+                      O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
 
        ok1(tdb);
        key.dsize = strlen("hi");
@@ -34,7 +39,7 @@ int main(int argc, char *argv[])
        key.dsize++;
        data = tdb1_fetch(tdb, key);
        ok1(data.dptr == NULL);
-       tdb1_close(tdb);
+       tdb_close(tdb);
 
        return exit_status();
 }