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

Rename MessageSendReport to E2ESendReport

parent 924e5217
No related branches found
No related tags found
2 merge requests!102Release 1.0.0,!18Update Bindings
...@@ -2,10 +2,10 @@ import Bindings ...@@ -2,10 +2,10 @@ import Bindings
import XCTestDynamicOverlay import XCTestDynamicOverlay
public struct CmixWaitForMessageDelivery { public struct CmixWaitForMessageDelivery {
public var run: (MessageSendReport, Int, MessageDeliveryCallback) throws -> Void public var run: (E2ESendReport, Int, MessageDeliveryCallback) throws -> Void
public func callAsFunction( public func callAsFunction(
report: MessageSendReport, report: E2ESendReport,
timeoutMS: Int, timeoutMS: Int,
callback: MessageDeliveryCallback callback: MessageDeliveryCallback
) throws { ) throws {
......
...@@ -2,12 +2,12 @@ import Bindings ...@@ -2,12 +2,12 @@ import Bindings
import XCTestDynamicOverlay import XCTestDynamicOverlay
public struct ConnectionSend { public struct ConnectionSend {
public var run: (Int, Data) throws -> MessageSendReport public var run: (Int, Data) throws -> E2ESendReport
public func callAsFunction( public func callAsFunction(
messageType: Int, messageType: Int,
payload: Data payload: Data
) throws -> MessageSendReport { ) throws -> E2ESendReport {
try run(messageType, payload) try run(messageType, payload)
} }
} }
...@@ -15,7 +15,7 @@ public struct ConnectionSend { ...@@ -15,7 +15,7 @@ public struct ConnectionSend {
extension ConnectionSend { extension ConnectionSend {
public static func live(_ bindingsConnection: BindingsConnection) -> ConnectionSend { public static func live(_ bindingsConnection: BindingsConnection) -> ConnectionSend {
ConnectionSend { messageType, payload in ConnectionSend { messageType, payload in
try MessageSendReport.decode( try E2ESendReport.decode(
bindingsConnection.sendE2E(messageType, payload: payload) bindingsConnection.sendE2E(messageType, payload: payload)
) )
} }
...@@ -23,7 +23,7 @@ extension ConnectionSend { ...@@ -23,7 +23,7 @@ extension ConnectionSend {
public static func live(_ bindingsConnection: BindingsAuthenticatedConnection) -> ConnectionSend { public static func live(_ bindingsConnection: BindingsAuthenticatedConnection) -> ConnectionSend {
ConnectionSend { messageType, payload in ConnectionSend { messageType, payload in
try MessageSendReport.decode( try E2ESendReport.decode(
bindingsConnection.sendE2E(messageType, payload: payload) bindingsConnection.sendE2E(messageType, payload: payload)
) )
} }
......
import Foundation import Foundation
public struct MessageSendReport: Equatable { public struct E2ESendReport: Equatable {
public init( public init(
roundList: [Int]?, roundList: [Int]?,
messageId: Data?, messageId: Data?,
...@@ -16,7 +16,7 @@ public struct MessageSendReport: Equatable { ...@@ -16,7 +16,7 @@ public struct MessageSendReport: Equatable {
public var timestamp: Int? public var timestamp: Int?
} }
extension MessageSendReport: Codable { extension E2ESendReport: Codable {
enum CodingKeys: String, CodingKey { enum CodingKeys: String, CodingKey {
case roundList = "Rounds" case roundList = "Rounds"
case messageId = "MessageID" case messageId = "MessageID"
......
...@@ -2,7 +2,7 @@ import CustomDump ...@@ -2,7 +2,7 @@ import CustomDump
import XCTest import XCTest
@testable import ElixxirDAppsSDK @testable import ElixxirDAppsSDK
final class MessageSendReportTests: XCTestCase { final class E2ESendReportTests: XCTestCase {
func testCoding() throws { func testCoding() throws {
let rounds = [1, 5, 9] let rounds = [1, 5, 9]
let messageIdB64 = "51Yy47uZbP0o2Y9B/kkreDLTB6opUol3M3mYiY2dcdQ=" let messageIdB64 = "51Yy47uZbP0o2Y9B/kkreDLTB6opUol3M3mYiY2dcdQ="
...@@ -15,16 +15,16 @@ final class MessageSendReportTests: XCTestCase { ...@@ -15,16 +15,16 @@ final class MessageSendReportTests: XCTestCase {
} }
""" """
let jsonData = jsonString.data(using: .utf8)! let jsonData = jsonString.data(using: .utf8)!
let model = try MessageSendReport.decode(jsonData) let model = try E2ESendReport.decode(jsonData)
XCTAssertNoDifference(model, MessageSendReport( XCTAssertNoDifference(model, E2ESendReport(
roundList: rounds, roundList: rounds,
messageId: Data(base64Encoded: messageIdB64)!, messageId: Data(base64Encoded: messageIdB64)!,
timestamp: timestamp timestamp: timestamp
)) ))
let encodedModel = try model.encode() let encodedModel = try model.encode()
let decodedModel = try MessageSendReport.decode(encodedModel) let decodedModel = try E2ESendReport.decode(encodedModel)
XCTAssertNoDifference(decodedModel, model) XCTAssertNoDifference(decodedModel, model)
} }
...@@ -32,9 +32,9 @@ final class MessageSendReportTests: XCTestCase { ...@@ -32,9 +32,9 @@ final class MessageSendReportTests: XCTestCase {
func testDecodeEmpty() throws { func testDecodeEmpty() throws {
let jsonString = "{}" let jsonString = "{}"
let jsonData = jsonString.data(using: .utf8)! let jsonData = jsonString.data(using: .utf8)!
let model = try MessageSendReport.decode(jsonData) let model = try E2ESendReport.decode(jsonData)
XCTAssertNoDifference(model, MessageSendReport( XCTAssertNoDifference(model, E2ESendReport(
roundList: nil, roundList: nil,
messageId: nil, messageId: nil,
timestamp: nil timestamp: nil
......
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