kyle/goutils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

gofmt cleanups.

Browse Source
This commit is contained in:
Kyle Isom
2017-11-16 08:26:27 -08:00
parent cb16cfa183
commit 832475db56
7 changed files with 48 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ahash/ahash.go
View File

@@ -56,7 +56,7 @@ var sliceFunctions = map[string]func([]byte) []byte{
type Hash struct {
hash.Hash
secure bool
algo string
algo string
}
// HashAlgo returns the name of the underlying hash algorithm.
@@ -127,19 +127,19 @@ var secureHashes = map[string]func() hash.Hash{
"blake2b-512": blakeFunc(blake2b.New512),
}
func newHash32(f func () hash.Hash32) func () hash.Hash {
func newHash32(f func() hash.Hash32) func() hash.Hash {
return func() hash.Hash {
return f()
}
}
func newHash64(f func () hash.Hash64) func () hash.Hash {
func newHash64(f func() hash.Hash64) func() hash.Hash {
return func() hash.Hash {
return f()
}
}
func newCRC64(tab uint64) func () hash.Hash {
func newCRC64(tab uint64) func() hash.Hash {
return newHash64(
func() hash.Hash64 {
return crc64.New(crc64.MakeTable(tab))

64
ahash/ahash_test.go
View File

@@ -12,11 +12,11 @@ func TestSecureHash(t *testing.T) {
algo := "sha256"
h, err := New(algo)
assert.NoErrorT(t, err)
assert.BoolT(t, h.IsSecure(), algo + " should be a secure hash")
assert.BoolT(t, h.IsSecure(), algo+" should be a secure hash")
assert.BoolT(t, h.HashAlgo() == algo, "hash returned the wrong HashAlgo")
assert.BoolT(t, !h.IsHash32(), algo + " isn't actually a 32-bit hash")
assert.BoolT(t, !h.IsHash64(), algo + " isn't actually a 64-bit hash")
assert.BoolT(t, !h.IsHash32(), algo+" isn't actually a 32-bit hash")
assert.BoolT(t, !h.IsHash64(), algo+" isn't actually a 64-bit hash")
var data []byte
var expected = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
sum, err := Sum(algo, data)
@@ -29,7 +29,7 @@ func TestSecureHash(t *testing.T) {
sum, err = SumReader(algo, buf)
assert.NoErrorT(t, err)
assert.BoolT(t, fmt.Sprintf("%x", sum) == expected, fmt.Sprintf("expected hash %s but have %x", expected, sum))
data = []byte("hello world")
_, err = h.Write(data)
assert.NoErrorT(t, err)
@@ -42,10 +42,10 @@ func TestInsecureHash(t *testing.T) {
algo := "md5"
h, err := New(algo)
assert.NoErrorT(t, err)
assert.BoolT(t, !h.IsSecure(), algo + " shouldn't be a secure hash")
assert.BoolT(t, !h.IsSecure(), algo+" shouldn't be a secure hash")
assert.BoolT(t, h.HashAlgo() == algo, "hash returned the wrong HashAlgo")
assert.BoolT(t, !h.IsHash32(), algo + " isn't actually a 32-bit hash")
assert.BoolT(t, !h.IsHash64(), algo + " isn't actually a 64-bit hash")
assert.BoolT(t, !h.IsHash32(), algo+" isn't actually a 32-bit hash")
assert.BoolT(t, !h.IsHash64(), algo+" isn't actually a 64-bit hash")
var data []byte
var expected = "d41d8cd98f00b204e9800998ecf8427e"
@@ -59,7 +59,7 @@ func TestInsecureHash(t *testing.T) {
sum, err = SumReader(algo, buf)
assert.NoErrorT(t, err)
assert.BoolT(t, fmt.Sprintf("%x", sum) == expected, fmt.Sprintf("expected hash %s but have %x", expected, sum))
data = []byte("hello world")
_, err = h.Write(data)
assert.NoErrorT(t, err)
@@ -72,31 +72,31 @@ func TestHash32(t *testing.T) {
algo := "crc32-ieee"
h, err := New(algo)
assert.NoErrorT(t, err)
assert.BoolT(t, !h.IsSecure(), algo + " shouldn't be a secure hash")
assert.BoolT(t, !h.IsSecure(), algo+" shouldn't be a secure hash")
assert.BoolT(t, h.HashAlgo() == algo, "hash returned the wrong HashAlgo")
assert.BoolT(t, h.IsHash32(), algo + " is actually a 32-bit hash")
assert.BoolT(t, !h.IsHash64(), algo + " isn't actually a 64-bit hash")
assert.BoolT(t, h.IsHash32(), algo+" is actually a 32-bit hash")
assert.BoolT(t, !h.IsHash64(), algo+" isn't actually a 64-bit hash")
var data []byte
var expected uint32
h.Write(data)
sum, ok := h.Sum32()
assert.BoolT(t, ok, algo + " should be able to return a Sum32")
assert.BoolT(t, ok, algo+" should be able to return a Sum32")
assert.BoolT(t, expected == sum, fmt.Sprintf("%s returned the %d but expected %d", algo, sum, expected))
data = []byte("hello, world")
expected = 0xffab723a
h.Write(data)
sum, ok = h.Sum32()
assert.BoolT(t, ok, algo + " should be able to return a Sum32")
assert.BoolT(t, ok, algo+" should be able to return a Sum32")
assert.BoolT(t, expected == sum, fmt.Sprintf("%s returned the %d but expected %d", algo, sum, expected))
h.Reset()
data = []byte("hello world")
h.Write(data)
sum, ok = h.Sum32()
assert.BoolT(t, ok, algo + " should be able to return a Sum32")
assert.BoolT(t, ok, algo+" should be able to return a Sum32")
assert.BoolT(t, expected != sum, fmt.Sprintf("%s returned %d but shouldn't have", algo, sum, expected))
}
@@ -104,31 +104,31 @@ func TestHash64(t *testing.T) {
algo := "crc64"
h, err := New(algo)
assert.NoErrorT(t, err)
assert.BoolT(t, !h.IsSecure(), algo + " shouldn't be a secure hash")
assert.BoolT(t, !h.IsSecure(), algo+" shouldn't be a secure hash")
assert.BoolT(t, h.HashAlgo() == algo, "hash returned the wrong HashAlgo")
assert.BoolT(t, h.IsHash64(), algo + " is actually a 64-bit hash")
assert.BoolT(t, !h.IsHash32(), algo + " isn't actually a 32-bit hash")
assert.BoolT(t, h.IsHash64(), algo+" is actually a 64-bit hash")
assert.BoolT(t, !h.IsHash32(), algo+" isn't actually a 32-bit hash")
var data []byte
var expected uint64
h.Write(data)
sum, ok := h.Sum64()
assert.BoolT(t, ok, algo + " should be able to return a Sum64")
assert.BoolT(t, ok, algo+" should be able to return a Sum64")
assert.BoolT(t, expected == sum, fmt.Sprintf("%s returned the %d but expected %d", algo, sum, expected))
data = []byte("hello, world")
expected = 0x16c45c0eb1d9c2ec
h.Write(data)
sum, ok = h.Sum64()
assert.BoolT(t, ok, algo + " should be able to return a Sum64")
assert.BoolT(t, ok, algo+" should be able to return a Sum64")
assert.BoolT(t, expected == sum, fmt.Sprintf("%s returned the %d but expected %d", algo, sum, expected))
h.Reset()
data = []byte("hello world")
h.Write(data)
sum, ok = h.Sum64()
assert.BoolT(t, ok, algo + " should be able to return a Sum64")
assert.BoolT(t, ok, algo+" should be able to return a Sum64")
assert.BoolT(t, expected != sum, fmt.Sprintf("%s returned %d but shouldn't have", algo, sum, expected))
}
@@ -136,6 +136,6 @@ func TestListLengthSanity(t *testing.T) {
all := HashList()
secure := SecureHashList()
insecure := InsecureHashList()
assert.BoolT(t, len(all) == len(secure) + len(insecure))
}
assert.BoolT(t, len(all) == len(secure)+len(insecure))
}