fix: fixing resize buffer so that it uses byte capacity

MirageNet · Aug 1, 2021 · 927fe95 · 927fe95
1 parent d48091e
commit 927fe95
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Assets/Mirage/Runtime/Serialization/NetworkWriter.cs b/Assets/Mirage/Runtime/Serialization/NetworkWriter.cs
@@ -108,19 +108,20 @@ public NetworkWriter(int minByteCapacity, bool allowResize)
         }
 
 
-        void ResizeBuffer(int minCapacity)
+        void ResizeBuffer(int minBitCapacity)
         {
+            int minByteCapacity = minBitCapacity / 8;
             int size = managedBuffer.Length;
-            while (size < minCapacity)
+            while (size < minByteCapacity)
             {
                 size *= 2;
                 if (size > MaxBufferSize)
                 {
-                    throw new InvalidOperationException($"Can not resize buffer to {size} because it is above max value of {MaxBufferSize}");
+                    throw new InvalidOperationException($"Can not resize buffer to {size} bytes because it is above max value of {MaxBufferSize}");
                 }
             }
 
-            Debug.LogWarning($"Resizing buffer, new size:{size}");
+            Debug.LogWarning($"Resizing buffer, new size:{size} bytes");
 
             FreeHandle();
 

diff --git a/Assets/Tests/Runtime/Serialization/BitPackingReusingWriterTests.cs b/Assets/Tests/Runtime/Serialization/BitPackingReusingWriterTests.cs
@@ -9,7 +9,7 @@ public class BitPackingResizeTest
         private NetworkReader reader;
 
         [SetUp]
-        public void OneTimeSetUp()
+        public void SetUp()
         {
             writer = new NetworkWriter(1300, true);
             reader = new NetworkReader();
@@ -18,8 +18,11 @@ public void OneTimeSetUp()
         [TearDown]
         public void TearDown()
         {
+            // we have to clear these each time so that capactity doesn't effect other tests
             writer.Reset();
+            writer = null;
             reader.Dispose();
+            reader = null;
         }
 
         [Test]