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/Model/Configuration.swift | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'WireGuard/Shared/Model/Configuration.swift') 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") + } } } -- cgit v1.2.3-59-g8ed1b