Fix build

Signal/Signal-Info.plist

@@ -7,7 +7,7 @@
 		<key>CarthageVersion</key>
 		<string>0.33.0</string>
 		<key>OSXVersion</key>
-		<string>10.14.5</string>
+		<string>10.14.4</string>
 		<key>WebRTCCommit</key>
 		<string>1445d719bf05280270e9f77576f80f973fd847f8 M73</string>
 	</dict>

SignalServiceKit/src/Loki/API/LokiAPI+Convenience.swift

@@ -0,0 +1,45 @@
+import PromiseKit
+
+internal extension LokiAPI {
+
+    private static let receivedMessageHashValuesKey = "receivedMessageHashValuesKey"
+    private static let receivedMessageHashValuesCollection = "receivedMessageHashValuesCollection"
+
+    internal static func getLastMessageHashValue(for target: Target) -> String? {
+        var result: String? = nil
+        // Uses a read/write connection because getting the last message hash value also removes expired messages as needed
+        storage.dbReadWriteConnection.readWrite { transaction in
+            result = storage.getLastMessageHash(forServiceNode: target.address, transaction: transaction)
+        }
+        return result
+    }
+
+    internal static func setLastMessageHashValue(for target: Target, hashValue: String, expiresAt: UInt64) {
+        storage.dbReadWriteConnection.readWrite { transaction in
+            storage.setLastMessageHash(forServiceNode: target.address, hash: hashValue, expiresAt: expiresAt, transaction: transaction)
+        }
+    }
+
+    internal static func getReceivedMessageHashValues() -> Set<String>? {
+        var result: Set<String>? = nil
+        storage.dbReadConnection.read { transaction in
+            result = transaction.object(forKey: receivedMessageHashValuesKey, inCollection: receivedMessageHashValuesCollection) as! Set<String>?
+        }
+        return result
+    }
+
+    internal static func setReceivedMessageHashValues(to receivedMessageHashValues: Set<String>) {
+        storage.dbReadWriteConnection.readWrite { transaction in
+            transaction.setObject(receivedMessageHashValues, forKey: receivedMessageHashValuesKey, inCollection: receivedMessageHashValuesCollection)
+        }
+    }
+}
+
+internal extension AnyPromise {
+
+    internal static func from<T : Any>(_ promise: Promise<T>) -> AnyPromise {
+        let result = AnyPromise(promise)
+        result.retainUntilComplete()
+        return result
+    }
+}

SignalServiceKit/src/Loki/API/LokiAPI+SwarmAPI.swift

@@ -3,8 +3,8 @@ import PromiseKit
 public extension LokiAPI {
     
     // MARK: Settings
-    private static let minimumSnodeCount = 2
-    private static let targetSnodeCount = 3
+    private static let minimumSnodeCount = 2 // TODO: For debugging purposes
+    private static let targetSnodeCount = 3 // TODO: For debugging purposes
     private static let defaultSnodePort: UInt16 = 8080
     
     // MARK: Caching

SignalServiceKit/src/Loki/API/LokiAPI.swift

@@ -6,8 +6,6 @@ import PromiseKit
     // MARK: Settings
     private static let version = "v1"
     public static let defaultMessageTTL: UInt64 = 1 * 24 * 60 * 60
-    private static let receivedMessageHashValuesKey = "receivedMessageHashValuesKey"
-    private static let receivedMessageHashValuesCollection = "receivedMessageHashValuesCollection"
     
     // MARK: Types
     public typealias RawResponse = Any
@@ -118,43 +116,4 @@ import PromiseKit
             return envelope
         }
     }
-    
-    // MARK: Convenience
-    private static func getLastMessageHashValue(for target: Target) -> String? {
-        var result: String? = nil
-        // Uses a read/write connection because getting the last message hash value also removes expired messages as needed
-        storage.dbReadWriteConnection.readWrite { transaction in
-            result = storage.getLastMessageHash(forServiceNode: target.address, transaction: transaction)
-        }
-        return result
-    }
-    
-    private static func setLastMessageHashValue(for target: Target, hashValue: String, expiresAt: UInt64) {
-        storage.dbReadWriteConnection.readWrite { transaction in
-            storage.setLastMessageHash(forServiceNode: target.address, hash: hashValue, expiresAt: expiresAt, transaction: transaction)
-        }
-    }
-    
-    private static func getReceivedMessageHashValues() -> Set<String>? {
-        var result: Set<String>? = nil
-        storage.dbReadConnection.read { transaction in
-            result = transaction.object(forKey: receivedMessageHashValuesKey, inCollection: receivedMessageHashValuesCollection) as! Set<String>?
-        }
-        return result
-    }
-    
-    private static func setReceivedMessageHashValues(to receivedMessageHashValues: Set<String>) {
-        storage.dbReadWriteConnection.readWrite { transaction in
-            transaction.setObject(receivedMessageHashValues, forKey: receivedMessageHashValuesKey, inCollection: receivedMessageHashValuesCollection)
-        }
-    }
-}
-
-private extension AnyPromise {
-    
-    fileprivate static func from<T : Any>(_ promise: Promise<T>) -> AnyPromise {
-        let result = AnyPromise(promise)
-        result.retainUntilComplete()
-        return result
-    }
 }

SignalServiceKit/src/Loki/Utilities/Promise+Hashable.swift

@@ -1,6 +1,6 @@
 import PromiseKit
 
-public extension Promise : Hashable {
+extension Promise : Hashable {
     
     public func hash(into hasher: inout Hasher) {
         let reference = ObjectIdentifier(self).hashValue