X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-12-store.c;h=73ffd554f525d6e18922c63abd8279742b3ef232;hb=60210a73ec08a7b34ba637ad19e6749cf6dc1952;hp=5c21e3a1d0cd0ab8d3658b18d31bfd4979b03843;hpb=a4393df8ed138b853b4ff212db7e1a50aba0b8c7;p=ccan

diff --git a/ccan/tdb2/test/run-12-store.c b/ccan/tdb2/test/run-12-store.c
index 5c21e3a1..73ffd554 100644
--- a/ccan/tdb2/test/run-12-store.c
+++ b/ccan/tdb2/test/run-12-store.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"
 
@@ -23,8 +16,8 @@ int main(int argc, char *argv[])
 	uint64_t seed = 16014841315512641303ULL;
 	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 };