tdb2: test: fix run-57-die-during-transaction.c to be more efficient.

[ccan] / ccan / tdb2 / test / run-04-basichash.c

diff --git a/ccan/tdb2/test/run-04-basichash.c b/ccan/tdb2/test/run-04-basichash.c
index b92b6bdde05a4d1928094576b03206e9b194864d..4852744462dbcc838a7a805655e3bd2c72c3a68d 100644 (file)
--- a/ccan/tdb2/test/run-04-basichash.c
+++ b/ccan/tdb2/test/run-04-basichash.c
@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/check.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 
@@ -75,9 +68,9 @@ int main(int argc, char *argv[])
 
                /* Make sure we fill it in for later finding. */
                off = new_off + sizeof(struct tdb_used_record);
-               ok1(!tdb->methods->twrite(tdb, off, key.dptr, key.dsize));
+               ok1(!tdb->tdb2.io->twrite(tdb, off, key.dptr, key.dsize));
                off += key.dsize;
-               ok1(!tdb->methods->twrite(tdb, off, dbuf.dptr, dbuf.dsize));
+               ok1(!tdb->tdb2.io->twrite(tdb, off, dbuf.dptr, dbuf.dsize));
 
                /* We should be able to unlock that OK. */
                ok1(tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range,
@@ -177,7 +170,7 @@ int main(int argc, char *argv[])
                                    + rec_key_length(&rec)
                                    + rec_data_length(&rec)
                                    + rec_extra_padding(&rec),
-                                   TDB_LOCK_NOWAIT) == 0);
+                                   TDB_LOCK_NOWAIT, false) == 0);
                ok1(tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range,
                                      F_WRLCK) == 0);
                ok1(tdb_check(tdb, NULL, NULL) == 0);
@@ -235,9 +228,9 @@ int main(int argc, char *argv[])
 
                /* Make sure we fill it in for later finding. */
                off = new_off + sizeof(struct tdb_used_record);
-               ok1(!tdb->methods->twrite(tdb, off, key.dptr, key.dsize));
+               ok1(!tdb->tdb2.io->twrite(tdb, off, key.dptr, key.dsize));
                off += key.dsize;
-               ok1(!tdb->methods->twrite(tdb, off, dbuf.dptr, dbuf.dsize));
+               ok1(!tdb->tdb2.io->twrite(tdb, off, dbuf.dptr, dbuf.dsize));
 
                /* We should be able to unlock that OK. */
                ok1(tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range,