Skip to content
Snippets Groups Projects
Commit 322036ae authored by Dariusz Rybicki's avatar Dariusz Rybicki
Browse files

Update SingleUseCallbackReport model

parent c7188e3a
No related branches found
No related tags found
2 merge requests!102Release 1.0.0,!30Update Bindings
...@@ -5,33 +5,21 @@ public struct SingleUseCallbackReport: Equatable { ...@@ -5,33 +5,21 @@ public struct SingleUseCallbackReport: Equatable {
rounds: [Int], rounds: [Int],
payload: Data, payload: Data,
partner: Data, partner: Data,
ephId: EphId ephId: Int64,
receptionId: Data
) { ) {
self.rounds = rounds self.rounds = rounds
self.payload = payload self.payload = payload
self.partner = partner self.partner = partner
self.ephId = ephId self.ephId = ephId
self.receptionId = receptionId
} }
public var rounds: [Int] public var rounds: [Int]
public var payload: Data public var payload: Data
public var partner: Data public var partner: Data
public var ephId: EphId public var ephId: Int64
} public var receptionId: Data
extension SingleUseCallbackReport {
public struct EphId: Equatable {
public init(
ephId: [Int],
source: Data
) {
self.ephId = ephId
self.source = source
}
public var ephId: [Int]
public var source: Data
}
} }
extension SingleUseCallbackReport: Codable { extension SingleUseCallbackReport: Codable {
...@@ -40,6 +28,7 @@ extension SingleUseCallbackReport: Codable { ...@@ -40,6 +28,7 @@ extension SingleUseCallbackReport: Codable {
case payload = "Payload" case payload = "Payload"
case partner = "Partner" case partner = "Partner"
case ephId = "EphID" case ephId = "EphID"
case receptionId = "ReceptionID"
} }
public static func decode(_ data: Data) throws -> Self { public static func decode(_ data: Data) throws -> Self {
...@@ -50,10 +39,3 @@ extension SingleUseCallbackReport: Codable { ...@@ -50,10 +39,3 @@ extension SingleUseCallbackReport: Codable {
try JSONEncoder().encode(self) try JSONEncoder().encode(self)
} }
} }
extension SingleUseCallbackReport.EphId: Codable {
enum CodingKeys: String, CodingKey {
case ephId = "EphId"
case source = "Source"
}
}
...@@ -7,17 +7,15 @@ final class SingleUseCallbackReportTests: XCTestCase { ...@@ -7,17 +7,15 @@ final class SingleUseCallbackReportTests: XCTestCase {
let rounds: [Int] = [1, 5, 9] let rounds: [Int] = [1, 5, 9]
let payloadB64 = "rSuPD35ELWwm5KTR9ViKIz/r1YGRgXIl5792SF8o8piZzN6sT4Liq4rUU/nfOPvQEjbfWNh/NYxdJ72VctDnWw==" let payloadB64 = "rSuPD35ELWwm5KTR9ViKIz/r1YGRgXIl5792SF8o8piZzN6sT4Liq4rUU/nfOPvQEjbfWNh/NYxdJ72VctDnWw=="
let partnerB64 = "emV6aW1hAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD" let partnerB64 = "emV6aW1hAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD"
let ephId: [Int] = [0, 0, 0, 0, 0, 0, 3, 89] let ephId: Int64 = 1_655_533
let ephIdSourceB64 = "emV6aW1hAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD" let receptionIdB64 = "emV6aW1hAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD"
let jsonString = """ let jsonString = """
{ {
"Rounds": [\(rounds.map { "\($0)" }.joined(separator: ", "))], "Rounds": [\(rounds.map { "\($0)" }.joined(separator: ", "))],
"Payload": "\(payloadB64)", "Payload": "\(payloadB64)",
"Partner": "\(partnerB64)", "Partner": "\(partnerB64)",
"EphID": { "EphID": \(ephId),
"EphId": [\(ephId.map { "\($0)" }.joined(separator: ", "))], "ReceptionID": "\(receptionIdB64)"
"Source": "\(ephIdSourceB64)"
}
} }
""" """
let jsonData = jsonString.data(using: .utf8)! let jsonData = jsonString.data(using: .utf8)!
...@@ -27,10 +25,8 @@ final class SingleUseCallbackReportTests: XCTestCase { ...@@ -27,10 +25,8 @@ final class SingleUseCallbackReportTests: XCTestCase {
rounds: rounds, rounds: rounds,
payload: Data(base64Encoded: payloadB64)!, payload: Data(base64Encoded: payloadB64)!,
partner: Data(base64Encoded: partnerB64)!, partner: Data(base64Encoded: partnerB64)!,
ephId: .init( ephId: ephId,
ephId: ephId, receptionId: Data(base64Encoded: receptionIdB64)!
source: Data(base64Encoded: ephIdSourceB64)!
)
)) ))
let encodedModel = try model.encode() let encodedModel = try model.encode()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment