Fix feedback as provided by Cory

Sources/NIOTransportServices/Datagram/NIOTSDatagramBootstrap.swift

@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #if canImport(Network)
-import NIO
+import NIOCore
 import Dispatch
 import Network
 
@@ -37,7 +37,7 @@ import Network
 ///     /* the Channel is now connected */
 /// ```
 ///
-/// The connected `NIOTSDatagramChannel` will operate on `ByteBuffer` as inbound and on `IOData` as outbound messages.
+/// The connected `NIOTSDatagramChannel` will operate on `ByteBuffer` as inbound and outbound messages.
 @available(OSX 10.14, iOS 12.0, tvOS 12.0, watchOS 6.0, *)
 public final class NIOTSDatagramBootstrap {
     private let group: EventLoopGroup
@@ -51,7 +51,7 @@ public final class NIOTSDatagramBootstrap {
     /// Create a `NIOTSDatagramConnectionBootstrap` on the `EventLoopGroup` `group`.
     ///
     /// This initializer only exists to be more in-line with the NIO core bootstraps, in that they
-    /// may be constructed with an `EventLoopGroup` and by extenstion an `EventLoop`. As such an
+    /// may be constructed with an `EventLoopGroup` and by extension an `EventLoop`. As such an
     /// existing `NIOTSEventLoop` may be used to initialize this bootstrap. Where possible the
     /// initializers accepting `NIOTSEventLoopGroup` should be used instead to avoid the wrong
     /// type being used.
@@ -75,7 +75,7 @@ public final class NIOTSDatagramBootstrap {
     /// Initialize the connected `NIOTSDatagramConnectionChannel` with `initializer`. The most common task in initializer is to add
     /// `ChannelHandler`s to the `ChannelPipeline`.
     ///
-    /// The connected `Channel` will operate on `ByteBuffer` as inbound and `IOData` as outbound messages.
+    /// The connected `Channel` will operate on `ByteBuffer` as inbound and outbound messages.
     ///
     /// - parameters:
     ///     - handler: A closure that initializes the provided `Channel`.

Sources/NIOTransportServices/Datagram/NIOTSDatagramChannel.swift

@@ -15,7 +15,7 @@
 #if canImport(Network)
 import Atomics
 import Foundation
-import NIO
+import NIOCore
 import NIOConcurrencyHelpers
 import NIOFoundationCompat
 import NIOTLS
@@ -75,7 +75,7 @@ internal final class NIOTSDatagramChannel: StateManagedNWConnectionChannel {
     internal var connectPromise: EventLoopPromise<Void>?
 
     /// The UDP options for this connection.
-    private var udpOptions: NWProtocolUDP.Options
+    private let udpOptions: NWProtocolUDP.Options
 
     internal var nwOptions: NWProtocolUDP.Options { udpOptions }
 
@@ -96,7 +96,7 @@ internal final class NIOTSDatagramChannel: StateManagedNWConnectionChannel {
     internal var options = TransportServicesChannelOptions()
 
     /// Any pending writes that have yet to be delivered to the network stack.
-    internal var _pendingWrites = CircularBuffer<PendingWrite>(initialCapacity: 8)
+    internal var pendingWrites = CircularBuffer<PendingWrite>(initialCapacity: 8)
 
     /// An object to keep track of pending writes and manage our backpressure signaling.
     internal var _backpressureManager = BackpressureManager()
@@ -111,7 +111,7 @@ internal final class NIOTSDatagramChannel: StateManagedNWConnectionChannel {
     internal var enablePeerToPeer = false
 
     /// The cache of the local and remote socket addresses. Must be accessed using _addressCacheLock.
-    private var _addressCache = AddressCache(local: nil, remote: nil)
+    internal var _addressCache = AddressCache(local: nil, remote: nil)
 
     internal var addressCache: AddressCache {
         get {
@@ -127,7 +127,7 @@ internal final class NIOTSDatagramChannel: StateManagedNWConnectionChannel {
     }
 
     /// A lock that guards the _addressCache.
-    private let _addressCacheLock = NIOLock()
+    internal let _addressCacheLock = NIOLock()
 
     internal var allowLocalEndpointReuse = false
     internal var multipathServiceType: NWParameters.MultipathServiceType = .disabled

Sources/NIOTransportServices/Datagram/NIOTSDatagramListener.swift

@@ -70,7 +70,7 @@ public final class NIOTSDatagramListenerBootstrap {
     /// Create a ``NIOTSListenerBootstrap`` for the `EventLoopGroup` `group`.
     ///
     /// This initializer only exists to be more in-line with the NIO core bootstraps, in that they
-    /// may be constructed with an `EventLoopGroup` and by extenstion an `EventLoop`. As such an
+    /// may be constructed with an `EventLoopGroup` and by extension an `EventLoop`. As such an
     /// existing `NIOTSEventLoop` may be used to initialize this bootstrap. Where possible the
     /// initializers accepting ``NIOTSEventLoopGroup`` should be used instead to avoid the wrong
     /// type being used.

Sources/NIOTransportServices/Datagram/NIOTSDatagramListenerChannel.swift

@@ -33,6 +33,14 @@ internal final class NIOTSDatagramListenerChannel: StateManagedListenerChannel<N
             return options
         }
         set {
+            assert({
+                if case .udp = protocolOptions {
+                    return true
+                } else {
+                    return false
+                }
+            }(), "The protocol options of this channel were not configured as UDP")
+
             protocolOptions = .udp(newValue)
         }
     }
@@ -47,6 +55,14 @@ internal final class NIOTSDatagramListenerChannel: StateManagedListenerChannel<N
             return options
         }
         set {
+            assert({
+                if case .udp = childProtocolOptions {
+                    return true
+                } else {
+                    return false
+                }
+            }(), "The protocol options of child channelss were not configured as UDP")
+
             childProtocolOptions = .udp(newValue)
         }
     }

Sources/NIOTransportServices/NIOTSConnectionChannel.swift

@@ -172,7 +172,7 @@ internal final class NIOTSConnectionChannel: StateManagedNWConnectionChannel {
     internal var state: ChannelState<ActiveSubstate> = .idle
 
     /// The active state, used for safely reporting the channel state across threads.
-    internal var isActive0 = ManagedAtomic(false)
+    internal let isActive0 = ManagedAtomic(false)
 
     /// The kinds of channel activation this channel supports
     internal let supportedActivationType: ActivationType = .connect
@@ -221,19 +221,6 @@ internal final class NIOTSConnectionChannel: StateManagedNWConnectionChannel {
         }
     }
 
-    internal var addressCache: AddressCache {
-        get {
-            return self._addressCacheLock.withLock {
-                return self._addressCache
-            }
-        }
-        set {
-            return self._addressCacheLock.withLock {
-                self._addressCache = newValue
-            }
-        }
-    }
-
     /// A lock that guards the _addressCache.
     internal let _addressCacheLock = NIOLock()
 
@@ -438,8 +425,8 @@ extension NIOTSConnectionChannel {
     /// Drop all outstanding writes. Must only be called in the inactive
     /// state.
     private func dropOutNIOTransportServicesTestsstandingWrites(error: Error) {
-        while self._pendingWrites.count > 0 {
-            self._pendingWrites.removeFirst().promise?.fail(error)
+        while self.pendingWrites.count > 0 {
+            self.pendingWrites.removeFirst().promise?.fail(error)
         }
     }
 

Sources/NIOTransportServices/NIOTSListenerBootstrap.swift

@@ -70,7 +70,7 @@ public final class NIOTSListenerBootstrap {
     /// Create a ``NIOTSListenerBootstrap`` for the `EventLoopGroup` `group`.
     ///
     /// This initializer only exists to be more in-line with the NIO core bootstraps, in that they
-    /// may be constructed with an `EventLoopGroup` and by extenstion an `EventLoop`. As such an
+    /// may be constructed with an `EventLoopGroup` and by extension an `EventLoop`. As such an
     /// existing `NIOTSEventLoop` may be used to initialize this bootstrap. Where possible the
     /// initializers accepting ``NIOTSEventLoopGroup`` should be used instead to avoid the wrong
     /// type being used.

Sources/NIOTransportServices/NIOTSListenerChannel.swift

@@ -56,7 +56,7 @@ internal final class NIOTSListenerChannel: StateManagedListenerChannel<NIOTSConn
         }
         set {
             assert({
-                if case .tcp = protocolOptions {
+                if case .tcp = childProtocolOptions {
                     return true
                 } else {
                     return false

Sources/NIOTransportServices/StateManagedChannel.swift

@@ -103,7 +103,7 @@ internal protocol StateManagedChannel: Channel, ChannelCore {
 
     var state: ChannelState<ActiveSubstate> { get set }
 
-    var isActive0: ManagedAtomic<Bool> { get set }
+    var isActive0: ManagedAtomic<Bool> { get }
 
     var tsEventLoop: NIOTSEventLoop { get }