Better errors

Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>

Author: peterbroadhurst

internal/signermsgs/en_error_messges.go

@@ -107,4 +107,5 @@ var (
 	MsgInvalidNumberString         = ffe("FF22088", "Invalid integer string '%s'")
 	MsgInvalidIntPrecisionLoss     = ffe("FF22089", "String %s cannot be converted to integer without losing precision")
 	MsgInvalidUint64PrecisionLoss  = ffe("FF22090", "String %s cannot be converted to a uint64 without losing precision")
+	MsgInvalidJSONTypeForBigInt    = ffe("FF22091", "JSON parsed '%T' cannot be converted to an integer")
 )

pkg/ethtypes/hexinteger.go

@@ -36,7 +36,7 @@ func (h HexInteger) MarshalJSON() ([]byte, error) {
 }
 
 func (h *HexInteger) UnmarshalJSON(b []byte) error {
-	bi, err := UnmarshalBigInt(b)
+	bi, err := UnmarshalBigInt(context.Background(), b)
 	if err != nil {
 		return err
 	}

pkg/ethtypes/hexinteger_test.go

@@ -90,7 +90,7 @@ func TestHexIntegerBadType(t *testing.T) {
 	}`
 
 	err := json.Unmarshal([]byte(testData), &testStruct)
-	assert.Regexp(t, "unable to parse integer", err)
+	assert.Regexp(t, "FF22091", err)
 }
 
 func TestHexIntegerBadJSON(t *testing.T) {

pkg/ethtypes/hexuint64.go

@@ -40,7 +40,7 @@ func (h HexUint64) MarshalJSON() ([]byte, error) {
 }
 
 func (h *HexUint64) UnmarshalJSON(b []byte) error {
-	bi, err := UnmarshalBigInt(b)
+	bi, err := UnmarshalBigInt(context.Background(), b)
 	if err != nil {
 		return err
 	}

pkg/ethtypes/hexuint64_test.go

@@ -87,7 +87,7 @@ func TestHexUint64BadType(t *testing.T) {
 	}`
 
 	err := json.Unmarshal([]byte(testData), &testStruct)
-	assert.Regexp(t, "unable to parse integer", err)
+	assert.Regexp(t, "FF22091", err)
 }
 
 func TestHexUint64BadJSON(t *testing.T) {

pkg/ethtypes/integer_parsing.go

@@ -20,7 +20,6 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"fmt"
 	"math/big"
 
 	"github.com/hyperledger/firefly-common/pkg/i18n"
@@ -49,7 +48,7 @@ func BigIntegerFromString(ctx context.Context, s string) (*big.Int, error) {
 	return i, nil
 }
 
-func UnmarshalBigInt(b []byte) (*big.Int, error) {
+func UnmarshalBigInt(ctx context.Context, b []byte) (*big.Int, error) {
 	var i interface{}
 	d := json.NewDecoder(bytes.NewReader(b))
 	d.UseNumber()
@@ -63,6 +62,6 @@ func UnmarshalBigInt(b []byte) (*big.Int, error) {
 	case string:
 		return BigIntegerFromString(context.Background(), i)
 	default:
-		return nil, fmt.Errorf("unable to parse integer from type %T", i)
+		return nil, i18n.NewError(ctx, signermsgs.MsgInvalidJSONTypeForBigInt, i)
 	}
 }