Fix

Author: hamzahrmalik

Sources/NIOCore/ByteBuffer-quicBinaryEncodingStrategy.swift

@@ -26,7 +26,7 @@ extension ByteBuffer {
                     || requiredBytesHint == 4
                     || requiredBytesHint == 8
             )
-            self.requiredBytesHint = reservedCapacity
+            self.requiredBytesHint = requiredBytesHint
         }
 
         @inlinable
@@ -124,10 +124,10 @@ extension ByteBuffer {
 
 extension NIOBinaryIntegerEncodingStrategy where Self == ByteBuffer.QUICBinaryEncodingStrategy {
     @inlinable
-    public static func quic(reservedCapacity: Int) -> ByteBuffer.QUICBinaryEncodingStrategy {
-        ByteBuffer.QUICBinaryEncodingStrategy(reservedCapacity: reservedCapacity)
+    public static func quic(requiredBytesHint: Int) -> ByteBuffer.QUICBinaryEncodingStrategy {
+        ByteBuffer.QUICBinaryEncodingStrategy(requiredBytesHint: requiredBytesHint)
     }
 
     @inlinable
-    public static var quic: ByteBuffer.QUICBinaryEncodingStrategy { .quic(reservedCapacity: 4) }
+    public static var quic: ByteBuffer.QUICBinaryEncodingStrategy { .quic(requiredBytesHint: 4) }
 }

Tests/NIOCoreTests/ByteBufferQUICBinaryEncodingStrategyTests.swift

@@ -23,7 +23,7 @@ final class ByteBufferQUICBinaryEncodingStrategyTests: XCTestCase {
         // One byte, ie less than 63, just write out as-is
         for number in 0..<63 {
             var buffer = ByteBuffer()
-            let strategy = ByteBuffer.QUICBinaryEncodingStrategy(reservedCapacity: 0)
+            let strategy = ByteBuffer.QUICBinaryEncodingStrategy(requiredBytesHint: 0)
             let bytesWritten = strategy.writeInteger(number, to: &buffer)
             XCTAssertEqual(bytesWritten, 1)
             XCTAssertEqual(strategy.readInteger(as: UInt8.self, from: &buffer), UInt8(number))
@@ -33,7 +33,7 @@ final class ByteBufferQUICBinaryEncodingStrategyTests: XCTestCase {
 
     func testWriteTwoByteQUICVariableLengthInteger() {
         var buffer = ByteBuffer()
-        let strategy = ByteBuffer.QUICBinaryEncodingStrategy(reservedCapacity: 0)
+        let strategy = ByteBuffer.QUICBinaryEncodingStrategy(requiredBytesHint: 0)
         let bytesWritten = strategy.writeInteger(0b00111011_10111101, to: &buffer)
         XCTAssertEqual(bytesWritten, 2)
         // We need to mask the first 2 bits with 01 to indicate this is a 2 byte integer
@@ -44,7 +44,7 @@ final class ByteBufferQUICBinaryEncodingStrategyTests: XCTestCase {
 
     func testWriteFourByteQUICVariableLengthInteger() {
         var buffer = ByteBuffer()
-        let strategy = ByteBuffer.QUICBinaryEncodingStrategy(reservedCapacity: 0)
+        let strategy = ByteBuffer.QUICBinaryEncodingStrategy(requiredBytesHint: 0)
         let bytesWritten = strategy.writeInteger(0b00011101_01111111_00111110_01111101, to: &buffer)
         XCTAssertEqual(bytesWritten, 4)
         // 2 bit mask is 10 for 4 bytes so this becomes 0b10011101_01111111_00111110_01111101
@@ -54,7 +54,7 @@ final class ByteBufferQUICBinaryEncodingStrategyTests: XCTestCase {
 
     func testWriteEightByteQUICVariableLengthInteger() {
         var buffer = ByteBuffer()
-        let strategy = ByteBuffer.QUICBinaryEncodingStrategy(reservedCapacity: 0)
+        let strategy = ByteBuffer.QUICBinaryEncodingStrategy(requiredBytesHint: 0)
         let bytesWritten = strategy.writeInteger(
             0b00000010_00011001_01111100_01011110_11111111_00010100_11101000_10001100,
             to: &buffer
@@ -73,7 +73,7 @@ final class ByteBufferQUICBinaryEncodingStrategyTests: XCTestCase {
     func testWriteOneByteQUICVariableLengthIntegerWithTwoBytesReserved() {
         // We only need one byte but the encoder will use 2 because we reserved 2
         var buffer = ByteBuffer()
-        let strategy = ByteBuffer.QUICBinaryEncodingStrategy(reservedCapacity: 0)
+        let strategy = ByteBuffer.QUICBinaryEncodingStrategy(requiredBytesHint: 0)
         let bytesWritten = strategy.writeIntegerWithReservedCapacity(0b00000001, reservedCapacity: 2, to: &buffer)
         XCTAssertEqual(bytesWritten, 2)
         XCTAssertEqual(buffer.readInteger(as: UInt16.self), UInt16(0b01000000_00000001))
@@ -85,7 +85,7 @@ final class ByteBufferQUICBinaryEncodingStrategyTests: XCTestCase {
         for reservedCapacity in [0, 1, 2, 4, 8] {
             for testNumber in [0, 63, 15293, 494_878_333, 151_288_809_941_952_652] {
                 var buffer = ByteBuffer()
-                let strategy = ByteBuffer.QUICBinaryEncodingStrategy(reservedCapacity: 0)
+                let strategy = ByteBuffer.QUICBinaryEncodingStrategy(requiredBytesHint: 0)
                 let bytesWritten = strategy.writeIntegerWithReservedCapacity(
                     testNumber,
                     reservedCapacity: reservedCapacity,
@@ -102,12 +102,12 @@ final class ByteBufferQUICBinaryEncodingStrategyTests: XCTestCase {
 
     func testReadEmptyQUICVariableLengthInteger() {
         var buffer = ByteBuffer()
-        let strategy = ByteBuffer.QUICBinaryEncodingStrategy(reservedCapacity: 0)
+        let strategy = ByteBuffer.QUICBinaryEncodingStrategy(requiredBytesHint: 0)
         XCTAssertNil(strategy.readInteger(as: Int.self, from: &buffer))
     }
 
     func testWriteReadQUICVariableLengthInteger() {
-        let strategy = ByteBuffer.QUICBinaryEncodingStrategy(reservedCapacity: 0)
+        let strategy = ByteBuffer.QUICBinaryEncodingStrategy(requiredBytesHint: 0)
         for integer in [37, 15293, 494_878_333, 151_288_809_941_952_652] {
             var buffer = ByteBuffer()
             _ = strategy.writeInteger(integer, to: &buffer)