Merge branch 'master' into add-chain-benchmarks

This commit is contained in:
Paul Hauner
2019-02-05 05:49:45 +11:00
4 changed files with 31 additions and 15 deletions

View File

@@ -30,8 +30,9 @@ pub fn merkle_hash(list: &mut Vec<Vec<u8>>) -> Vec<u8> {
// Hash two chuncks together
new_chunkz.append(&mut hash(two_chunks));
}
chunk_size = HASHSIZE;
}
chunk_size = HASHSIZE;
chunkz = new_chunkz;
}