From d76f5cee70aa4a9150ce64e1777c9876d026e0e9 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Thu, 3 Sep 2020 19:11:13 +0200 Subject: [PATCH] Remove duplicate tests in unknownproto (#7231) Co-authored-by: Alexander Bezobchuk --- codec/unknownproto/unknown_fields_test.go | 75 ----------------------- 1 file changed, 75 deletions(-) diff --git a/codec/unknownproto/unknown_fields_test.go b/codec/unknownproto/unknown_fields_test.go index c5372eb9b..937e8654d 100644 --- a/codec/unknownproto/unknown_fields_test.go +++ b/codec/unknownproto/unknown_fields_test.go @@ -651,81 +651,6 @@ func TestRejectUnknownFieldsFlat(t *testing.T) { } } -func TestMismatchedTypes_Nested(t *testing.T) { - tests := []struct { - name string - in proto.Message - recv proto.Message - wantErr error - }{ - { - name: "mismatched types.Any in G", - in: &testdata.TestVersion1{ - G: &types.Any{ - TypeUrl: "/testdata.TestVersion4LoneNesting", - Value: mustMarshal(&testdata.TestVersion3LoneNesting_Inner1{ - Inner: &testdata.TestVersion3LoneNesting_Inner1_InnerInner{ - Id: "ID", - City: "Gotham", - }, - }), - }, - }, - recv: new(testdata.TestVersion1), - wantErr: &errMismatchedWireType{ - Type: "*testdata.TestVersion3", - TagNum: 8, - GotWireType: 7, - WantWireType: 2, - }, - }, - { - name: "From nested proto message, message index 0", - in: &testdata.TestVersion3LoneNesting{ - Inner1: &testdata.TestVersion3LoneNesting_Inner1{ - Id: 10, - Name: "foo", - Inner: &testdata.TestVersion3LoneNesting_Inner1_InnerInner{ - Id: "ID", - City: "Palo Alto", - }, - }, - }, - recv: new(testdata.TestVersion4LoneNesting), - wantErr: nil, - }, - { - name: "From nested proto message, message index 1", - in: &testdata.TestVersion3LoneNesting{ - Inner2: &testdata.TestVersion3LoneNesting_Inner2{ - Id: "ID", - Country: "Maldives", - Inner: &testdata.TestVersion3LoneNesting_Inner2_InnerInner{ - Id: "ID", - City: "Unknown", - }, - }, - }, - recv: new(testdata.TestVersion4LoneNesting), - wantErr: nil, - }, - } - - for _, tt := range tests { - tt := tt - t.Run(tt.name, func(t *testing.T) { - protoBlob, err := proto.Marshal(tt.in) - if err != nil { - t.Fatal(err) - } - _, gotErr := RejectUnknownFields(protoBlob, tt.recv, false) - if !reflect.DeepEqual(gotErr, tt.wantErr) { - t.Fatalf("Error mismatch\nGot:\n%s\n\nWant:\n%s", gotErr, tt.wantErr) - } - }) - } -} - // Issue https://github.com/cosmos/cosmos-sdk/issues/7222, we need to ensure that repeated // uint64 are recognized as packed. func TestPackedEncoding(t *testing.T) {