Move name from interface to tunnel

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

WireGuard/Shared/Model/InterfaceConfiguration.swift

@@ -4,18 +4,16 @@
 import Foundation
 
 struct InterfaceConfiguration {
-    var name: String?
     var privateKey: Data
     var addresses = [IPAddressRange]()
     var listenPort: UInt16?
     var mtu: UInt16?
     var dns = [DNSServer]()
 
-    init(name: String?, privateKey: Data) {
-        self.name = name
-        self.privateKey = privateKey
+    init(privateKey: Data) {
         if privateKey.count != TunnelConfiguration.keyLength {
             fatalError("Invalid private key")
         }
+        self.privateKey = privateKey
     }
 }

WireGuard/Shared/Model/TunnelConfiguration.swift

@@ -4,14 +4,16 @@
 import Foundation
 
 final class TunnelConfiguration {
+    var name: String?
     var interface: InterfaceConfiguration
     let peers: [PeerConfiguration]
 
     static let keyLength = 32
 
-    init(interface: InterfaceConfiguration, peers: [PeerConfiguration]) {
+    init(name: String?, interface: InterfaceConfiguration, peers: [PeerConfiguration]) {
         self.interface = interface
         self.peers = peers
+        self.name = name
 
         let peerPublicKeysArray = peers.map { $0.publicKey }
         let peerPublicKeysSet = Set<Data>(peerPublicKeysArray)