f - local variable for left and right leaves

jkczyz · jkczyz · commit c8a072847089 · 2022-11-28T22:51:47.000-05:00
diff --git a/lightning/src/offers/merkle.rs b/lightning/src/offers/merkle.rs
@@ -48,7 +48,9 @@ fn root_hash(data: &[u8]) -> sha256::Hash {
 			break;
 		}
 
-		for (i, j) in (0..num_leaves).step_by(step).zip((offset..num_leaves).step_by(step)) {
+		let left_leaves = (0..num_leaves).step_by(step);
+		let right_leaves = (offset..num_leaves).step_by(step);
+		for (i, j) in left_leaves.zip(right_leaves) {
 			leaves[i] = tagged_branch_hash_from_engine(branch_tag.clone(), leaves[i], leaves[j]);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,9 @@ fn root_hash(data: &[u8]) -> sha256::Hash {`
`48`	`48`	`break;`
`49`	`49`	`}`
`50`	`50`
`51`		`- for (i, j) in (0..num_leaves).step_by(step).zip((offset..num_leaves).step_by(step)) {`
	`51`	`+ let left_leaves = (0..num_leaves).step_by(step);`
	`52`	`+ let right_leaves = (offset..num_leaves).step_by(step);`
	`53`	`+ for (i, j) in left_leaves.zip(right_leaves) {`
`52`	`54`	`leaves[i] = tagged_branch_hash_from_engine(branch_tag.clone(), leaves[i], leaves[j]);`
`53`	`55`	`}`
`54`	`56`	`}`