-
Notifications
You must be signed in to change notification settings - Fork 263
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
crypto/merkle: hashing ~10% faster and ~60% fewer allocs #351
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,6 +35,7 @@ func TestKeyPath(t *testing.T) { | |
|
||
res, err := KeyPathToKeys(path.String()) | ||
require.Nil(t, err) | ||
require.Equal(t, len(keys), len(res)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The loop below could possibly PASS even if |
||
|
||
for i, key := range keys { | ||
require.Equal(t, key, res[i]) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,27 @@ | ||
package merkle | ||
|
||
import ( | ||
"crypto/sha256" | ||
jsign marked this conversation as resolved.
Show resolved
Hide resolved
|
||
"hash" | ||
"math/bits" | ||
) | ||
|
||
// HashFromByteSlices computes a Merkle tree where the leaves are the byte slice, | ||
// in the provided order. It follows RFC-6962. | ||
func HashFromByteSlices(items [][]byte) []byte { | ||
return hashFromByteSlices(sha256.New(), items) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Note to myself: at some point, we need to search for all occurrences like this and make sure they use a central variable / constant instead (just in case we decide to switch to another hash function instead) |
||
} | ||
func hashFromByteSlices(sha hash.Hash, items [][]byte) []byte { | ||
switch len(items) { | ||
case 0: | ||
return emptyHash() | ||
case 1: | ||
return leafHash(items[0]) | ||
return leafHashOpt(sha, items[0]) | ||
default: | ||
k := getSplitPoint(int64(len(items))) | ||
left := HashFromByteSlices(items[:k]) | ||
right := HashFromByteSlices(items[k:]) | ||
return innerHash(left, right) | ||
left := hashFromByteSlices(sha, items[:k]) | ||
right := hashFromByteSlices(sha, items[k:]) | ||
return innerHashOpt(sha, left, right) | ||
} | ||
} | ||
|
||
|
@@ -60,10 +65,11 @@ func HashFromByteSlices(items [][]byte) []byte { | |
// read, it might not be worthwhile to switch to a less intuitive | ||
// implementation for so little benefit. | ||
func HashFromByteSlicesIterative(input [][]byte) []byte { | ||
sha := sha256.New() | ||
items := make([][]byte, len(input)) | ||
|
||
for i, leaf := range input { | ||
items[i] = leafHash(leaf) | ||
items[i] = leafHashOpt(sha, leaf) | ||
} | ||
|
||
size := len(items) | ||
|
@@ -78,7 +84,7 @@ func HashFromByteSlicesIterative(input [][]byte) []byte { | |
wp := 0 // write position | ||
for rp < size { | ||
if rp+1 < size { | ||
items[wp] = innerHash(items[rp], items[rp+1]) | ||
items[wp] = innerHashOpt(sha, items[rp], items[rp+1]) | ||
rp += 2 | ||
} else { | ||
items[wp] = items[rp] | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The main idea is to avoid appending and re-use a provided
hash.Hash
.