tdb2: unify tdb1_transaction_start etc. into tdb_transaction_start.

[ccan] / ccan / tdb2 / test / run-tdb1-nested-transactions.c

diff --git a/ccan/tdb2/test/run-tdb1-nested-transactions.c b/ccan/tdb2/test/run-tdb1-nested-transactions.c
index 408987b58e827527931ca586849c9dc6ebe1432a..a6a815363cf1d6b86d54c628b00f2ec86f53aa96 100644 (file)
--- a/ccan/tdb2/test/run-tdb1-nested-transactions.c
+++ b/ccan/tdb2/test/run-tdb1-nested-transactions.c
@@ -15,7 +15,7 @@ int main(int argc, char *argv[])
        hsize.base.next = &tap_log_attr;
        hsize.tdb1_hashsize.hsize = 1024;
 
-       plan_tests(30);
+       plan_tests(29);
        key.dsize = strlen("hi");
        key.dptr = (void *)"hi";
 
@@ -24,7 +24,7 @@ int main(int argc, char *argv[])
        ok1(tdb);
 
        /* No nesting by default. */
-       ok1(tdb1_transaction_start(tdb) == 0);
+       ok1(tdb_transaction_start(tdb) == TDB_SUCCESS);
        data.dptr = (void *)"world";
        data.dsize = strlen("world");
        ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS);
@@ -32,14 +32,13 @@ int main(int argc, char *argv[])
        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);
+       ok1(tdb_transaction_start(tdb) == TDB_ERR_EINVAL);
 
        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);
+       ok1(tdb_transaction_commit(tdb) == TDB_SUCCESS);
        ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS);
        ok1(data.dsize == strlen("world"));
        ok1(memcmp(data.dptr, "world", strlen("world")) == 0);
@@ -50,21 +49,22 @@ int main(int argc, char *argv[])
                       TDB_ALLOW_NESTING, O_RDWR, 0, &tap_log_attr);
        ok1(tdb);
 
-       ok1(tdb1_transaction_start(tdb) == 0);
-       ok1(tdb1_transaction_start(tdb) == 0);
+       ok1(tdb_transaction_start(tdb) == TDB_SUCCESS);
+       ok1(tdb_transaction_start(tdb) == TDB_SUCCESS);
        ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
-       ok1(tdb1_transaction_commit(tdb) == 0);
+       ok1(tdb_transaction_commit(tdb) == TDB_SUCCESS);
        ok1(!tdb_exists(tdb, key));
-       ok1(tdb1_transaction_cancel(tdb) == 0);
+       tdb_transaction_cancel(tdb);
+       ok1(tap_log_messages == 0);
        /* Surprise! Kills inner "committed" transaction. */
        ok1(tdb_exists(tdb, key));
 
-       ok1(tdb1_transaction_start(tdb) == 0);
-       ok1(tdb1_transaction_start(tdb) == 0);
+       ok1(tdb_transaction_start(tdb) == TDB_SUCCESS);
+       ok1(tdb_transaction_start(tdb) == TDB_SUCCESS);
        ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
-       ok1(tdb1_transaction_commit(tdb) == 0);
+       ok1(tdb_transaction_commit(tdb) == TDB_SUCCESS);
        ok1(!tdb_exists(tdb, key));
-       ok1(tdb1_transaction_commit(tdb) == 0);
+       ok1(tdb_transaction_commit(tdb) == TDB_SUCCESS);
        ok1(!tdb_exists(tdb, key));
        tdb_close(tdb);