From 3ac1d35257b56cca92ad0eb7f4d18abb366cf105 Mon Sep 17 00:00:00 2001 From: Aleksandar Pesic Date: Sun, 4 Dec 2022 21:48:20 +0100 Subject: simplify error handling fixes #6 Signed-off-by: Aleksandar Pesic --- internal/wireguard/wireguard.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'internal/wireguard') diff --git a/internal/wireguard/wireguard.go b/internal/wireguard/wireguard.go index 7da2623..0419ff6 100644 --- a/internal/wireguard/wireguard.go +++ b/internal/wireguard/wireguard.go @@ -1,24 +1,21 @@ -// package wireguard implements a few helpers for the WireGuard protocol +// Package wireguard implements a few helpers for the WireGuard protocol package wireguard import ( "fmt" "regexp" - "github.com/eduvpn/eduvpn-common/types" + "github.com/go-errors/errors" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" ) // GenerateKey generates a WireGuard private key using wgctrl // It returns an error if key generation failed. func GenerateKey() (wgtypes.Key, error) { - key, keyErr := wgtypes.GeneratePrivateKey() + key, err := wgtypes.GeneratePrivateKey() - if keyErr != nil { - return key, types.NewWrappedError( - "failed generating WireGuard key", - keyErr, - ) + if err != nil { + return key, errors.WrapPrefix(err, "failed generating WireGuard key", 0) } return key, nil } -- cgit v1.2.3