From 986b69064492e69e86ecbf31748d1db04ed21827 Mon Sep 17 00:00:00 2001
From: Dariusz Rybicki <dariusz@elixxir.io>
Date: Tue, 23 Aug 2022 15:11:50 +0100
Subject: [PATCH] Use NetworkFollowerStatus model in UdNetworkStatus callback
---
Sources/XXClient/Callbacks/UdNetworkStatus.swift | 8 ++++----
.../Messenger/Functors/MessengerLogIn.swift | 2 +-
.../Messenger/Functors/MessengerRegister.swift | 2 +-
.../Messenger/Functors/MessengerLogInTests.swift | 2 +-
.../Messenger/Functors/MessengerRegisterTests.swift | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Sources/XXClient/Callbacks/UdNetworkStatus.swift b/Sources/XXClient/Callbacks/UdNetworkStatus.swift
index 52a624a0..43c7c88e 100644
--- a/Sources/XXClient/Callbacks/UdNetworkStatus.swift
+++ b/Sources/XXClient/Callbacks/UdNetworkStatus.swift
@@ -2,16 +2,16 @@ import Bindings
import XCTestDynamicOverlay
public struct UdNetworkStatus {
- public init(handle: @escaping () -> Int) {
+ public init(handle: @escaping () -> NetworkFollowerStatus) {
self.handle = handle
}
- public var handle: () -> Int
+ public var handle: () -> NetworkFollowerStatus
}
extension UdNetworkStatus {
public static let unimplemented = UdNetworkStatus(
- handle: XCTUnimplemented("\(Self.self)", placeholder: -1)
+ handle: XCTUnimplemented("\(Self.self)", placeholder: .unknown(code: -1))
)
}
@@ -25,7 +25,7 @@ extension UdNetworkStatus {
let callback: UdNetworkStatus
func udNetworkStatus() -> Int {
- callback.handle()
+ callback.handle().rawValue
}
}
diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerLogIn.swift b/Sources/XXMessengerClient/Messenger/Functors/MessengerLogIn.swift
index 22910968..7e6381c5 100644
--- a/Sources/XXMessengerClient/Messenger/Functors/MessengerLogIn.swift
+++ b/Sources/XXMessengerClient/Messenger/Functors/MessengerLogIn.swift
@@ -33,7 +33,7 @@ extension MessengerLogIn {
address: env.udAddress ?? e2e.getUdAddressFromNdf()
),
follower: .init {
- cMix.networkFollowerStatus().rawValue
+ cMix.networkFollowerStatus()
}
))
}
diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerRegister.swift b/Sources/XXMessengerClient/Messenger/Functors/MessengerRegister.swift
index 3286dac3..116b1a18 100644
--- a/Sources/XXMessengerClient/Messenger/Functors/MessengerRegister.swift
+++ b/Sources/XXMessengerClient/Messenger/Functors/MessengerRegister.swift
@@ -35,7 +35,7 @@ extension MessengerRegister {
address: env.udAddress ?? e2e.getUdAddressFromNdf()
),
follower: .init {
- cMix.networkFollowerStatus().rawValue
+ cMix.networkFollowerStatus()
}
))
}
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerLogInTests.swift b/Tests/XXMessengerClientTests/Messenger/Functors/MessengerLogInTests.swift
index 83dd2cd0..c0c3aaf3 100644
--- a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerLogInTests.swift
+++ b/Tests/XXMessengerClientTests/Messenger/Functors/MessengerLogInTests.swift
@@ -52,7 +52,7 @@ final class MessengerLogInTests: XCTestCase {
XCTAssertEqual(didNewOrLoadUDWithFollower.count, 1)
XCTAssertEqual(
didNewOrLoadUDWithFollower.first?.handle(),
- networkFollowerStatus.rawValue
+ networkFollowerStatus
)
XCTAssertEqual(didSetUD.compactMap { $0 }.count, 1)
}
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerRegisterTests.swift b/Tests/XXMessengerClientTests/Messenger/Functors/MessengerRegisterTests.swift
index ef96b251..ed48dc26 100644
--- a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerRegisterTests.swift
+++ b/Tests/XXMessengerClientTests/Messenger/Functors/MessengerRegisterTests.swift
@@ -57,7 +57,7 @@ final class MessengerRegisterTests: XCTestCase {
XCTAssertEqual(didNewOrLoadUDWithFollower.count, 1)
XCTAssertEqual(
didNewOrLoadUDWithFollower.first?.handle(),
- networkFollowerStatus.rawValue
+ networkFollowerStatus
)
XCTAssertEqual(didSetUD.compactMap { $0 }.count, 1)
}
--
GitLab