From 18e21518b72256e48aad508d65a66fbc94d819d6 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sat, 12 Mar 2016 02:53:20 +0100 Subject: simplify --- cmd/acme/main.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'cmd/acme/main.go') diff --git a/cmd/acme/main.go b/cmd/acme/main.go index 7097766..ffa74c9 100644 --- a/cmd/acme/main.go +++ b/cmd/acme/main.go @@ -28,7 +28,7 @@ func dialProvider(p provider) error { return nil } -func loadaccount(a account) (*acme.Account, error) { +func load(a account) (*acme.Account, error) { key, err := a.Load() if err != nil { return nil, err @@ -67,7 +67,7 @@ func register(prov *acme.Provider, a account) (*acme.Account, error) { } func loadAccount(prov *acme.Provider, a account) error { - acc, err := loadaccount(a) + acc, err := load(a) if err != nil { acc, err = register(prov, a) if err != nil { @@ -85,12 +85,8 @@ func loadAccount(prov *acme.Provider, a account) error { func requestCert(prov *acme.Provider, acc *acme.Account, d domain) error { c, err := d.Load() if err != nil { - if err == ErrNotFound { - c.PrivateKey, err = acme.NewKey(d.KeySize) - if err != nil { - return err - } - } else { + c.PrivateKey, err = acme.NewKey(d.KeySize) + if err != nil { return err } } -- cgit v1.2.3