Skip to content

Commit

Permalink
Merge pull request #129 from multiformats/test/basic-sum-test
Browse files Browse the repository at this point in the history
fix: only register one blake2s length
  • Loading branch information
Stebalien committed May 13, 2020
2 parents 62f4ba0 + ccdaf55 commit 6f1ea18
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 10 deletions.
14 changes: 4 additions & 10 deletions sum.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,7 @@ func Sum(data []byte, code uint64, length int) (Multihash, error) {
return Encode(d, code)
}

func sumBlake2s(data []byte, size int) ([]byte, error) {
if size != 32 {
return nil, fmt.Errorf("unsupported length for blake2s: %d", size)
}
func sumBlake2s32(data []byte, _ int) ([]byte, error) {
d := blake2s.Sum256(data)
return d[:], nil
}
Expand Down Expand Up @@ -209,12 +206,9 @@ func registerNonStdlibHashFuncs() {

// Blake family of hash functions
// BLAKE2S
for c := uint64(BLAKE2S_MIN); c <= BLAKE2S_MAX; c++ {
size := int(c - BLAKE2S_MIN + 1)
RegisterHashFunc(c, func(buf []byte, _ int) ([]byte, error) {
return sumBlake2s(buf, size)
})
}
//
// We only support 32byte (256 bit)
RegisterHashFunc(BLAKE2S_MIN+31, sumBlake2s32)
// BLAKE2B
for c := uint64(BLAKE2B_MIN); c <= BLAKE2B_MAX; c++ {
size := int(c - BLAKE2B_MIN + 1)
Expand Down
15 changes: 15 additions & 0 deletions sum_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -181,3 +181,18 @@ func TestTooLargeLength(t *testing.T) {
t.Fatal("bad error", err)
}
}

func TestBasicSum(t *testing.T) {
for code, name := range Codes {
defaultLen, ok := DefaultLengths[code]
if !ok {
defaultLen = 32
}
_, err := Sum([]byte("test"), code, defaultLen)
switch err {
case ErrSumNotSupported, nil:
default:
t.Errorf("unexpected error for %s: %s", name, err)
}
}
}

0 comments on commit 6f1ea18

Please sign in to comment.