Fixups

packages/client/README.md

@@ -33,6 +33,12 @@ Run a specific test file (or several files):
 scarb test tests/data/light_481823.json
 ```
 
+Show output for a specific test:
+
+```sh
+scarb test tests/data/light_481823.json --nocapture
+```
+
 Re-generate integration test data:
 
 ```sh

packages/consensus/src/types/utreexo.cairo

@@ -52,12 +52,12 @@ pub impl UtreexoStateImpl of UtreexoStateTrait {
     fn validate_and_apply(
         ref self: UtreexoState, utxo_set: UtxoSet, proofs: Span<UtreexoProof>
     ) -> Result<(), ByteArray> {
-        let mut lead_idx = 0;
+        let mut proof_idx = 0;
         let mut inner_result = Result::Ok(());
 
         for leaf_hash in utxo_set
             .leaves_to_delete {
-                let proof = proofs[lead_idx];
+                let proof = proofs[proof_idx];
 
                 let res = self.verify(leaf_hash, proof);
                 if res.is_err() {
@@ -67,7 +67,9 @@ pub impl UtreexoStateImpl of UtreexoStateTrait {
                 }
 
                 self.delete(proof);
+                proof_idx += 1;
             };
+
         inner_result?;
 
         for leaf_hash in utxo_set.leaves_to_add {

scripts/data/generate_data.py

@@ -312,7 +312,7 @@ def generate_data(
 
     :param mode: Validation mode:
         "light" — generate block headers with Merkle root only
-        "full, full_fast" — generate full blocks with transactions (and referenced UTXOs)
+        "full" — generate full blocks with transactions (and referenced UTXOs)
         "utreexo" — only last block from the batch is included, but it is extended with Utreexo state/proofs
     :param initial_height: The block height of the initial chain state (0 means the state after genesis)
     :param num_blocks: The number of blocks to apply on top of it (has to be at least 1)
@@ -419,7 +419,7 @@ def str2bool(value):
         "--mode",
         dest="mode",
         default="full",
-        choices=["light", "full"],
+        choices=["light", "full", "utreexo"],
         help="Mode",
     )
 

scripts/data/regenerate_tests.sh

@@ -56,7 +56,7 @@ generate_test() {
   local num_blocks=${3:-1}
   test_file="${data_dir}/${mode}_${test_case}.json"
   if [[ ! -f "$test_file" || $force -eq 1 ]]; then
-    python ../../scripts/data/generate_data.py $mode $height $num_blocks $test_file
+    python ../../scripts/data/generate_data.py --mode $mode --height $height --num_blocks $num_blocks --output_file $test_file
   fi
 }
 
@@ -67,7 +67,7 @@ done
 
 for test_case in "${full_test_cases[@]}"; do
     echo "Generating test data: full mode, chain state @ $test_case, single block"
-    generate_test "full_fast" $test_case
+    generate_test "full" $test_case
 done
 
 for test_case in "${utreexo_test_cases[@]}"; do