From 6d7541a8eded4c8a37af9b58c34b5e90f2a89f67 Mon Sep 17 00:00:00 2001
From: eatmoreapple <eatmoreorange@gmail.com>
Date: Sat, 12 Nov 2022 21:01:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20NetworkErr=20=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client.go      |  2 +-
 errors.go      | 13 -------------
 errors_test.go |  3 ++-
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/client.go b/client.go
index e03d672..54ebb18 100644
--- a/client.go
+++ b/client.go
@@ -88,7 +88,7 @@ func (c *Client) do(req *http.Request) (*http.Response, error) {
 		}
 	}
 	if err != nil {
-		err = ErrorWrapper(NetworkErr, err.Error())
+		err = fmt.Errorf("%w: %s", NetworkErr, err.Error())
 	}
 	for _, hook := range c.HttpHooks {
 		hook.AfterRequest(resp, err)
diff --git a/errors.go b/errors.go
index a004358..19dfea8 100644
--- a/errors.go
+++ b/errors.go
@@ -4,19 +4,6 @@ import (
 	"errors"
 )
 
-type errorWrapper struct {
-	err error
-	msg string
-}
-
-func (e errorWrapper) Unwrap() error { return e.err }
-
-func (e errorWrapper) Error() string { return e.msg }
-
-func ErrorWrapper(err error, msg string) error {
-	return &errorWrapper{msg: msg, err: err}
-}
-
 var NetworkErr = errors.New("wechat network error")
 
 func IsNetworkError(err error) bool {
diff --git a/errors_test.go b/errors_test.go
index cd4e2f6..77d977d 100644
--- a/errors_test.go
+++ b/errors_test.go
@@ -2,12 +2,13 @@ package openwechat
 
 import (
 	"errors"
+	"fmt"
 	"testing"
 )
 
 func TestIsNetworkError(t *testing.T) {
 	var err = errors.New("test error")
-	err = ErrorWrapper(NetworkErr, err.Error())
+	err = fmt.Errorf("%w: %s", NetworkErr, err.Error())
 	if !IsNetworkError(err) {
 		t.Error("err is not network error")
 	}