Skip to content

Commit

Permalink
digest: remove stuttering ParseDigest function
Browse files Browse the repository at this point in the history
Signed-off-by: Stephen J Day <stephen.day@docker.com>
  • Loading branch information
stevvooe committed Dec 15, 2016
1 parent d1b2120 commit a105b5c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
8 changes: 6 additions & 2 deletions digest.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,16 @@ var (

// ParseDigest parses s and returns the validated digest object. An error will
// be returned if the format is invalid.
func ParseDigest(s string) (Digest, error) {
func Parse(s string) (Digest, error) {
d := Digest(s)

return d, d.Validate()
}

// ParseDigest is deprecated. Use Parse.
func ParseDigest(s string) (Digest, error) {
return Parse(s)
}

// FromReader returns the most valid digest for the underlying content using
// the canonical digest algorithm.
func FromReader(rd io.Reader) (Digest, error) {
Expand Down
4 changes: 2 additions & 2 deletions digest_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func TestParseDigest(t *testing.T) {
err: ErrDigestUnsupported,
},
} {
digest, err := ParseDigest(testcase.input)
digest, err := Parse(testcase.input)
if err != testcase.err {
t.Fatalf("error differed from expected while parsing %q: %v != %v", testcase.input, err, testcase.err)
}
Expand All @@ -69,7 +69,7 @@ func TestParseDigest(t *testing.T) {
}

// Parse string return value and check equality
newParsed, err := ParseDigest(digest.String())
newParsed, err := Parse(digest.String())

if err != nil {
t.Fatalf("unexpected error parsing input %q: %v", testcase.input, err)
Expand Down

0 comments on commit a105b5c

Please sign in to comment.