From 4d546f9acec8385611400ee20b6d1a3b8d31ddc8 Mon Sep 17 00:00:00 2001
From: Tomasz Bekas <tomasz.bekas@gmail.com>
Date: Tue, 21 Nov 2023 19:30:14 +0100
Subject: [PATCH] Bump questionable and test for tree init failure (#630)

---
 tests/codex/merkletree/testmerkletree.nim | 40 +++++++++++++----------
 vendor/questionable                       |  2 +-
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/tests/codex/merkletree/testmerkletree.nim b/tests/codex/merkletree/testmerkletree.nim
index 5b0e2d09..d6202093 100644
--- a/tests/codex/merkletree/testmerkletree.nim
+++ b/tests/codex/merkletree/testmerkletree.nim
@@ -42,7 +42,7 @@ checksuite "merkletree":
   setup:
     for i in 0..<data.len:
       expectedLeaves[i] = MultiHash.digest($sha256, data[i]).tryGet()
-    
+
     builder = MerkleTreeBuilder.init(sha256).tryGet()
     var zero: array[32, byte]
     var one: array[32, byte]
@@ -50,6 +50,12 @@ checksuite "merkletree":
     zeroHash = MultiHash.init($sha256, zero).tryGet()
     oneHash = MultiHash.init($sha256, one).tryGet()
 
+  test "cannot init tree without any leafs":
+    let treeOrErr = MerkleTree.init(newSeq[MultiHash]())
+
+    check:
+      treeOrErr.isErr
+
   test "tree with one leaf has expected structure":
     builder.addDataBlock(data[0]).tryGet()
 
@@ -82,7 +88,7 @@ checksuite "merkletree":
 
     let
       expectedRoot = combine(
-        combine(expectedLeaves[0], expectedLeaves[1]), 
+        combine(expectedLeaves[0], expectedLeaves[1]),
         combine(expectedLeaves[2], zeroHash)
       )
 
@@ -109,15 +115,15 @@ checksuite "merkletree":
         combine(
           combine(
             combine(expectedLeaves[0], expectedLeaves[1]),
-            combine(expectedLeaves[2], expectedLeaves[3]), 
+            combine(expectedLeaves[2], expectedLeaves[3]),
           ),
-          combine( 
-            combine(expectedLeaves[4], expectedLeaves[5]), 
+          combine(
+            combine(expectedLeaves[4], expectedLeaves[5]),
             combine(expectedLeaves[6], expectedLeaves[7])
           )
         ),
         combine(
-          combine( 
+          combine(
             combine(expectedLeaves[8], zeroHash),
             oneHash
           ),
@@ -148,7 +154,7 @@ checksuite "merkletree":
     check:
       tree.getProof(0).tryGet().verifyDataBlock(data[0], tree.root).tryGet()
       tree.getProof(1).tryGet().verifyDataBlock(data[1], tree.root).tryGet()
-  
+
   test "tree with three leaves provides expected proofs":
     builder.addDataBlock(data[0]).tryGet()
     builder.addDataBlock(data[1]).tryGet()
@@ -186,34 +192,34 @@ checksuite "merkletree":
     let tree = builder.build().tryGet()
 
     let expectedProofs = {
-      4: 
+      4:
         MerkleProof.init(4, @[
-          expectedLeaves[5], 
-          combine(expectedLeaves[6], expectedLeaves[7]), 
+          expectedLeaves[5],
+          combine(expectedLeaves[6], expectedLeaves[7]),
           combine(
               combine(expectedLeaves[0], expectedLeaves[1]),
-              combine(expectedLeaves[2], expectedLeaves[3]), 
+              combine(expectedLeaves[2], expectedLeaves[3]),
           ),
           combine(
-            combine( 
+            combine(
               combine(expectedLeaves[8], zeroHash),
               oneHash
             ),
             oneHash
           )
         ]).tryGet(),
-      8: 
+      8:
         MerkleProof.init(8, @[
-          zeroHash, 
+          zeroHash,
           oneHash,
           oneHash,
           combine(
             combine(
               combine(expectedLeaves[0], expectedLeaves[1]),
-              combine(expectedLeaves[2], expectedLeaves[3]), 
+              combine(expectedLeaves[2], expectedLeaves[3]),
             ),
-            combine( 
-              combine(expectedLeaves[4], expectedLeaves[5]), 
+            combine(
+              combine(expectedLeaves[4], expectedLeaves[5]),
               combine(expectedLeaves[6], expectedLeaves[7])
             )
           )
diff --git a/vendor/questionable b/vendor/questionable
index 2dd6b6b2..1f0afff4 160000
--- a/vendor/questionable
+++ b/vendor/questionable
@@ -1 +1 @@
-Subproject commit 2dd6b6b220f9f14a1231f6cafdf24f012bcc8414
+Subproject commit 1f0afff48bf80ab1149a0957f9743f345bc14b71