agar: Add static graph initializer

[ccan] / ccan / agar / test / api-dfs.c

diff --git a/ccan/agar/test/api-dfs.c b/ccan/agar/test/api-dfs.c
index ecc05bd744d495d8c9c82be7c13ef5d1cba88011..625e825c3fac07f63c75001f9795a186b531a6d2 100644 (file)
--- a/ccan/agar/test/api-dfs.c
+++ b/ccan/agar/test/api-dfs.c
@@ -38,20 +38,16 @@
 
 int main(void)
 {
-       struct trivial_graphr tgr;
        struct parallel_graphr pgr;
        struct full_graphr fgr;
        struct chain_graphr cgr;
        struct grid_graphr ggr1, ggr2;
-       struct error_graphr egr;
-       struct traversal1_graphr t1gr;
        struct agar_state *sr;
        const void *nr;
        
        plan_tests(2 * 13 + 12 + 10);
 
-       trivial_graphr_init(&tgr);
-       test_dfs(&tgr.gr, 1, 1);
+       test_dfs(&trivial_graphr.gr, 1, 1);
 
        parallel_graphr_init(&pgr, 3, 0);
        test_dfs(&pgr.gr, 1, 1, 2);
@@ -75,9 +71,9 @@ int main(void)
        test_dfs(&ggr2.gr, 5, 5, 6, 9, 8, 7, 4, 1, 2, 3);
        test_dfs(&ggr2.gr, 9, 9, 8, 7, 4, 5, 6, 3, 2, 1);
 
-       error_graphr_init(&egr);
-       test_dfs(&egr.gr, 1, 1, 2);
-       ok((sr = agar_dfs_new(NULL, &egr.gr)), "started error traversal");
+       test_dfs(&error_graphr.gr, 1, 1, 2);
+       ok((sr = agar_dfs_new(NULL, &error_graphr.gr)),
+          "started error traversal");
        ok1(agar_dfs_explore(sr, int2ptr(3), &nr));
        ok(ptr2int(nr) == 3, "Expected node #3, actually #%ld", ptr2int(nr));
        ok1(agar_dfs_explore(sr, nr, &nr));
@@ -86,18 +82,17 @@ int main(void)
        ok(agar_error(sr) == -1, "Error is %d (expected -1)", agar_error(sr));
        ok1(!agar_dfs_explore(sr, nr, &nr));
        tal_free(sr);
-       test_dfs(&egr.gr, 1, 1, 2);
+       test_dfs(&error_graphr.gr, 1, 1, 2);
 
-       traversal1_graphr_init(&t1gr);
-       test_dfs(&t1gr.gr, 1, 1, 2, 4, 5, 3, 6);
-       test_dfs(&t1gr.gr, 9, 9, 8, 6, 5, 7, 4);
+       test_dfs(&traversal1_graphr.gr, 1, 1, 2, 4, 5, 3, 6);
+       test_dfs(&traversal1_graphr.gr, 9, 9, 8, 6, 5, 7, 4);
 
-       ok1((sr = agar_dfs_new(NULL, &t1gr.gr)));
+       ok1((sr = agar_dfs_new(NULL, &traversal1_graphr.gr)));
        test_dfs_partial(sr, 1, 1, 2, 4, 5, 3, 6);
        test_dfs_partial(sr, 9, 9, 8, 7);
        tal_free(sr);
 
-       ok1((sr = agar_dfs_new(NULL, &t1gr.gr)));
+       ok1((sr = agar_dfs_new(NULL, &traversal1_graphr.gr)));
        test_dfs_partial(sr, 9, 9, 8, 6, 5, 7, 4);
        test_dfs_partial(sr, 1, 1, 2, 3);
        tal_free(sr);