From 8c5152dc652018101ca04a7fc619db417b5def61 Mon Sep 17 00:00:00 2001 From: vis2k Date: Sat, 10 Dec 2022 22:37:28 +0100 Subject: [PATCH] revert: "Weaver: added missing HashSet reader/writer generation after recent PR" - tests are still failing --- Assets/Mirror/Core/NetworkReaderExtensions.cs | 3 +++ Assets/Mirror/Core/NetworkWriterExtensions.cs | 3 +++ Assets/Mirror/Tests/Editor/NetworkWriterTest.cs | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Assets/Mirror/Core/NetworkReaderExtensions.cs b/Assets/Mirror/Core/NetworkReaderExtensions.cs index 66326757b..8c340f01f 100644 --- a/Assets/Mirror/Core/NetworkReaderExtensions.cs +++ b/Assets/Mirror/Core/NetworkReaderExtensions.cs @@ -257,6 +257,8 @@ public static List ReadList(this NetworkReader reader) // structs may have .Set members which weaver needs to be able to // fully serialize for NetworkMessages etc. // note that Weaver/Readers/GenerateReader() handles this manually. + // TODO writer not found. need to adjust weaver first. see tests. + /* public static HashSet ReadHashSet(this NetworkReader reader) { int length = reader.ReadInt(); @@ -269,6 +271,7 @@ public static HashSet ReadHashSet(this NetworkReader reader) } return result; } + */ public static T[] ReadArray(this NetworkReader reader) { diff --git a/Assets/Mirror/Core/NetworkWriterExtensions.cs b/Assets/Mirror/Core/NetworkWriterExtensions.cs index 05e310788..148080598 100644 --- a/Assets/Mirror/Core/NetworkWriterExtensions.cs +++ b/Assets/Mirror/Core/NetworkWriterExtensions.cs @@ -289,6 +289,8 @@ public static void WriteList(this NetworkWriter writer, List list) // structs may have .Set members which weaver needs to be able to // fully serialize for NetworkMessages etc. // note that Weaver/Writers/GenerateWriter() handles this manually. + // TODO writer not found. need to adjust weaver first. see tests. + /* public static void WriteHashSet(this NetworkWriter writer, HashSet hashSet) { if (hashSet is null) @@ -300,6 +302,7 @@ public static void WriteHashSet(this NetworkWriter writer, HashSet hashSet foreach (T item in hashSet) writer.Write(item); } + */ public static void WriteArray(this NetworkWriter writer, T[] array) { diff --git a/Assets/Mirror/Tests/Editor/NetworkWriterTest.cs b/Assets/Mirror/Tests/Editor/NetworkWriterTest.cs index a0a094885..44934a4ca 100644 --- a/Assets/Mirror/Tests/Editor/NetworkWriterTest.cs +++ b/Assets/Mirror/Tests/Editor/NetworkWriterTest.cs @@ -1317,7 +1317,7 @@ public void TestNullList() Assert.That(readList, Is.Null); } - [Test] + [Test, Ignore("TODO")] public void TestHashSet() { HashSet original = new HashSet() { 1, 2, 3, 4, 5 }; @@ -1329,7 +1329,7 @@ public void TestHashSet() Assert.That(readHashSet, Is.EqualTo(original)); } - [Test] + [Test, Ignore("TODO")] public void TestNullHashSet() { NetworkWriter writer = new NetworkWriter();