pull/10/head
Niels Andriesse 7 years ago
parent 33de33390b
commit f4b0553cdb

@ -43,12 +43,12 @@ import PromiseKit
} }
public static func sendMessage(_ lokiMessage: LokiMessage) -> Promise<RawResponse> { public static func sendMessage(_ lokiMessage: LokiMessage) -> Promise<RawResponse> {
let target = Target(address: "http://13.238.53.205", port: 8080) let target = Target(address: "http://13.238.53.205", port: 8080) // TODO: Temporary
return invoke(.sendMessage, on: target, with: lokiMessage.toJSON()) return invoke(.sendMessage, on: target, with: lokiMessage.toJSON())
} }
public static func retrieveAllMessages() -> Promise<RawResponse> { public static func retrieveAllMessages() -> Promise<RawResponse> {
let target = Target(address: "http://13.238.53.205", port: 8080) let target = Target(address: "http://13.238.53.205", port: 8080) // TODO: Temporary
let parameters = [ let parameters = [
"pubKey" : OWSIdentityManager.shared().identityKeyPair()!.hexEncodedPublicKey, "pubKey" : OWSIdentityManager.shared().identityKeyPair()!.hexEncodedPublicKey,
"lastHash" : "" // TODO: Implement "lastHash" : "" // TODO: Implement

@ -5,7 +5,7 @@ public enum Mnemonic {
public struct Language : Hashable { public struct Language : Hashable {
fileprivate let filename: String fileprivate let filename: String
fileprivate let prefixLength: Int fileprivate let prefixLength: UInt
public static let english = Language(filename: "english", prefixLength: 3) public static let english = Language(filename: "english", prefixLength: 3)
public static let japanese = Language(filename: "japanese", prefixLength: 3) public static let japanese = Language(filename: "japanese", prefixLength: 3)
@ -15,7 +15,7 @@ public enum Mnemonic {
private static var wordSetCache: [Language:[String]] = [:] private static var wordSetCache: [Language:[String]] = [:]
private static var truncatedWordSetCache: [Language:[String]] = [:] private static var truncatedWordSetCache: [Language:[String]] = [:]
private init(filename: String, prefixLength: Int) { private init(filename: String, prefixLength: UInt) {
self.filename = filename self.filename = filename
self.prefixLength = prefixLength self.prefixLength = prefixLength
} }
@ -128,7 +128,7 @@ public enum Mnemonic {
return String(p1 + p2 + p3 + p4) return String(p1 + p2 + p3 + p4)
} }
private static func determineChecksumIndex(for x: [String], prefixLength: Int) -> Int { private static func determineChecksumIndex(for x: [String], prefixLength: UInt) -> Int {
let checksum = Array(x.map { $0.prefix(length: prefixLength) }.joined().utf8).crc32() let checksum = Array(x.map { $0.prefix(length: prefixLength) }.joined().utf8).crc32()
return Int(checksum) % x.count return Int(checksum) % x.count
} }
@ -136,7 +136,7 @@ public enum Mnemonic {
private extension String { private extension String {
func prefix(length: Int) -> String { func prefix(length: UInt) -> String {
return String(self[startIndex..<index(startIndex, offsetBy: length)]) return String(self[startIndex..<index(startIndex, offsetBy: Int(length))])
} }
} }

Loading…
Cancel
Save