Merge remote-tracking branch 'origin/master' into spec-0.6

This commit is contained in:
Michael Sproul
2019-05-14 12:09:59 +10:00
161 changed files with 1785 additions and 4645 deletions

View File

@@ -31,7 +31,7 @@ pub fn merkle_root(values: &[Vec<u8>]) -> Option<Vec<u8>> {
}
// the root hash will be at index 1
return Some(o[1].clone());
Some(o[1].clone())
}
#[cfg(test)]