two small changes from upgrading proto import

lime-green · Sep 29, 2023 · abcf342 · abcf342
1 parent 4e6431d
commit abcf342
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/cmd/wowsimcli/cmd/decode_link.go b/cmd/wowsimcli/cmd/decode_link.go
@@ -62,6 +62,6 @@ func decodeLink(link string) error {
 		return fmt.Errorf("cannot unmarshal raw proto: %w", err)
 	}
 
-	fmt.Println(protojson.Format(goproto.MessageV2(settings)))
+	fmt.Println(protojson.Format(goproto.Message(settings)))
 	return nil
 }
diff --git a/sim/core/bulksim_test.go b/sim/core/bulksim_test.go
@@ -107,7 +107,15 @@ func TestBulkSim(t *testing.T) {
 
 	want := &proto.BulkSimResult{}
 	if diff := cmp.Diff(want, got, cmp.Comparer(func(a, b *proto.BulkSimResult) bool {
-		return goproto.MarshalTextString(a) == goproto.MarshalTextString(b)
+		am, err := goproto.Marshal(a)
+		if err != nil {
+			return false
+		}
+		bm, err := goproto.Marshal(b)
+		if err != nil {
+			return false
+		}
+		return string(am) == string(bm)
 	})); diff != "" {
 		t.Fatalf("BulkSim() returned diff (-want +got):\n%s", diff)
 	}