From e342a472545fe4ee2a2649d6e50075738a927f59 Mon Sep 17 00:00:00 2001 From: Matt Kocubinski Date: Tue, 11 Apr 2023 13:40:54 -0500 Subject: [PATCH] fix: test sometimes receives an error string containing unicode (#15791) --- x/tx/decode/unknown_test.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/x/tx/decode/unknown_test.go b/x/tx/decode/unknown_test.go index 9ed18b6c4f..dddabbb402 100644 --- a/x/tx/decode/unknown_test.go +++ b/x/tx/decode/unknown_test.go @@ -1,7 +1,7 @@ package decode_test import ( - "fmt" + "errors" "testing" "github.com/stretchr/testify/require" @@ -456,7 +456,7 @@ func TestRejectUnknownFieldsNested(t *testing.T) { recv: new(testpb.TestVersion1), // behavior change from previous implementation: we allow mismatched wire -> proto types, // but this will still error on ConsumeFieldValue - wantErr: fmt.Errorf(`could not consume field value for tagNum: 8, wireType: "unknown type: 7"; proto: cannot parse reserved wire type`), + wantErr: errors.New("cannot parse reserved wire type"), }, { name: "From nested proto message, message index 0", @@ -501,7 +501,7 @@ func TestRejectUnknownFieldsNested(t *testing.T) { desc := tt.recv.ProtoReflect().Descriptor() gotErr := decode.RejectUnknownFieldsStrict(protoBlob, desc, ProtoResolver) if tt.wantErr != nil { - require.EqualError(t, gotErr, tt.wantErr.Error()) + require.ErrorContains(t, gotErr, tt.wantErr.Error()) } else { require.NoError(t, gotErr) } @@ -636,8 +636,6 @@ func TestRejectUnknownFieldsFlat(t *testing.T) { c1 := new(testpb.Customer1) c1Desc := c1.ProtoReflect().Descriptor() - // err = proto.Unmarshal(blob, c1) - // require.NoError(t, err) gotErr := decode.RejectUnknownFieldsStrict(blob, c1Desc, ProtoResolver) if tt.wantErr != nil { require.EqualError(t, gotErr, tt.wantErr.Error())