Refactor

Docs/XXMessengerClient.md

@@ -8,7 +8,7 @@ Example:
 
 ```swift
 // setup environment:
-var environment: MessengerEnvironment = .live()
+var environment: Environment = .live()
 
 // change cMix NDF environment if needed:
 environment.ndfEnvironment = ...

Sources/XXMessengerClient/Messenger/MessengerEnvironment.swift → Sources/XXMessengerClient/Environment.swift

@@ -2,11 +2,11 @@ import Foundation
 import XXClient
 import XCTestDynamicOverlay
 
-public struct MessengerEnvironment {
+public struct Environment {
   public var cMix: Stored<CMix?>
+  public var directoryManager: DirectoryManager
   public var downloadNDF: DownloadAndVerifySignedNdf
   public var e2e: Stored<E2E?>
-  public var fileManager: MessengerFileManager
   public var generateSecret: GenerateSecret
   public var getCMixParams: GetCMixParams
   public var getE2EParams: GetE2EParams
@@ -25,19 +25,19 @@ public struct MessengerEnvironment {
   public var udContact: Data?
 }
 
-extension MessengerEnvironment {
+extension Environment {
   public static let defaultStorageDir = FileManager.default
     .urls(for: .applicationSupportDirectory, in: .userDomainMask)
     .first!
     .appendingPathComponent("xx.network.client")
     .path
 
-  public static func live() -> MessengerEnvironment {
-    MessengerEnvironment(
+  public static func live() -> Environment {
+    Environment(
       cMix: .inMemory(),
+      directoryManager: .live(),
       downloadNDF: .live,
       e2e: .inMemory(),
-      fileManager: .live(),
       generateSecret: .live,
       getCMixParams: .liveDefault,
       getE2EParams: .liveDefault,
@@ -49,7 +49,7 @@ extension MessengerEnvironment {
       newOrLoadUd: .live,
       passwordStorage: .keychain,
       sleep: { Foundation.sleep(UInt32($0)) },
-      storageDir: MessengerEnvironment.defaultStorageDir,
+      storageDir: Environment.defaultStorageDir,
       ud: .inMemory(),
       udAddress: nil,
       udCert: nil,
@@ -58,12 +58,12 @@ extension MessengerEnvironment {
   }
 }
 
-extension MessengerEnvironment {
-  public static let unimplemented = MessengerEnvironment(
+extension Environment {
+  public static let unimplemented = Environment(
     cMix: .unimplemented(),
+    directoryManager: .unimplemented,
     downloadNDF: .unimplemented,
     e2e: .unimplemented(),
-    fileManager: .unimplemented,
     generateSecret: .unimplemented,
     getCMixParams: .unimplemented,
     getE2EParams: .unimplemented,

Sources/XXMessengerClient/Messenger/Functors/MessengerConnect.swift → Sources/XXMessengerClient/Functors/Connect.swift

 import XXClient
 import XCTestDynamicOverlay
 
-public struct MessengerConnect {
+public struct Connect {
   public enum Error: Swift.Error, Equatable {
     case notLoaded
   }
@@ -13,9 +13,9 @@ public struct MessengerConnect {
   }
 }
 
-extension MessengerConnect {
-  public static func live(_ env: MessengerEnvironment) -> MessengerConnect {
-    MessengerConnect {
+extension Connect {
+  public static func live(_ env: Environment) -> Connect {
+    Connect {
       guard let cMix = env.cMix() else {
         throw Error.notLoaded
       }
@@ -28,8 +28,8 @@ extension MessengerConnect {
   }
 }
 
-extension MessengerConnect {
-  public static let unimplemented = MessengerConnect(
+extension Connect {
+  public static let unimplemented = Connect(
     run: XCTUnimplemented()
   )
 }

Sources/XXMessengerClient/Messenger/Functors/MessengerCreate.swift → Sources/XXMessengerClient/Functors/Create.swift

 import XXClient
 import XCTestDynamicOverlay
 
-public struct MessengerCreate {
+public struct Create {
   public var run: () throws -> Void
 
   public func callAsFunction() throws {
@@ -9,15 +9,15 @@ public struct MessengerCreate {
   }
 }
 
-extension MessengerCreate {
-  public static func live(_ env: MessengerEnvironment) -> MessengerCreate {
-    MessengerCreate {
+extension Create {
+  public static func live(_ env: Environment) -> Create {
+    Create {
       let ndfData = try env.downloadNDF(env.ndfEnvironment)
       let password = env.generateSecret()
       try env.passwordStorage.save(password)
       let storageDir = env.storageDir
-      try env.fileManager.removeDirectory(storageDir)
-      try env.fileManager.createDirectory(storageDir)
+      try env.directoryManager.remove(storageDir)
+      try env.directoryManager.create(storageDir)
       try env.newCMix(
         ndfJSON: String(data: ndfData, encoding: .utf8)!,
         storageDir: storageDir,
@@ -28,8 +28,8 @@ extension MessengerCreate {
   }
 }
 
-extension MessengerCreate {
-  public static let unimplemented = MessengerCreate(
+extension Create {
+  public static let unimplemented = Create(
     run: XCTUnimplemented()
   )
 }

Sources/XXMessengerClient/Messenger/Functors/MessengerIsConnected.swift → Sources/XXMessengerClient/Functors/IsConnected.swift

 import XXClient
 import XCTestDynamicOverlay
 
-public struct MessengerIsConnected {
+public struct IsConnected {
   public var run: () -> Bool
 
   public func callAsFunction() -> Bool {
@@ -9,16 +9,16 @@ public struct MessengerIsConnected {
   }
 }
 
-extension MessengerIsConnected {
-  public static func live(_ env: MessengerEnvironment) -> MessengerIsConnected {
-    MessengerIsConnected {
+extension IsConnected {
+  public static func live(_ env: Environment) -> IsConnected {
+    IsConnected {
       env.e2e() != nil
     }
   }
 }
 
-extension MessengerIsConnected {
-  public static let unimplemented = MessengerIsConnected(
+extension IsConnected {
+  public static let unimplemented = IsConnected(
     run: XCTUnimplemented()
   )
 }

Sources/XXMessengerClient/Messenger/Functors/MessengerIsCreated.swift → Sources/XXMessengerClient/Functors/IsCreated.swift

 import XXClient
 import XCTestDynamicOverlay
 
-public struct MessengerIsCreated {
+public struct IsCreated {
   public var run: () -> Bool
 
   public func callAsFunction() -> Bool {
@@ -9,16 +9,16 @@ public struct MessengerIsCreated {
   }
 }
 
-extension MessengerIsCreated {
-  public static func live(_ env: MessengerEnvironment) -> MessengerIsCreated {
-    MessengerIsCreated {
-      env.fileManager.isDirectoryEmpty(env.storageDir) == false
+extension IsCreated {
+  public static func live(_ env: Environment) -> IsCreated {
+    IsCreated {
+      env.directoryManager.isEmpty(env.storageDir) == false
     }
   }
 }
 
-extension MessengerIsCreated {
-  public static let unimplemented = MessengerIsCreated(
+extension IsCreated {
+  public static let unimplemented = IsCreated(
     run: XCTUnimplemented()
   )
 }

Sources/XXMessengerClient/Messenger/Functors/MessengerIsLoaded.swift → Sources/XXMessengerClient/Functors/IsLoaded.swift

 import XXClient
 import XCTestDynamicOverlay
 
-public struct MessengerIsLoaded {
+public struct IsLoaded {
   public var run: () -> Bool
 
   public func callAsFunction() -> Bool {
@@ -9,16 +9,16 @@ public struct MessengerIsLoaded {
   }
 }
 
-extension MessengerIsLoaded {
-  public static func live(_ env: MessengerEnvironment) -> MessengerIsLoaded {
-    MessengerIsLoaded {
+extension IsLoaded {
+  public static func live(_ env: Environment) -> IsLoaded {
+    IsLoaded {
       env.cMix() != nil
     }
   }
 }
 
-extension MessengerIsLoaded {
-  public static let unimplemented = MessengerIsLoaded(
+extension IsLoaded {
+  public static let unimplemented = IsLoaded(
     run: XCTUnimplemented()
   )
 }

Sources/XXMessengerClient/Messenger/Functors/MessengerIsLoggedIn.swift → Sources/XXMessengerClient/Functors/IsLoggedIn.swift

 import XXClient
 import XCTestDynamicOverlay
 
-public struct MessengerIsLoggedIn {
+public struct IsLoggedIn {
   public var run: () -> Bool
 
   public func callAsFunction() -> Bool {
@@ -9,16 +9,16 @@ public struct MessengerIsLoggedIn {
   }
 }
 
-extension MessengerIsLoggedIn {
-  public static func live(_ env: MessengerEnvironment) -> MessengerIsLoggedIn {
-    MessengerIsLoggedIn {
+extension IsLoggedIn {
+  public static func live(_ env: Environment) -> IsLoggedIn {
+    IsLoggedIn {
       env.ud() != nil
     }
   }
 }
 
-extension MessengerIsLoggedIn {
-  public static let unimplemented = MessengerIsLoggedIn(
+extension IsLoggedIn {
+  public static let unimplemented = IsLoggedIn(
     run: XCTUnimplemented()
   )
 }

Sources/XXMessengerClient/Messenger/Functors/MessengerIsRegistered.swift → Sources/XXMessengerClient/Functors/IsRegistered.swift

 import XXClient
 import XCTestDynamicOverlay
 
-public struct MessengerIsRegistered {
+public struct IsRegistered {
   public enum Error: Swift.Error, Equatable {
     case notConnected
   }
@@ -13,9 +13,9 @@ public struct MessengerIsRegistered {
   }
 }
 
-extension MessengerIsRegistered {
-  public static func live(_ env: MessengerEnvironment) -> MessengerIsRegistered {
-    MessengerIsRegistered {
+extension IsRegistered {
+  public static func live(_ env: Environment) -> IsRegistered {
+    IsRegistered {
       guard let e2e = env.e2e() else {
         throw Error.notConnected
       }
@@ -24,8 +24,8 @@ extension MessengerIsRegistered {
   }
 }
 
-extension MessengerIsRegistered {
-  public static let unimplemented = MessengerIsRegistered(
+extension IsRegistered {
+  public static let unimplemented = IsRegistered(
     run: XCTUnimplemented()
   )
 }

Sources/XXMessengerClient/Messenger/Functors/MessengerLoad.swift → Sources/XXMessengerClient/Functors/Load.swift

 import XXClient
 import XCTestDynamicOverlay
 
-public struct MessengerLoad {
+public struct Load {
   public var run: () throws -> Void
 
   public func callAsFunction() throws {
@@ -9,9 +9,9 @@ public struct MessengerLoad {
   }
 }
 
-extension MessengerLoad {
-  public static func live(_ env: MessengerEnvironment) -> MessengerLoad {
-    MessengerLoad {
+extension Load {
+  public static func live(_ env: Environment) -> Load {
+    Load {
       env.cMix.set(try env.loadCMix(
         storageDir: env.storageDir,
         password: try env.passwordStorage.load(),
@@ -21,8 +21,8 @@ extension MessengerLoad {
   }
 }
 
-extension MessengerLoad {
-  public static let unimplemented = MessengerLoad(
+extension Load {
+  public static let unimplemented = Load(
     run: XCTUnimplemented()
   )
 }

Sources/XXMessengerClient/Messenger/Functors/MessengerLogIn.swift → Sources/XXMessengerClient/Functors/LogIn.swift

 import XXClient
 import XCTestDynamicOverlay
 
-public struct MessengerLogIn {
+public struct LogIn {
   public enum Error: Swift.Error, Equatable {
     case notLoaded
     case notConnected
@@ -14,9 +14,9 @@ public struct MessengerLogIn {
   }
 }
 
-extension MessengerLogIn {
-  public static func live(_ env: MessengerEnvironment) -> MessengerLogIn {
-    MessengerLogIn {
+extension LogIn {
+  public static func live(_ env: Environment) -> LogIn {
+    LogIn {
       guard let cMix = env.cMix() else {
         throw Error.notLoaded
       }
@@ -40,8 +40,8 @@ extension MessengerLogIn {
   }
 }
 
-extension MessengerLogIn {
-  public static let unimplemented = MessengerLogIn(
+extension LogIn {
+  public static let unimplemented = LogIn(
     run: XCTUnimplemented()
   )
 }

Sources/XXMessengerClient/Messenger/Functors/MessengerRegister.swift → Sources/XXMessengerClient/Functors/Register.swift

 import XXClient
 import XCTestDynamicOverlay
 
-public struct MessengerRegister {
+public struct Register {
   public enum Error: Swift.Error, Equatable {
     case notLoaded
     case notConnected
@@ -16,9 +16,9 @@ public struct MessengerRegister {
   }
 }
 
-extension MessengerRegister {
-  public static func live(_ env: MessengerEnvironment) -> MessengerRegister {
-    MessengerRegister { username in
+extension Register {
+  public static func live(_ env: Environment) -> Register {
+    Register { username in
       guard let cMix = env.cMix() else {
         throw Error.notLoaded
       }
@@ -42,8 +42,8 @@ extension MessengerRegister {
   }
 }
 
-extension MessengerRegister {
-  public static let unimplemented = MessengerRegister(
+extension Register {
+  public static let unimplemented = Register(
     run: XCTUnimplemented()
   )
 }

Sources/XXMessengerClient/Messenger/Functors/MessengerStart.swift → Sources/XXMessengerClient/Functors/Start.swift

 import XXClient
 import XCTestDynamicOverlay
 
-public struct MessengerStart {
+public struct Start {
   public enum Error: Swift.Error {
     case notLoaded
   }
@@ -15,9 +15,9 @@ public struct MessengerStart {
   }
 }
 
-extension MessengerStart {
-  public static func live(_ env: MessengerEnvironment) -> MessengerStart {
-    MessengerStart { timeoutMS in
+extension Start {
+  public static func live(_ env: Environment) -> Start {
+    Start { timeoutMS in
       guard let cMix = env.cMix() else {
         throw Error.notLoaded
       }
@@ -29,8 +29,8 @@ extension MessengerStart {
   }
 }
 
-extension MessengerStart {
-  public static let unimplemented = MessengerStart(
+extension Start {
+  public static let unimplemented = Start(
     run: XCTUnimplemented("\(Self.self)")
   )
 }

Sources/XXMessengerClient/Messenger/Functors/MessengerWaitForNetwork.swift → Sources/XXMessengerClient/Functors/WaitForNetwork.swift

 import XXClient
 import XCTestDynamicOverlay
 
-public struct MessengerWaitForNetwork {
+public struct WaitForNetwork {
   public enum Error: Swift.Error {
     case notLoaded
     case timeout
@@ -16,9 +16,9 @@ public struct MessengerWaitForNetwork {
   }
 }
 
-extension MessengerWaitForNetwork {
-  public static func live(_ env: MessengerEnvironment) -> MessengerWaitForNetwork {
-    MessengerWaitForNetwork { timeoutMS in
+extension WaitForNetwork {
+  public static func live(_ env: Environment) -> WaitForNetwork {
+    WaitForNetwork { timeoutMS in
       guard let cMix = env.cMix() else {
         throw Error.notLoaded
       }
@@ -29,8 +29,8 @@ extension MessengerWaitForNetwork {
   }
 }
 
-extension MessengerWaitForNetwork {
-  public static let unimplemented = MessengerWaitForNetwork(
+extension WaitForNetwork {
+  public static let unimplemented = WaitForNetwork(
     run: XCTUnimplemented("\(Self.self)")
   )
 }

Sources/XXMessengerClient/Messenger/Functors/MessengerWaitForNodes.swift → Sources/XXMessengerClient/Functors/WaitForNodes.swift

 import XXClient
 import XCTestDynamicOverlay
 
-public struct MessengerWaitForNodes {
+public struct WaitForNodes {
   public typealias Progress = (NodeRegistrationReport) -> Void
 
   public enum Error: Swift.Error {
@@ -21,9 +21,9 @@ public struct MessengerWaitForNodes {
   }
 }
 
-extension MessengerWaitForNodes {
-  public static func live(_ env: MessengerEnvironment) -> MessengerWaitForNodes {
-    MessengerWaitForNodes { targetRatio, sleepMS, retries, onProgress in
+extension WaitForNodes {
+  public static func live(_ env: Environment) -> WaitForNodes {
+    WaitForNodes { targetRatio, sleepMS, retries, onProgress in
       guard let cMix = env.cMix() else {
         throw Error.notLoaded
       }
@@ -46,8 +46,8 @@ extension MessengerWaitForNodes {
   }
 }
 
-extension MessengerWaitForNodes {
-  public static let unimplemented = MessengerWaitForNodes(
+extension WaitForNodes {
+  public static let unimplemented = WaitForNodes(
     run: XCTUnimplemented("\(Self.self)")
   )
 }

Sources/XXMessengerClient/Messenger/Messenger.swift → Sources/XXMessengerClient/Messenger.swift

@@ -4,23 +4,23 @@ public struct Messenger {
   public var cMix: Stored<CMix?>
   public var e2e: Stored<E2E?>
   public var ud: Stored<UserDiscovery?>
-  public var isCreated: MessengerIsCreated
-  public var create: MessengerCreate
-  public var isLoaded: MessengerIsLoaded
-  public var load: MessengerLoad
-  public var start: MessengerStart
-  public var isConnected: MessengerIsConnected
-  public var connect: MessengerConnect
-  public var isRegistered: MessengerIsRegistered
-  public var register: MessengerRegister
-  public var isLoggedIn: MessengerIsLoggedIn
-  public var logIn: MessengerLogIn
-  public var waitForNetwork: MessengerWaitForNetwork
-  public var waitForNodes: MessengerWaitForNodes
+  public var isCreated: IsCreated
+  public var create: Create
+  public var isLoaded: IsLoaded
+  public var load: Load
+  public var start: Start
+  public var isConnected: IsConnected
+  public var connect: Connect
+  public var isRegistered: IsRegistered
+  public var register: Register
+  public var isLoggedIn: IsLoggedIn
+  public var logIn: LogIn
+  public var waitForNetwork: WaitForNetwork
+  public var waitForNodes: WaitForNodes
 }
 
 extension Messenger {
-  public static func live(_ env: MessengerEnvironment) -> Messenger {
+  public static func live(_ env: Environment) -> Messenger {
     Messenger(
       cMix: env.cMix,
       e2e: env.e2e,

Sources/XXMessengerClient/Utils/MessengerFileManager.swift → Sources/XXMessengerClient/Utils/DirectoryManager.swift

 import Foundation
 import XCTestDynamicOverlay
 
-public struct MessengerFileManager {
-  public var isDirectoryEmpty: (String) -> Bool
-  public var removeDirectory: (String) throws -> Void
-  public var createDirectory: (String) throws -> Void
+public struct DirectoryManager {
+  public var isEmpty: (String) -> Bool
+  public var remove: (String) throws -> Void
+  public var create: (String) throws -> Void
 }
 
-extension MessengerFileManager {
+extension DirectoryManager {
   public static func live(
     fileManager: FileManager = .default
-  ) -> MessengerFileManager {
-    MessengerFileManager(
-      isDirectoryEmpty: { path in
+  ) -> DirectoryManager {
+    DirectoryManager(
+      isEmpty: { path in
         let contents = try? fileManager.contentsOfDirectory(atPath: path)
         return contents?.isEmpty ?? true
       },
-      removeDirectory: { path in
+      remove: { path in
         if fileManager.fileExists(atPath: path) {
           try fileManager.removeItem(atPath: path)
         }
       },
-      createDirectory: { path in
+      create: { path in
         try fileManager.createDirectory(
           atPath: path,
           withIntermediateDirectories: true
@@ -31,10 +31,10 @@ extension MessengerFileManager {
   }
 }
 
-extension MessengerFileManager {
-  public static let unimplemented = MessengerFileManager(
-    isDirectoryEmpty: XCTUnimplemented("\(Self.self).isDirectoryEmpty"),
-    removeDirectory: XCTUnimplemented("\(Self.self).removeDirectory"),
-    createDirectory: XCTUnimplemented("\(Self.self).createDirectory")
+extension DirectoryManager {
+  public static let unimplemented = DirectoryManager(
+    isEmpty: XCTUnimplemented("\(Self.self).isDirectoryEmpty"),
+    remove: XCTUnimplemented("\(Self.self).removeDirectory"),
+    create: XCTUnimplemented("\(Self.self).createDirectory")
   )
 }

Tests/XXMessengerClientTests/Messenger/Functors/MessengerConnectTests.swift → Tests/XXMessengerClientTests/Functors/ConnectTests.swift

@@ -3,7 +3,7 @@ import XXClient
 import XCTest
 @testable import XXMessengerClient
 
-final class MessengerConnectTests: XCTestCase {
+final class ConnectTests: XCTestCase {
   func testConnect() throws {
     struct DidLogIn: Equatable {
       var ephemeral: Bool
@@ -20,7 +20,7 @@ final class MessengerConnectTests: XCTestCase {
     let receptionId = ReceptionIdentity.stub
     let e2eParams = "e2e-params".data(using: .utf8)!
 
-    var env: MessengerEnvironment = .unimplemented
+    var env: Environment = .unimplemented
     env.cMix.get = {
       var cMix: CMix = .unimplemented
       cMix.getId.run = { cMixId }
@@ -39,7 +39,7 @@ final class MessengerConnectTests: XCTestCase {
       ))
       return .unimplemented
     }
-    let connect: MessengerConnect = .live(env)
+    let connect: Connect = .live(env)
 
     try connect()
 
@@ -56,14 +56,14 @@ final class MessengerConnectTests: XCTestCase {
   }
 
   func testConnectWithoutCMix() {
-    var env: MessengerEnvironment = .unimplemented
+    var env: Environment = .unimplemented
     env.cMix.get = { nil }
-    let connect: MessengerConnect = .live(env)
+    let connect: Connect = .live(env)
 
     XCTAssertThrowsError(try connect()) { error in
       XCTAssertEqual(
-        error as? MessengerConnect.Error,
-        MessengerConnect.Error.notLoaded
+        error as? Connect.Error,
+        Connect.Error.notLoaded
       )
     }
   }
@@ -72,14 +72,14 @@ final class MessengerConnectTests: XCTestCase {
     struct Error: Swift.Error, Equatable {}
     let error = Error()
 
-    var env: MessengerEnvironment = .unimplemented
+    var env: Environment = .unimplemented
     env.cMix.get = {
       var cMix: CMix = .unimplemented
       cMix.getId.run = { 1234 }
       cMix.makeLegacyReceptionIdentity.run = { throw error }
       return cMix
     }
-    let connect: MessengerConnect = .live(env)
+    let connect: Connect = .live(env)
 
     XCTAssertThrowsError(try connect()) { err in
       XCTAssertEqual(err as? Error, error)
@@ -90,7 +90,7 @@ final class MessengerConnectTests: XCTestCase {
     struct Error: Swift.Error, Equatable {}
     let error = Error()
 
-    var env: MessengerEnvironment = .unimplemented
+    var env: Environment = .unimplemented
     env.cMix.get = {
       var cMix: CMix = .unimplemented
       cMix.getId.run = { 1234 }
@@ -99,7 +99,7 @@ final class MessengerConnectTests: XCTestCase {
     }
     env.getE2EParams.run = { "e2e-params".data(using: .utf8)! }
     env.login.run = { _, _, _, _, _ in throw error }
-    let connect: MessengerConnect = .live(env)
+    let connect: Connect = .live(env)
 
     XCTAssertThrowsError(try connect()) { err in
       XCTAssertEqual(err as? Error, error)

Tests/XXMessengerClientTests/Messenger/Functors/MessengerCreateTests.swift → Tests/XXMessengerClientTests/Functors/CreateTests.swift

@@ -3,7 +3,7 @@ import XCTest
 import XXClient
 @testable import XXMessengerClient
 
-final class MessengerCreateTests: XCTestCase {
+final class CreateTests: XCTestCase {
   func testCreate() throws {
     struct DidNewCMix: Equatable {
       var ndfJSON: String
@@ -23,7 +23,7 @@ final class MessengerCreateTests: XCTestCase {
     let password = "password".data(using: .utf8)!
     let storageDir = "storage-dir"
 
-    var env: MessengerEnvironment = .unimplemented
+    var env: Environment = .unimplemented
     env.ndfEnvironment = .unimplemented
     env.downloadNDF.run = { ndfEnvironment in
       didDownloadNDF.append(ndfEnvironment)
@@ -37,10 +37,10 @@ final class MessengerCreateTests: XCTestCase {
       didSavePassword.append(password)
     }
     env.storageDir = storageDir
-    env.fileManager.removeDirectory = { path in
+    env.directoryManager.remove = { path in
       didRemoveDirectory.append(path)
     }
-    env.fileManager.createDirectory = { path in
+    env.directoryManager.create = { path in
       didCreateDirectory.append(path)
     }
     env.newCMix.run = { ndfJSON, storageDir, password, registrationCode in
@@ -51,7 +51,7 @@ final class MessengerCreateTests: XCTestCase {
         registrationCode: registrationCode
       ))
     }
-    let create: MessengerCreate = .live(env)
+    let create: Create = .live(env)
 
     try create()
 
@@ -72,10 +72,10 @@ final class MessengerCreateTests: XCTestCase {
     struct Error: Swift.Error, Equatable {}
     let error = Error()
 
-    var env: MessengerEnvironment = .unimplemented
+    var env: Environment = .unimplemented
     env.ndfEnvironment = .unimplemented
     env.downloadNDF.run = { _ in throw error }
-    let create: MessengerCreate = .live(env)
+    let create: Create = .live(env)
 
     XCTAssertThrowsError(try create()) { err in
       XCTAssertEqual(err as? Error, error)
@@ -86,12 +86,12 @@ final class MessengerCreateTests: XCTestCase {
     struct Error: Swift.Error, Equatable {}
     let error = Error()
 
-    var env: MessengerEnvironment = .unimplemented
+    var env: Environment = .unimplemented
     env.ndfEnvironment = .unimplemented
     env.downloadNDF.run = { _ in "ndf".data(using: .utf8)! }
     env.generateSecret.run = { _ in "password".data(using: .utf8)! }
     env.passwordStorage.save = { _ in throw error }
-    let create: MessengerCreate = .live(env)
+    let create: Create = .live(env)
 
     XCTAssertThrowsError(try create()) { err in
       XCTAssertEqual(err as? Error, error)
@@ -102,14 +102,14 @@ final class MessengerCreateTests: XCTestCase {
     struct Error: Swift.Error, Equatable {}
     let error = Error()
 
-    var env: MessengerEnvironment = .unimplemented
+    var env: Environment = .unimplemented
     env.ndfEnvironment = .unimplemented
     env.downloadNDF.run = { _ in "ndf".data(using: .utf8)! }
     env.generateSecret.run = { _ in "password".data(using: .utf8)! }
     env.passwordStorage.save = { _ in }
     env.storageDir = "storage-dir"
-    env.fileManager.removeDirectory = { _ in throw error }
-    let create: MessengerCreate = .live(env)
+    env.directoryManager.remove = { _ in throw error }
+    let create: Create = .live(env)
 
     XCTAssertThrowsError(try create()) { err in
       XCTAssertEqual(err as? Error, error)
@@ -120,15 +120,15 @@ final class MessengerCreateTests: XCTestCase {
     struct Error: Swift.Error, Equatable {}
     let error = Error()
 
-    var env: MessengerEnvironment = .unimplemented
+    var env: Environment = .unimplemented
     env.ndfEnvironment = .unimplemented
     env.downloadNDF.run = { _ in "ndf".data(using: .utf8)! }
     env.generateSecret.run = { _ in "password".data(using: .utf8)! }
     env.passwordStorage.save = { _ in }
     env.storageDir = "storage-dir"
-    env.fileManager.removeDirectory = { _ in }
-    env.fileManager.createDirectory = { _ in throw error }
-    let create: MessengerCreate = .live(env)
+    env.directoryManager.remove = { _ in }
+    env.directoryManager.create = { _ in throw error }
+    let create: Create = .live(env)
 
     XCTAssertThrowsError(try create()) { err in
       XCTAssertEqual(err as? Error, error)
@@ -139,16 +139,16 @@ final class MessengerCreateTests: XCTestCase {
     struct Error: Swift.Error, Equatable {}
     let error = Error()
 
-    var env: MessengerEnvironment = .unimplemented
+    var env: Environment = .unimplemented
     env.ndfEnvironment = .unimplemented
     env.downloadNDF.run = { _ in "ndf".data(using: .utf8)! }
     env.generateSecret.run = { _ in "password".data(using: .utf8)! }
     env.passwordStorage.save = { _ in }
     env.storageDir = "storage-dir"
-    env.fileManager.removeDirectory = { _ in }
-    env.fileManager.createDirectory = { _ in }
+    env.directoryManager.remove = { _ in }
+    env.directoryManager.create = { _ in }
     env.newCMix.run = { _, _, _, _ in throw error }
-    let create: MessengerCreate = .live(env)
+    let create: Create = .live(env)
 
     XCTAssertThrowsError(try create()) { err in
       XCTAssertEqual(err as? Error, error)

Tests/XXMessengerClientTests/Messenger/Functors/MessengerIsConnectedTests.swift → Tests/XXMessengerClientTests/Functors/IsConnectedTests.swift

 import XCTest
 @testable import XXMessengerClient
 
-final class MessengerIsConnectedTests: XCTestCase {
+final class IsConnectedTests: XCTestCase {
   func testWithE2E() {
-    var env: MessengerEnvironment = .unimplemented
+    var env: Environment = .unimplemented
     env.e2e.get = { .unimplemented }
-    let isConnected: MessengerIsConnected = .live(env)
+    let isConnected: IsConnected = .live(env)
 
     XCTAssertTrue(isConnected())
   }
 
   func testWithoutE2E() {
-    var env: MessengerEnvironment = .unimplemented
+    var env: Environment = .unimplemented
     env.e2e.get = { nil }
-    let isConnected: MessengerIsConnected = .live(env)
+    let isConnected: IsConnected = .live(env)
 
     XCTAssertFalse(isConnected())
   }