Skip to content

Commit 20cfc61

Browse files
committed
Clean-up and address PR comments
1 parent 6c1940b commit 20cfc61

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

digest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func Parse(s string) (Digest, error) {
8383
if err := d.Validate(); err != nil {
8484
return "", err
8585
}
86-
return d, nil
86+
return d, nil
8787
}
8888

8989
// FromReader consumes the content of rd until io.EOF, returning canonical digest.

digestset/set.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,14 @@ func (dst *Set) Lookup(d string) (digest.Digest, error) {
9292
alg digest.Algorithm
9393
hex string
9494
)
95-
dgst, err := digest.Parse(d)
95+
_, err := digest.Parse(d)
9696
if err == digest.ErrDigestInvalidFormat {
9797
hex = d
9898
searchFunc = func(i int) bool {
9999
return dst.entries[i].val >= d
100100
}
101101
} else {
102+
dgst := digest.Digest(d)
102103
hex = dgst.Hex()
103104
alg = dgst.Algorithm()
104105
searchFunc = func(i int) bool {

verifiers.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ func (hv hashVerifier) Write(p []byte) (n int, err error) {
4343

4444
func (hv hashVerifier) Verified() bool {
4545
switch digest := NewDigest(hv.digest.Algorithm(), hv.hash); digest {
46-
case hv.digest: return true
47-
case FromString(""): return true
46+
case hv.digest:
47+
return true
48+
case FromString(""):
49+
return true
4850
}
4951

5052
return false

0 commit comments

Comments
 (0)