X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-nested-transactions.c;h=408987b58e827527931ca586849c9dc6ebe1432a;hp=79b9b5683beb4718f0d0fa6db67376b263616b09;hb=2bba2a856a6cfdb93085b701557850bc1da99587;hpb=49475d68deecd0b31597ed6094229171d2699b11

diff --git a/ccan/tdb2/test/run-tdb1-nested-transactions.c b/ccan/tdb2/test/run-tdb1-nested-transactions.c
index 79b9b568..408987b5 100644
--- a/ccan/tdb2/test/run-tdb1-nested-transactions.c
+++ b/ccan/tdb2/test/run-tdb1-nested-transactions.c
@@ -15,59 +15,58 @@ int main(int argc, char *argv[])
 	hsize.base.next = &tap_log_attr;
 	hsize.tdb1_hashsize.hsize = 1024;
 
-	plan_tests(27);
+	plan_tests(30);
 	key.dsize = strlen("hi");
 	key.dptr = (void *)"hi";
 
-	tdb = tdb1_open("run-nested-transactions.tdb",
-			TDB_DEFAULT,
-			O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
+	tdb = tdb_open("run-nested-transactions.tdb1",
+		       TDB_VERSION1, O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
 	ok1(tdb);
 
 	/* No nesting by default. */
 	ok1(tdb1_transaction_start(tdb) == 0);
 	data.dptr = (void *)"world";
 	data.dsize = strlen("world");
-	ok1(tdb1_store(tdb, key, data, TDB_INSERT) == 0);
-	data = tdb1_fetch(tdb, key);
+	ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS);
+	ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS);
 	ok1(data.dsize == strlen("world"));
 	ok1(memcmp(data.dptr, "world", strlen("world")) == 0);
 	free(data.dptr);
 	ok1(tdb1_transaction_start(tdb) != 0);
 	ok1(tdb_error(tdb) == TDB_ERR_EINVAL);
 
-	data = tdb1_fetch(tdb, key);
+	ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS);
 	ok1(data.dsize == strlen("world"));
 	ok1(memcmp(data.dptr, "world", strlen("world")) == 0);
 	free(data.dptr);
 	ok1(tdb1_transaction_commit(tdb) == 0);
-	data = tdb1_fetch(tdb, key);
+	ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS);
 	ok1(data.dsize == strlen("world"));
 	ok1(memcmp(data.dptr, "world", strlen("world")) == 0);
 	free(data.dptr);
-	tdb1_close(tdb);
+	tdb_close(tdb);
 
-	tdb = tdb1_open("run-nested-transactions.tdb",
-			TDB_ALLOW_NESTING, O_RDWR, 0, &tap_log_attr);
+	tdb = tdb_open("run-nested-transactions.tdb1",
+		       TDB_ALLOW_NESTING, O_RDWR, 0, &tap_log_attr);
 	ok1(tdb);
 
 	ok1(tdb1_transaction_start(tdb) == 0);
 	ok1(tdb1_transaction_start(tdb) == 0);
-	ok1(tdb1_delete(tdb, key) == 0);
+	ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
 	ok1(tdb1_transaction_commit(tdb) == 0);
-	ok1(!tdb1_exists(tdb, key));
+	ok1(!tdb_exists(tdb, key));
 	ok1(tdb1_transaction_cancel(tdb) == 0);
 	/* Surprise! Kills inner "committed" transaction. */
-	ok1(tdb1_exists(tdb, key));
+	ok1(tdb_exists(tdb, key));
 
 	ok1(tdb1_transaction_start(tdb) == 0);
 	ok1(tdb1_transaction_start(tdb) == 0);
-	ok1(tdb1_delete(tdb, key) == 0);
+	ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
 	ok1(tdb1_transaction_commit(tdb) == 0);
-	ok1(!tdb1_exists(tdb, key));
+	ok1(!tdb_exists(tdb, key));
 	ok1(tdb1_transaction_commit(tdb) == 0);
-	ok1(!tdb1_exists(tdb, key));
-	tdb1_close(tdb);
+	ok1(!tdb_exists(tdb, key));
+	tdb_close(tdb);
 
 	return exit_status();
 }