From d7929432c0531c2bb6ccf241a4b686cdca3bc36d Mon Sep 17 00:00:00 2001
From: Dariusz Rybicki <dariusz@elixxir.io>
Date: Mon, 17 Oct 2022 00:40:00 +0200
Subject: [PATCH] Refactor

---
 .../Functions/MessengerRegisterReceiveFileCallback.swift    | 2 +-
 .../Messenger/Functions/MessengerStartFileTransfer.swift    | 2 +-
 .../XXMessengerClient/Messenger/MessengerEnvironment.swift  | 6 +++---
 .../MessengerRegisterReceiveFileCallbackTests.swift         | 2 +-
 .../Functions/MessengerStartFileTransferTests.swift         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Sources/XXMessengerClient/Messenger/Functions/MessengerRegisterReceiveFileCallback.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerRegisterReceiveFileCallback.swift
index 42d56389..e5dddd8a 100644
--- a/Sources/XXMessengerClient/Messenger/Functions/MessengerRegisterReceiveFileCallback.swift
+++ b/Sources/XXMessengerClient/Messenger/Functions/MessengerRegisterReceiveFileCallback.swift
@@ -12,7 +12,7 @@ public struct MessengerRegisterReceiveFileCallback {
 extension MessengerRegisterReceiveFileCallback {
   public static func live(_ env: MessengerEnvironment) -> MessengerRegisterReceiveFileCallback {
     MessengerRegisterReceiveFileCallback { callback in
-      env.receiveFileCallbacksRegistry.register(callback)
+      env.receiveFileCallbacks.register(callback)
     }
   }
 }
diff --git a/Sources/XXMessengerClient/Messenger/Functions/MessengerStartFileTransfer.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerStartFileTransfer.swift
index 2ce92adf..11dfd35a 100644
--- a/Sources/XXMessengerClient/Messenger/Functions/MessengerStartFileTransfer.swift
+++ b/Sources/XXMessengerClient/Messenger/Functions/MessengerStartFileTransfer.swift
@@ -25,7 +25,7 @@ extension MessengerStartFileTransfer {
           e2eFileTransferParamsJSON: env.getE2EFileTransferParams(),
           fileTransferParamsJSON: env.getFileTransferParams()
         ),
-        callback: env.receiveFileCallbacksRegistry.registered()
+        callback: env.receiveFileCallbacks.registered()
       )
       env.fileTransfer.set(fileTransfer)
     }
diff --git a/Sources/XXMessengerClient/Messenger/MessengerEnvironment.swift b/Sources/XXMessengerClient/Messenger/MessengerEnvironment.swift
index dcb706d4..a1ab1517 100644
--- a/Sources/XXMessengerClient/Messenger/MessengerEnvironment.swift
+++ b/Sources/XXMessengerClient/Messenger/MessengerEnvironment.swift
@@ -33,7 +33,7 @@ public struct MessengerEnvironment {
   public var newOrLoadUd: NewOrLoadUd
   public var newUdManagerFromBackup: NewUdManagerFromBackup
   public var passwordStorage: PasswordStorage
-  public var receiveFileCallbacksRegistry: ReceiveFileCallbacksRegistry
+  public var receiveFileCallbacks: ReceiveFileCallbacksRegistry
   public var registerForNotifications: RegisterForNotifications
   public var registerLogWriter: RegisterLogWriter
   public var resumeBackup: ResumeBackup
@@ -84,7 +84,7 @@ extension MessengerEnvironment {
       newOrLoadUd: .live,
       newUdManagerFromBackup: .live,
       passwordStorage: .keychain,
-      receiveFileCallbacksRegistry: .live(),
+      receiveFileCallbacks: .live(),
       registerForNotifications: .live,
       registerLogWriter: .live,
       resumeBackup: .live,
@@ -130,7 +130,7 @@ extension MessengerEnvironment {
     newOrLoadUd: .unimplemented,
     newUdManagerFromBackup: .unimplemented,
     passwordStorage: .unimplemented,
-    receiveFileCallbacksRegistry: .unimplemented,
+    receiveFileCallbacks: .unimplemented,
     registerForNotifications: .unimplemented,
     registerLogWriter: .unimplemented,
     resumeBackup: .unimplemented,
diff --git a/Tests/XXMessengerClientTests/Messenger/Functions/MessengerRegisterReceiveFileCallbackTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerRegisterReceiveFileCallbackTests.swift
index c30bb10a..95a6cabc 100644
--- a/Tests/XXMessengerClientTests/Messenger/Functions/MessengerRegisterReceiveFileCallbackTests.swift
+++ b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerRegisterReceiveFileCallbackTests.swift
@@ -10,7 +10,7 @@ final class MessengerRegisterReceiveFileCallbackTests: XCTestCase {
     var didCancelRegisteredCallback = 0
 
     var env: MessengerEnvironment = .unimplemented
-    env.receiveFileCallbacksRegistry.register = { callback in
+    env.receiveFileCallbacks.register = { callback in
       registeredCallbacks.append(callback)
       return Cancellable { didCancelRegisteredCallback += 1 }
     }
diff --git a/Tests/XXMessengerClientTests/Messenger/Functions/MessengerStartFileTransferTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerStartFileTransferTests.swift
index f0da2047..8e6d3528 100644
--- a/Tests/XXMessengerClientTests/Messenger/Functions/MessengerStartFileTransferTests.swift
+++ b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerStartFileTransferTests.swift
@@ -34,7 +34,7 @@ final class MessengerStartFileTransferTests: XCTestCase {
     env.fileTransfer.set = {
       didSetFileTransfer.append($0)
     }
-    env.receiveFileCallbacksRegistry.registered = {
+    env.receiveFileCallbacks.registered = {
       ReceiveFileCallback { result in
         didReceiveFile.append(result)
       }
-- 
GitLab