From 941a51185fd2509a0070fff7f8ef1d2fe33e9981 Mon Sep 17 00:00:00 2001 From: Lita Date: Thu, 27 Sep 2018 11:38:44 -0500 Subject: [PATCH] Minor Update --- .DS_Store | Bin 8196 -> 8196 bytes Package.resolved | 31 +- Package.swift | 6 +- .../celligator/module.modulemap | 2 +- .../project.pbxproj | 2770 ++++++++--------- ...eshifter-Swift-Transports-Package.xcscheme | 42 +- .../PassthroughConnection.swift | 2 +- .../ExampleTransports/Rot13Connection.swift | 2 +- Sources/Protean/ProteanConnection.swift | 2 +- Sources/Wisp/WispConnection.swift | 2 +- Sources/Wisp/WispConnectionFactory.swift | 2 +- {SupportingFiles => Sources}/libsodium-ios.a | Bin Tests/WispTests/WispTests.swift | 16 +- 13 files changed, 1421 insertions(+), 1456 deletions(-) rename {SupportingFiles => Sources}/libsodium-ios.a (100%) diff --git a/.DS_Store b/.DS_Store index 3e2b14f5620c9f61ce77ab8961084b345a621db5..faa68caaaeeba0f7b2635a9fef700de664a82d6e 100644 GIT binary patch delta 23 ecmZp1XmQvOEy&ESzI$? @@ -28,9 +28,9 @@ buildForAnalyzing = "YES"> @@ -42,9 +42,9 @@ buildForAnalyzing = "YES"> @@ -60,9 +60,9 @@ skipped = "NO"> @@ -70,9 +70,9 @@ skipped = "NO"> @@ -80,9 +80,9 @@ skipped = "NO"> @@ -103,9 +103,9 @@ diff --git a/Sources/ExampleTransports/PassthroughConnection.swift b/Sources/ExampleTransports/PassthroughConnection.swift index fa0a6e4..c3881cb 100644 --- a/Sources/ExampleTransports/PassthroughConnection.swift +++ b/Sources/ExampleTransports/PassthroughConnection.swift @@ -22,7 +22,7 @@ open class PassthroughConnection: Connection using parameters: NWParameters) { let connectionFactory = NetworkConnectionFactory(host: host, port: port) - guard let newConnection = connectionFactory.connect(parameters) + guard let newConnection = connectionFactory.connect(using: parameters) else { return nil diff --git a/Sources/ExampleTransports/Rot13Connection.swift b/Sources/ExampleTransports/Rot13Connection.swift index baa79ee..ea78ba8 100644 --- a/Sources/ExampleTransports/Rot13Connection.swift +++ b/Sources/ExampleTransports/Rot13Connection.swift @@ -29,7 +29,7 @@ open class Rot13Connection: Connection using parameters: NWParameters) { let connectionFactory = NetworkConnectionFactory(host: host, port: port) - guard let newConnection = connectionFactory.connect(parameters) + guard let newConnection = connectionFactory.connect(using: parameters) else { return nil diff --git a/Sources/Protean/ProteanConnection.swift b/Sources/Protean/ProteanConnection.swift index ee4c06d..e559768 100644 --- a/Sources/Protean/ProteanConnection.swift +++ b/Sources/Protean/ProteanConnection.swift @@ -38,7 +38,7 @@ open class ProteanConnection: Connection } let connectionFactory = NetworkConnectionFactory(host: host, port: port) - guard let newConnection = connectionFactory.connect(.udp) + guard let newConnection = connectionFactory.connect(using: .udp) else { return nil diff --git a/Sources/Wisp/WispConnection.swift b/Sources/Wisp/WispConnection.swift index 58c054a..d198a44 100644 --- a/Sources/Wisp/WispConnection.swift +++ b/Sources/Wisp/WispConnection.swift @@ -49,7 +49,7 @@ public class WispConnection: Connection self.iatMode = iatMode let connectionFactory = NetworkConnectionFactory(host: host, port: port) - guard let newConnection = connectionFactory.connect(parameters) + guard let newConnection = connectionFactory.connect(using: parameters) else { return nil diff --git a/Sources/Wisp/WispConnectionFactory.swift b/Sources/Wisp/WispConnectionFactory.swift index 68dba94..3b63dbb 100644 --- a/Sources/Wisp/WispConnectionFactory.swift +++ b/Sources/Wisp/WispConnectionFactory.swift @@ -33,7 +33,7 @@ open class WispConnectionFactory: ConnectionFactory self.iatMode = iatMode } - public func connect(_ using: NWParameters) -> Connection? + public func connect(using: NWParameters) -> Connection? { if let currentConnection = connection { diff --git a/SupportingFiles/libsodium-ios.a b/Sources/libsodium-ios.a similarity index 100% rename from SupportingFiles/libsodium-ios.a rename to Sources/libsodium-ios.a diff --git a/Tests/WispTests/WispTests.swift b/Tests/WispTests/WispTests.swift index b843e67..0006663 100644 --- a/Tests/WispTests/WispTests.swift +++ b/Tests/WispTests/WispTests.swift @@ -179,7 +179,7 @@ class Shapeshifter_WispTests: XCTestCase let read = expectation(description: "Read data from the server.") let host = NWEndpoint.Host.ipv4(ipv4Address) let connectionFactory = NetworkConnectionFactory(host: host, port: port) - let maybeConnection = connectionFactory.connect(.udp) + let maybeConnection = connectionFactory.connect(using: .udp) XCTAssertNotNil(maybeConnection) @@ -305,7 +305,7 @@ class Shapeshifter_WispTests: XCTestCase let connected = expectation(description: "Connected to server.") let host = NWEndpoint.Host.ipv4(ipv4Address) let connectionFactory = NetworkConnectionFactory(host: host, port: port) - var maybeConnection = connectionFactory.connect(.tcp) + var maybeConnection = connectionFactory.connect(using: .tcp) XCTAssertNotNil(maybeConnection) maybeConnection!.stateUpdateHandler = @@ -364,7 +364,7 @@ class Shapeshifter_WispTests: XCTestCase let wrote = expectation(description: "Wrote data to server.") let host = NWEndpoint.Host.ipv4(ipv4Address) let connectionFactory = NetworkConnectionFactory(host: host, port: port) - var maybeConnection = connectionFactory.connect(.tcp) + var maybeConnection = connectionFactory.connect(using: .tcp) XCTAssertNotNil(maybeConnection) maybeConnection?.stateUpdateHandler = @@ -446,7 +446,7 @@ class Shapeshifter_WispTests: XCTestCase let read = expectation(description: "Read data from the server.") let host = NWEndpoint.Host.ipv4(ipv4Address) let connectionFactory = NetworkConnectionFactory(host: host, port: port) - let maybeConnection = connectionFactory.connect(.tcp) + let maybeConnection = connectionFactory.connect(using: .tcp) XCTAssertNotNil(maybeConnection) @@ -568,7 +568,7 @@ class Shapeshifter_WispTests: XCTestCase let wroteTwice = expectation(description: "Wrote data to the server a second time.") let host = NWEndpoint.Host.ipv4(ipv4Address) let connectionFactory = NetworkConnectionFactory(host: host, port: port) - let maybeConnection = connectionFactory.connect(.tcp) + let maybeConnection = connectionFactory.connect(using: .tcp) XCTAssertNotNil(maybeConnection) @@ -679,7 +679,7 @@ class Shapeshifter_WispTests: XCTestCase let connected = expectation(description: "Connected to server.") let host = NWEndpoint.Host.ipv4(ipv4Address) let wispFactory = WispConnectionFactory(host: host, port: port, cert: certString, iatMode: false) - var maybeConnection = wispFactory.connect(.tcp) + var maybeConnection = wispFactory.connect(using: .tcp) XCTAssertNotNil(maybeConnection) maybeConnection?.stateUpdateHandler = @@ -742,7 +742,7 @@ class Shapeshifter_WispTests: XCTestCase let wrote = expectation(description: "Wrote data to server.") let host = NWEndpoint.Host.ipv4(ipv4Address) let wispFactory = WispConnectionFactory(host: host, port: port, cert: certString, iatMode: false) - let maybeConnection = wispFactory.connect(.tcp) + let maybeConnection = wispFactory.connect(using: .tcp) XCTAssertNotNil(maybeConnection) guard var connection = maybeConnection @@ -828,7 +828,7 @@ class Shapeshifter_WispTests: XCTestCase let read = expectation(description: "Read data from the server.") let host = NWEndpoint.Host.ipv4(ipv4Address) let wispFactory = WispConnectionFactory(host: host, port: port, cert: certString, iatMode: false) - let maybeConnection = wispFactory.connect(.tcp) + let maybeConnection = wispFactory.connect(using: .tcp) XCTAssertNotNil(maybeConnection) guard var connection = maybeConnection