tdb2: test: Speed up run-01-new_database.

[ccan] / ccan / tdb2 / test / run-tdb1-open-during-transaction.c

diff --git a/ccan/tdb2/test/run-tdb1-open-during-transaction.c b/ccan/tdb2/test/run-tdb1-open-during-transaction.c
index 875fc3ca9e6ffee46293c4e3d82ad95e46357bf2..d03f7d95a09ee53dd70b10515b468fe0ea3f3ce1 100644 (file)
--- a/ccan/tdb2/test/run-tdb1-open-during-transaction.c
+++ b/ccan/tdb2/test/run-tdb1-open-during-transaction.c
@@ -18,12 +18,12 @@ static int ftruncate_check(int fd, off_t length);
 #include <stdarg.h>
 #include <err.h>
 #include "tdb1-external-agent.h"
-#include "tdb1-logging.h"
+#include "logging.h"
 
 static struct agent *agent;
 static bool opened;
 static int errors = 0;
-#define TEST_DBNAME "run-open-during-transaction.tdb"
+#define TEST_DBNAME "run-open-during-transaction.tdb1"
 
 #undef write
 #undef pwrite
@@ -131,8 +131,13 @@ int main(int argc, char *argv[])
        const int flags[] = { TDB_DEFAULT,
                              TDB_NOMMAP };
        int i;
-       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);
        agent = prepare_external_agent1();
@@ -145,24 +150,24 @@ int main(int argc, char *argv[])
                     "DEFAULT",
                     (flags[i] & TDB_NOMMAP) ? "no mmap" : "mmap");
                unlink(TEST_DBNAME);
-               tdb = tdb1_open_ex(TEST_DBNAME, 1024, flags[i],
-                                 O_CREAT|O_TRUNC|O_RDWR, 0600,
-                                 &taplogctx, NULL);
+               tdb = tdb_open(TEST_DBNAME, flags[i]|TDB_VERSION1,
+                              O_CREAT|O_TRUNC|O_RDWR, 0600,
+                              &hsize);
                ok1(tdb);
 
                opened = true;
-               ok1(tdb1_transaction_start(tdb) == 0);
+               ok1(tdb_transaction_start(tdb) == TDB_SUCCESS);
                key.dsize = strlen("hi");
                key.dptr = (void *)"hi";
                data.dptr = (void *)"world";
                data.dsize = strlen("world");
 
-               ok1(tdb1_store(tdb, key, data, TDB_INSERT) == 0);
-               ok1(tdb1_transaction_commit(tdb) == 0);
+               ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS);
+               ok1(tdb_transaction_commit(tdb) == TDB_SUCCESS);
                ok(!errors, "We had %u open errors", errors);
 
                opened = false;
-               tdb1_close(tdb);
+               tdb_close(tdb);
        }
 
        return exit_status();