From de14b76b4d99f74d52b6e404b2ab37394fa5b9dc Mon Sep 17 00:00:00 2001 From: Eric Kuck Date: Wed, 12 Dec 2018 11:40:57 -0600 Subject: Added swiftlint and fixed all errors (and a bunch, but not all, warnings) Signed-off-by: Eric Kuck --- WireGuard/Shared/FileManager+Extension.swift | 4 ++-- WireGuard/Shared/Model/Configuration.swift | 18 +++++++++++++----- WireGuard/Shared/Model/DNSServer.swift | 2 +- WireGuard/Shared/Model/Endpoint.swift | 14 +++++++------- WireGuard/Shared/Model/IPAddressRange.swift | 6 +++--- 5 files changed, 26 insertions(+), 18 deletions(-) (limited to 'WireGuard/Shared') diff --git a/WireGuard/Shared/FileManager+Extension.swift b/WireGuard/Shared/FileManager+Extension.swift index d4c2547..535b999 100644 --- a/WireGuard/Shared/FileManager+Extension.swift +++ b/WireGuard/Shared/FileManager+Extension.swift @@ -20,8 +20,8 @@ extension FileManager { static func deleteFile(at url: URL) -> Bool { do { try FileManager.default.removeItem(at: url) - } catch(let e) { - os_log("Failed to delete file '%{public}@': %{public}@", log: OSLog.default, type: .debug, url.absoluteString, e.localizedDescription) + } catch let error { + os_log("Failed to delete file '%{public}@': %{public}@", log: OSLog.default, type: .debug, url.absoluteString, error.localizedDescription) return false } return true diff --git a/WireGuard/Shared/Model/Configuration.swift b/WireGuard/Shared/Model/Configuration.swift index d2680cb..09fdd6b 100644 --- a/WireGuard/Shared/Model/Configuration.swift +++ b/WireGuard/Shared/Model/Configuration.swift @@ -16,7 +16,7 @@ final class TunnelConfiguration: Codable { let peerPublicKeysArray = peers.map { $0.publicKey } let peerPublicKeysSet = Set(peerPublicKeysArray) - if (peerPublicKeysArray.count != peerPublicKeysSet.count) { + if peerPublicKeysArray.count != peerPublicKeysSet.count { fatalError("Two or more peers cannot have the same public key") } } @@ -34,8 +34,12 @@ struct InterfaceConfiguration: Codable { init(name: String, privateKey: Data) { self.name = name self.privateKey = privateKey - if (name.isEmpty) { fatalError("Empty name") } - if (privateKey.count != TunnelConfiguration.keyLength) { fatalError("Invalid private key") } + if name.isEmpty { + fatalError("Empty name") + } + if privateKey.count != TunnelConfiguration.keyLength { + fatalError("Invalid private key") + } } } @@ -45,7 +49,9 @@ struct PeerConfiguration: Codable { var preSharedKey: Data? { didSet(value) { if let value = value { - if (value.count != TunnelConfiguration.keyLength) { fatalError("Invalid preshared key") } + if value.count != TunnelConfiguration.keyLength { + fatalError("Invalid preshared key") + } } } } @@ -55,6 +61,8 @@ struct PeerConfiguration: Codable { init(publicKey: Data) { self.publicKey = publicKey - if (publicKey.count != TunnelConfiguration.keyLength) { fatalError("Invalid public key") } + if publicKey.count != TunnelConfiguration.keyLength { + fatalError("Invalid public key") + } } } diff --git a/WireGuard/Shared/Model/DNSServer.swift b/WireGuard/Shared/Model/DNSServer.swift index 8be1ddd..bb20c02 100644 --- a/WireGuard/Shared/Model/DNSServer.swift +++ b/WireGuard/Shared/Model/DNSServer.swift @@ -40,7 +40,7 @@ extension DNSServer: Codable { let container = try decoder.singleValueContainer() var data = try container.decode(Data.self) let ipAddressFromData: IPAddress? = { - switch (data.count) { + switch data.count { case 4: return IPv4Address(data) case 16: return IPv6Address(data) default: return nil diff --git a/WireGuard/Shared/Model/Endpoint.swift b/WireGuard/Shared/Model/Endpoint.swift index ab357ba..38ffab9 100644 --- a/WireGuard/Shared/Model/Endpoint.swift +++ b/WireGuard/Shared/Model/Endpoint.swift @@ -35,8 +35,8 @@ extension Endpoint { hostString = String(string[string.startIndex ..< endOfHost]) } guard let endpointPort = NWEndpoint.Port(String(string[startOfPort ..< string.endIndex])) else { return nil } - let invalidCharacterIndex = hostString.unicodeScalars.firstIndex { (c) -> Bool in - return !CharacterSet.urlHostAllowed.contains(c) + let invalidCharacterIndex = hostString.unicodeScalars.firstIndex { char in + return !CharacterSet.urlHostAllowed.contains(char) } guard (invalidCharacterIndex == nil) else { return nil } host = NWEndpoint.Host(hostString) @@ -79,11 +79,11 @@ extension Endpoint: Codable { extension Endpoint { func hasHostAsIPAddress() -> Bool { switch (host) { - case .name(_, _): + case .name: return false - case .ipv4(_): + case .ipv4: return true - case .ipv6(_): + case .ipv6: return true } } @@ -92,9 +92,9 @@ extension Endpoint { switch (host) { case .name(let hostname, _): return hostname - case .ipv4(_): + case .ipv4: return nil - case .ipv6(_): + case .ipv6: return nil } } diff --git a/WireGuard/Shared/Model/IPAddressRange.swift b/WireGuard/Shared/Model/IPAddressRange.swift index 2fb4a16..e3c1441 100644 --- a/WireGuard/Shared/Model/IPAddressRange.swift +++ b/WireGuard/Shared/Model/IPAddressRange.swift @@ -27,9 +27,9 @@ extension IPAddressRange { } let maxNetworkPrefixLength: UInt8 = (address is IPv4Address) ? 32 : 128 var networkPrefixLength: UInt8 - if (endOfIPAddress < string.endIndex) { // "/" was located + if endOfIPAddress < string.endIndex { // "/" was located let indexOfNetworkPrefixLength = string.index(after: endOfIPAddress) - guard (indexOfNetworkPrefixLength < string.endIndex) else { return nil } + guard indexOfNetworkPrefixLength < string.endIndex else { return nil } let networkPrefixLengthSubstring = string[indexOfNetworkPrefixLength ..< string.endIndex] guard let npl = UInt8(networkPrefixLengthSubstring) else { return nil } networkPrefixLength = min(npl, maxNetworkPrefixLength) @@ -69,7 +69,7 @@ extension IPAddressRange: Codable { var data = try container.decode(Data.self) networkPrefixLength = data.removeLast() let ipAddressFromData: IPAddress? = { - switch (data.count) { + switch data.count { case 4: return IPv4Address(data) case 16: return IPv6Address(data) default: return nil -- cgit v1.2.3-59-g8ed1b