Refactor: Pkg Error Package

Signed-off-by: nyagamunene <stevenyaga2014@gmail.com>

Author: nyagamunene

coap/api/transport.go

@@ -98,7 +98,7 @@ func handler(w mux.ResponseWriter, m *mux.Message) {
 	switch m.Code() {
 	case codes.GET:
 		resp.SetCode(codes.Content)
-		err = handleGet(m, w, msg, key)
+		err = handleGet(m.Context(), m, w, msg, key)
 	case codes.POST:
 		resp.SetCode(codes.Created)
 		err = service.Publish(m.Context(), key, msg)
@@ -122,7 +122,7 @@ func handler(w mux.ResponseWriter, m *mux.Message) {
 	}
 }
 
-func handleGet(m *mux.Message, w mux.ResponseWriter, msg *messaging.Message, key string) error {
+func handleGet(ctx context.Context, m *mux.Message, w mux.ResponseWriter, msg *messaging.Message, key string) error {
 	var obs uint32
 	obs, err := m.Options().Observe()
 	if err != nil {

pkg/errors/errors.go

@@ -86,35 +86,36 @@ func Contains(e1, e2 error) bool {
 }
 
 // Wrap returns an Error that wrap err with wrapper.
-func Wrap(wrapper, err error) error {
+func Wrap(wrapper, err error) Error {
 	if wrapper == nil || err == nil {
-		return wrapper
+		return wrapper.(Error)
 	}
 	if w, ok := wrapper.(Error); ok {
 		return &customError{
 			msg: w.Msg(),
-			err: cast(err),
+			err: Cast(err),
 		}
 	}
 	return &customError{
 		msg: wrapper.Error(),
-		err: cast(err),
+		err: Cast(err),
 	}
 }
 
 // Unwrap returns the wrapper and the error by separating the Wrapper from the error.
-func Unwrap(err error) (error, error) {
+func Unwrap(err error) (Error, Error) {
 	if ce, ok := err.(Error); ok {
 		if ce.Err() == nil {
 			return nil, New(ce.Msg())
 		}
 		return New(ce.Msg()), ce.Err()
 	}
 
-	return nil, err
+	return nil, Cast(err)
 }
 
-func cast(err error) Error {
+// Cast returns an Error from an error.
+func Cast(err error) Error {
 	if err == nil {
 		return nil
 	}

pkg/errors/sdk_errors.go

@@ -56,7 +56,7 @@ func NewSDKError(err error) SDKError {
 			statusCode: 0,
 			customError: &customError{
 				msg: e.Msg(),
-				err: cast(e.Err()),
+				err: Cast(e.Err()),
 			},
 		}
 	}
@@ -80,7 +80,7 @@ func NewSDKErrorWithStatus(err error, statusCode int) SDKError {
 			statusCode: statusCode,
 			customError: &customError{
 				msg: e.Msg(),
-				err: cast(e.Err()),
+				err: Cast(e.Err()),
 			},
 		}
 	}