MERGEBACK: descriptor: More test coverage + simplification

Author: jgriffiths

src/ctest/test_descriptor.c

@@ -960,6 +960,50 @@ static const struct descriptor_err_test {
         "descriptor - raw - any parent",
         "pk(raw(000102030405060708090a0b0c0d0e0f))",
         WALLY_NETWORK_BITCOIN_MAINNET
+    },{
+        "descriptor - after - non number child",
+        "wsh(after(key_1)",
+        WALLY_NETWORK_BITCOIN_MAINNET
+    },{
+        "descriptor - after - zero delay",
+        "wsh(after(0)",
+        WALLY_NETWORK_BITCOIN_MAINNET
+    },{
+        "descriptor - after - negative delay",
+        "wsh(after(-1)",
+        WALLY_NETWORK_BITCOIN_MAINNET
+    },{
+        "descriptor - after - delay too large",
+        "wsh(after(2147483648)",
+        WALLY_NETWORK_BITCOIN_MAINNET
+    },{
+        "descriptor - older - non number child",
+        "wsh(older(key_1)",
+        WALLY_NETWORK_BITCOIN_MAINNET
+    },{
+        "descriptor - older - zero delay",
+        "wsh(older(0)",
+        WALLY_NETWORK_BITCOIN_MAINNET
+    },{
+        "descriptor - older - negative delay",
+        "wsh(older(-1)",
+        WALLY_NETWORK_BITCOIN_MAINNET
+    },{
+        "descriptor - older - delay too large",
+        "wsh(older(2147483648)",
+        WALLY_NETWORK_BITCOIN_MAINNET
+    },{
+        "miniscript - thresh - zero required",
+        "wsh(thresh(0,c:pk_k(key_1),sc:pk_k(key_2),sc:pk_k(key_3)))",
+        WALLY_NETWORK_BITCOIN_MAINNET
+    },{
+        "miniscript - thresh - not enough children",
+        "wsh(thresh(2,c:pk_k(key_1),sc:pk_k(key_2)))",
+        WALLY_NETWORK_BITCOIN_MAINNET
+    },{
+        "miniscript - thresh - require more than available children",
+        "wsh(thresh(4,c:pk_k(key_1),sc:pk_k(key_2),sc:pk_k(key_3)))",
+        WALLY_NETWORK_BITCOIN_MAINNET
     }
     /* TODO: Add more tests for verify_x cases */
 };

src/descriptor.c

@@ -587,35 +587,17 @@ static int verify_or_i(ms_node *node)
 
 static int verify_thresh(ms_node *node)
 {
-    ms_node *top = NULL;
-    ms_node *child = NULL;
-    uint32_t count = 0;
-    uint32_t k = 0;
-    bool all_e = true;
-    bool all_m = true;
-    uint32_t args = 0;
-    uint32_t num_s = 0;
-
-    if (node_get_child_count(node) < 4)
-        return WALLY_EINVAL;
+    ms_node *top = top = node->child, *child;
+    int64_t count = 0, num_s = 0, args = 0;
+    bool all_e = true, all_m = true;
 
-    top = node->child;
-    if (top->builtin || top->kind != KIND_NUMBER || top->number < 0)
+    if (!top || top->builtin || top->kind != KIND_NUMBER)
         return WALLY_EINVAL;
 
-    k = (uint32_t)top->number;
-    if (k < 1)
-        return WALLY_EINVAL;
+    for (child = top->next; child; child = child->next) {
+        const uint32_t expected_type = count ? TYPE_W : TYPE_B;
 
-    child = top->next;
-    while (child) {
-        if (!child->builtin)
-            return WALLY_EINVAL;
-
-        if (!count) {
-            if (~child->type_properties & (TYPE_B | PROP_D | PROP_U))
-                return WALLY_EINVAL;
-        } else if (~child->type_properties & (TYPE_W | PROP_D | PROP_U))
+        if (!child->builtin || (~child->type_properties & (expected_type | PROP_D | PROP_U)))
             return WALLY_EINVAL;
 
         if (~child->type_properties & PROP_E)
@@ -628,10 +610,8 @@ static int verify_thresh(ms_node *node)
             args += (~child->type_properties & PROP_O) ? 2 : 1;
 
         ++count;
-        child = child->next;
     }
-
-    if (k > count)
+    if (count < 3 || top->number < 1 || top->number >= count)
         return WALLY_EINVAL;
 
     node->type_properties = TYPE_B | PROP_D | PROP_U;
@@ -641,9 +621,9 @@ static int verify_thresh(ms_node *node)
         node->type_properties |= PROP_O;
     if (all_e && num_s == count)
         node->type_properties |= PROP_E;
-    if (all_e && all_m && num_s >= count - k)
+    if (all_e && all_m && num_s >= count - top->number)
         node->type_properties |= PROP_M;
-    if (num_s >= count - k + 1)
+    if (num_s >= count - top->number + 1)
         node->type_properties |= PROP_S;
 
     return WALLY_OK;