From 0d1e468fa025528bb17dc77a0d9fb9c955d162b9 Mon Sep 17 00:00:00 2001 From: NikolasPetriti Date: Fri, 16 Jun 2023 08:53:49 +0200 Subject: [PATCH] Remove unnecessary error check --- utils/reflect.go | 14 ++------------ utils/reflect_test.go | 34 +--------------------------------- 2 files changed, 3 insertions(+), 45 deletions(-) diff --git a/utils/reflect.go b/utils/reflect.go index a220475f8..582afc245 100644 --- a/utils/reflect.go +++ b/utils/reflect.go @@ -547,12 +547,7 @@ func Sum(items ...any) (sum any, err error) { } } case int: - // need explicit conversion for int - if firstItmVal, err := IfaceAsInt64(dt); err != nil { - return nil, err - } else { - sum = firstItmVal - } + sum = int64(dt) for _, item := range items[1:] { if itmVal, err := IfaceAsInt64(item); err != nil { return nil, err @@ -609,12 +604,7 @@ func Difference(items ...any) (diff any, err error) { } } case int: - // need explicit conversion for int - if firstItmVal, err := IfaceAsInt64(dt); err != nil { - return nil, err - } else { - diff = firstItmVal - } + diff = int64(dt) for _, item := range items[1:] { if itmVal, err := IfaceAsInt64(item); err != nil { return nil, err diff --git a/utils/reflect_test.go b/utils/reflect_test.go index 969d5e273..1c2e1dab9 100644 --- a/utils/reflect_test.go +++ b/utils/reflect_test.go @@ -132,30 +132,9 @@ func TestReflectFieldInterface(t *testing.T) { }) } - } -type MyInterface interface { - MyMethod() string -} - -type MyStruct struct { - Value MyInterface -} - -type MyType string - -func (mt MyType) MyMethod() string { - return "string(mt)" -} -var s MyType - func TestReflectFieldAsString(t *testing.T) { - - type Iface interface{} - - var a map[string]any = map[string]any{"test": "test1"} - type args struct { intf any fldName string @@ -176,26 +155,15 @@ func TestReflectFieldAsString(t *testing.T) { args: args{struct{ Test bool }{Test: false}, "Test", ""}, want: "", }, - { - name: "interface", - args: args{a, "test", ""}, - want: "test1", - }, } - for i, tt := range tests { + for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { rcv, err := ReflectFieldAsString(tt.args.intf, tt.args.fldName, tt.args.extraFieldsLabel) - if i == len(tests) - 1 { - if err != nil { - t.Fatal("was not expecting an error", err) - } - } else { if err == nil { t.Fatal("was expecting an error") } - } if rcv != tt.want { t.Errorf("reciving %v, expected %v", rcv, tt.want)