X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-13-delete.c;h=fdbc9db70aefaba4f91982e192b425b065c445ff;hp=c70fec84828059edbb4fb26e0026ef3233857e6a;hb=d9cbd7d4454ae35e4e2f6d18a9469bf26948e4b9;hpb=f367a1dc8573db0a1f6f49fcda474eb51c192241

diff --git a/ccan/tdb2/test/run-13-delete.c b/ccan/tdb2/test/run-13-delete.c
index c70fec84..fdbc9db7 100644
--- a/ccan/tdb2/test/run-13-delete.c
+++ b/ccan/tdb2/test/run-13-delete.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/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 
@@ -146,14 +139,19 @@ int main(int argc, char *argv[])
 	uint64_t seed = 16014841315512641303ULL;
 	union tdb_attribute clash_hattr
 		= { .hash = { .base = { TDB_ATTRIBUTE_HASH },
-			      .hash_fn = clash } };
+			      .fn = clash } };
 	union tdb_attribute fixed_hattr
 		= { .hash = { .base = { TDB_ATTRIBUTE_HASH },
-			      .hash_fn = fixedhash,
-			      .hash_private = &seed } };
+			      .fn = fixedhash,
+			      .data = &seed } };
 	int flags[] = { TDB_INTERNAL, TDB_DEFAULT, TDB_NOMMAP,
 			TDB_INTERNAL|TDB_CONVERT, TDB_CONVERT,
-			TDB_NOMMAP|TDB_CONVERT };
+			TDB_NOMMAP|TDB_CONVERT,
+			TDB_INTERNAL|TDB_VERSION1, TDB_VERSION1,
+			TDB_NOMMAP|TDB_VERSION1,
+			TDB_INTERNAL|TDB_CONVERT|TDB_VERSION1,
+			TDB_CONVERT|TDB_VERSION1,
+			TDB_NOMMAP|TDB_CONVERT|TDB_VERSION1 };
 	/* These two values gave trouble before. */
 	int vals[] = { 755, 837 };