tdb2: unify tdb1_store into tdb_store

[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 1eab4476712a3a760ab408090b8d726de57c5833..0f299a32fe1427d2ed7b598f1dff4b068d594865 100644 (file)
--- a/ccan/tdb2/test/run-tdb1-3G-file.c
+++ b/ccan/tdb2/test/run-tdb1-3G-file.c
@@ -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;
+
+       hsize.base.attr = TDB_ATTRIBUTE_TDB1_HASHSIZE;
+       hsize.base.next = &tap_log_attr;
+       hsize.tdb1_hashsize.hsize = 1024;
 
        plan_tests(24);
-       tdb = tdb1_open("run-36-file.tdb", 1024, TDB_DEFAULT,
-                       O_CREAT|O_TRUNC|O_RDWR, 0600, &tap_log_attr);
+       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,7 +86,7 @@ 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(data.dsize == strlen("world"));
@@ -105,7 +110,7 @@ int main(int argc, char *argv[])
 
        /* 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(data.dsize == strlen("world"));
@@ -114,7 +119,7 @@ int main(int argc, char *argv[])
        ok1(tdb1_transaction_commit(tdb) == 0);
 
        ok1(tdb1_traverse(tdb, test_traverse, &orig_data) == 1);
-       tdb1_close(tdb);
+       tdb_close(tdb);
 
        return exit_status();
 }