From a1259adec2840f1a6519fefb21ce9c3c4b1b6656 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Wed, 20 Jan 2016 10:52:10 +0100 Subject: Move problem to errors --- errors.go | 15 ++++++++++++++- provider.go | 10 ---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/errors.go b/errors.go index c38bbf8..7e5bc17 100644 --- a/errors.go +++ b/errors.go @@ -1,6 +1,10 @@ package acme -import "errors" +import ( + "encoding/json" + "errors" + "io" +) var ( ErrBadCSR = errors.New("CSR is unacceptable") @@ -26,3 +30,12 @@ var urnErrors = map[string]error{ "urn:acme:error:unauthorized": ErrUnauthorized, "urn:acme:error:unknownHost": ErrUnknownHost, } + +func problem(r io.Reader) error { + var p Problem + if err := json.NewDecoder(r).Decode(&p); err != nil { + return err + } + p.Err = urnErrors[p.Type] + return p +} diff --git a/provider.go b/provider.go index 4478968..020dec5 100644 --- a/provider.go +++ b/provider.go @@ -4,7 +4,6 @@ import ( "crypto/x509" "encoding/json" "errors" - "io" "log" "net/http" "regexp" @@ -125,15 +124,6 @@ func parseCert(resp *http.Response) (*x509.Certificate, error) { return readCert(resp.Body) } -func problem(r io.Reader) error { - var p Problem - if err := json.NewDecoder(r).Decode(&p); err != nil { - return err - } - p.Err = urnErrors[p.Type] - return p -} - func (p *Provider) Register(s Signer, c Contacts) error { // first step: new-reg r := &Registration{ -- cgit v1.2.3