tdb2: unify tdb1_traverse into tdb_traverse

[ccan] / ccan / tdb2 / test / run-tdb1-3G-file.c

diff --git a/ccan/tdb2/test/run-tdb1-3G-file.c b/ccan/tdb2/test/run-tdb1-3G-file.c
index d5aeda5ddebd1f48be28a0b3b87717dc6f657384..074901857faf3d25d03d0dfb8fbe6ef1ff436981 100644 (file)
--- a/ccan/tdb2/test/run-tdb1-3G-file.c
+++ b/ccan/tdb2/test/run-tdb1-3G-file.c
@@ -4,7 +4,7 @@
 #include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <err.h>
-#include "tdb1-logging.h"
+#include "logging.h"
 
 static int tdb1_expand_file_sparse(struct tdb_context *tdb,
                                  tdb1_off_t size,
@@ -64,10 +64,15 @@ int main(int argc, char *argv[])
        uint32_t hash;
        tdb1_off_t rec_ptr;
        struct tdb1_record rec;
+       union tdb_attribute hsize;
 
-       plan_tests(24);
-       tdb = tdb1_open_ex("run-36-file.tdb", 1024, TDB_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(26);
+       tdb = tdb_open("run-36-file.tdb1", TDB_VERSION1,
+                      O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
 
        ok1(tdb);
        tdb->tdb1.io = &large_io_methods;
@@ -81,9 +86,9 @@ int main(int argc, char *argv[])
        orig_data.dsize = strlen("world");
        orig_data.dptr = (void *)"world";
 
-       ok1(tdb1_store(tdb, key, orig_data, TDB_INSERT) == 0);
+       ok1(tdb_store(tdb, key, orig_data, TDB_INSERT) == TDB_SUCCESS);
 
-       data = tdb1_fetch(tdb, key);
+       ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS);
        ok1(data.dsize == strlen("world"));
        ok1(memcmp(data.dptr, "world", strlen("world")) == 0);
        free(data.dptr);
@@ -96,25 +101,25 @@ int main(int argc, char *argv[])
        tdb1_unlock(tdb, TDB1_BUCKET(rec.full_hash), F_RDLCK);
 
        /* Traverse must work. */
-       ok1(tdb1_traverse(tdb, test_traverse, &orig_data) == 1);
+       ok1(tdb_traverse(tdb, test_traverse, &orig_data) == 1);
 
        /* Delete should work. */
-       ok1(tdb1_delete(tdb, key) == 0);
+       ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
 
-       ok1(tdb1_traverse(tdb, test_traverse, NULL) == 0);
+       ok1(tdb_traverse(tdb, test_traverse, NULL) == 0);
 
        /* Transactions should work. */
        ok1(tdb1_transaction_start(tdb) == 0);
-       ok1(tdb1_store(tdb, key, orig_data, TDB_INSERT) == 0);
+       ok1(tdb_store(tdb, key, orig_data, TDB_INSERT) == TDB_SUCCESS);
 
-       data = tdb1_fetch(tdb, key);
+       ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS);
        ok1(data.dsize == strlen("world"));
        ok1(memcmp(data.dptr, "world", strlen("world")) == 0);
        free(data.dptr);
        ok1(tdb1_transaction_commit(tdb) == 0);
 
-       ok1(tdb1_traverse(tdb, test_traverse, &orig_data) == 1);
-       tdb1_close(tdb);
+       ok1(tdb_traverse(tdb, test_traverse, &orig_data) == 1);
+       tdb_close(tdb);
 
        return exit_status();
 }