More formatting nits and cyclomatic complexity fixes

Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
2018-12-12 21:09:52 -06:00
parent e4ac48bc75
commit 8a916beb38
17 changed files with 174 additions and 225 deletions
@@ -26,10 +26,10 @@ final class TunnelConfiguration: Codable {
 struct InterfaceConfiguration: Codable {
    var name: String
    var privateKey: Data
-    var addresses: [IPAddressRange] = []
+    var addresses = [IPAddressRange]()
    var listenPort: UInt16?
    var mtu: UInt16?
-    var dns: [DNSServer] = []
+    var dns = [DNSServer]()

    init(name: String, privateKey: Data) {
        self.name = name
@@ -55,7 +55,7 @@ struct PeerConfiguration: Codable {
            }
        }
    }
-    var allowedIPs: [IPAddressRange] = []
+    var allowedIPs = [IPAddressRange]()
    var endpoint: Endpoint?
    var persistentKeepAlive: UInt16?

@@ -75,9 +75,7 @@ extension IPAddressRange: Codable {
            default: return nil
            }
        }()
-        guard let ipAddress = ipAddressFromData else {
-            throw DecodingError.invalidData
-        }
+        guard let ipAddress = ipAddressFromData else { throw DecodingError.invalidData }
        address = ipAddress
    }
    enum DecodingError: Error {