oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Fix PoW Calculation.

Browse source
This commit is contained in:
Mikunj 2019-05-24 09:33:41 +10:00
parent ed85a0da3c
commit b3ef8af476
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
SignalServiceKit/src/Loki/API/LokiAPI.swift
View file

@ -65,18 +65,15 @@ import PromiseKit
}
}
// By default our p2p throws and we recover by sending to storage server
var p2pPromise: Promise<Set<Promise<RawResponse>>> = Promise(error: Error.internalError)
// TODO: probably only send to p2p if user is online or we are pinging them
// p2pDetails && (isPing || peerIsOnline)
if let p2pDetails = contactP2PDetails[destination] {
p2pPromise = sendMessage(message, targets: [p2pDetails])
}
// If we have the p2p details then send message to that
// If that failes then fallback to storage server
return p2pPromise.recover { _ in return sendThroughStorageServer() }
// TODO: probably only send to p2p if user is online or we are pinging them
// p2pDetails && (isPing || peerIsOnline)
if let p2pDetails = contactP2PDetails[destination] {
return sendMessage(message, targets: [p2pDetails]).recover { _ in return sendThroughStorageServer() }
}
return sendThroughStorageServer()
}
internal static func sendMessage(_ lokiMessage: Message, targets: [Target]) -> Promise<Set<Promise<RawResponse>>> {

3
SignalServiceKit/src/Loki/Crypto/ProofOfWork.swift
View file

@ -103,7 +103,8 @@ public enum ProofOfWork {
// Do all the calculations
let totalLength = UInt64(payloadLength + nonceLength)
let ttlMult = ttl * totalLength
let ttlSeconds = ttl / 1000
let ttlMult = ttlSeconds * totalLength
// UInt64 values
let innerFrac = ttlMult / two16