From eeef2850d04be71742308bbe49c1aca6898aef19 Mon Sep 17 00:00:00 2001
From: Dariusz Rybicki <dariusz@elixxir.io>
Date: Mon, 17 Oct 2022 00:28:49 +0200
Subject: [PATCH] Refactor ReceiveFileCallback
---
Sources/XXClient/Callbacks/ReceiveFileCallback.swift | 6 ++++--
.../Utils/ReceiveFileCallbacksRegistryTests.swift | 10 +++++-----
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/Sources/XXClient/Callbacks/ReceiveFileCallback.swift b/Sources/XXClient/Callbacks/ReceiveFileCallback.swift
index 3f414934..2c1d94be 100644
--- a/Sources/XXClient/Callbacks/ReceiveFileCallback.swift
+++ b/Sources/XXClient/Callbacks/ReceiveFileCallback.swift
@@ -2,11 +2,13 @@ import Bindings
import XCTestDynamicOverlay
public struct ReceiveFileCallback {
- public init(handle: @escaping (Result<ReceivedFile, NSError>) -> Void) {
+ public typealias Result = Swift.Result<ReceivedFile, NSError>
+
+ public init(handle: @escaping (Result) -> Void) {
self.handle = handle
}
- public var handle: (Result<ReceivedFile, NSError>) -> Void
+ public var handle: (Result) -> Void
}
extension ReceiveFileCallback {
diff --git a/Tests/XXMessengerClientTests/Utils/ReceiveFileCallbacksRegistryTests.swift b/Tests/XXMessengerClientTests/Utils/ReceiveFileCallbacksRegistryTests.swift
index d40e6d79..e99890b4 100644
--- a/Tests/XXMessengerClientTests/Utils/ReceiveFileCallbacksRegistryTests.swift
+++ b/Tests/XXMessengerClientTests/Utils/ReceiveFileCallbacksRegistryTests.swift
@@ -5,8 +5,8 @@ import XXClient
final class ReceiveFileCallbacksRegistryTests: XCTestCase {
func testRegistry() {
- var firstCallbackDidHandle: [Result<ReceivedFile, NSError>] = []
- var secondCallbackDidHandle: [Result<ReceivedFile, NSError>] = []
+ var firstCallbackDidHandle: [ReceiveFileCallback.Result] = []
+ var secondCallbackDidHandle: [ReceiveFileCallback.Result] = []
let firstCallback = ReceiveFileCallback { result in
firstCallbackDidHandle.append(result)
@@ -19,7 +19,7 @@ final class ReceiveFileCallbacksRegistryTests: XCTestCase {
let firstCallbackCancellable = callbackRegistry.register(firstCallback)
let secondCallbackCancellable = callbackRegistry.register(secondCallback)
- let firstResult = Result<ReceivedFile, NSError>.success(.stub(1))
+ let firstResult = ReceiveFileCallback.Result.success(.stub(1))
registeredCallbacks.handle(firstResult)
XCTAssertNoDifference(firstCallbackDidHandle, [firstResult])
@@ -27,7 +27,7 @@ final class ReceiveFileCallbacksRegistryTests: XCTestCase {
firstCallbackCancellable.cancel()
let secondError = NSError(domain: "test", code: 321)
- let secondResult = Result<ReceivedFile, NSError>.failure(secondError)
+ let secondResult = ReceiveFileCallback.Result.failure(secondError)
registeredCallbacks.handle(secondResult)
XCTAssertNoDifference(firstCallbackDidHandle, [firstResult])
@@ -35,7 +35,7 @@ final class ReceiveFileCallbacksRegistryTests: XCTestCase {
secondCallbackCancellable.cancel()
- let thirdData = Result<ReceivedFile, NSError>.success(.stub(2))
+ let thirdData = ReceiveFileCallback.Result.success(.stub(2))
registeredCallbacks.handle(thirdData)
XCTAssertNoDifference(firstCallbackDidHandle, [firstResult])
--
GitLab