Update the logic for expand to include upper layers.

There was a bug where expanding the lowest layer and calling set on
all of the new elements was not sufficient to grow the upper layers.

This commit also fixes a warning about the package-level profile
override being ineffective.

arbitrator/bench/Cargo.toml

@@ -23,6 +23,3 @@ gperftools = { version = "0.2.0", optional = true }
 counters = []
 cpuprof = ["gperftools"]
 heapprof = ["gperftools", "gperftools/heap"]
-
-[profile.release]
-debug = true 

arbitrator/bench/src/bin.rs

@@ -33,7 +33,7 @@ struct Args {
 
 fn main() -> eyre::Result<()> {
     let args = Args::parse();
-    let step_sizes = [1, 1 << 10, 1 << 15, 1 << 20];
+    let step_sizes = [1, 1 << 10, 1 << 15, 1 << 20, 1 << 24];
     if args.always_merkleize {
         println!("Running benchmark with always merkleize feature on");
     } else {
@@ -94,7 +94,7 @@ fn main() -> eyre::Result<()> {
 
         let total_end_time = total.elapsed();
         println!(
-            "avg hash time {:?}, avg step time {:?}, step size {}, num_iters {}, total time {:?}",
+            "avg hash time {:>12?}, avg step time {:>12?}, step size {:>8}, num_iters {}, total time {:>12?}",
             average(&hash_times),
             average(&step_times),
             step_size,

arbitrator/prover/src/merkle.rs

@@ -305,7 +305,7 @@ impl Merkle {
             } else if idx == layer.len() {
                 layer.push(next_hash);
             } else {
-                panic!("Index {} out of bounds {}", idx, layer.len());
+                panic!("Index {} out of bounds {} in layer {}", idx, layer.len(), layer_i);
             }
             if layer_i == layers_len - 1 {
                 // next_hash isn't needed
@@ -334,7 +334,11 @@ impl Merkle {
             return Err("Cannot extend with more leaves than the capicity of the tree.".to_owned());
         }
         let mut idx = self.layers[0].len();
-        self.layers[0].resize(idx + hashes.len(), self.empty_layers[0]);
+        let mut new_size = idx + hashes.len();
+        for (layer_i, layer) in self.layers.iter_mut().enumerate() {
+            layer.resize(new_size, self.empty_layers[layer_i]);
+            new_size >>= 1;
+        }
         for hash in hashes {
             self.set(idx, hash);
             idx += 1;