From 837263bd4909bb9f05392f4c62b963a69ba0175e Mon Sep 17 00:00:00 2001
From: Dariusz Rybicki <dariusz@elixxir.io>
Date: Fri, 16 Sep 2022 17:41:49 +0200
Subject: [PATCH] Rename MessengerSearchUsers to MessengerSeatchContacts
---
...rs.swift => MessengerSearchContacts.swift} | 14 ++++-----
.../Messenger/Messenger.swift | 6 ++--
...ift => MessengerSearchContactsTests.swift} | 30 +++++++++----------
3 files changed, 25 insertions(+), 25 deletions(-)
rename Sources/XXMessengerClient/Messenger/Functions/{MessengerSearchUsers.swift => MessengerSearchContacts.swift} (88%)
rename Tests/XXMessengerClientTests/Messenger/Functions/{MessengerSearchUsersTests.swift => MessengerSearchContactsTests.swift} (84%)
diff --git a/Sources/XXMessengerClient/Messenger/Functions/MessengerSearchUsers.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerSearchContacts.swift
similarity index 88%
rename from Sources/XXMessengerClient/Messenger/Functions/MessengerSearchUsers.swift
rename to Sources/XXMessengerClient/Messenger/Functions/MessengerSearchContacts.swift
index 5acd76d7..94f55c27 100644
--- a/Sources/XXMessengerClient/Messenger/Functions/MessengerSearchUsers.swift
+++ b/Sources/XXMessengerClient/Messenger/Functions/MessengerSearchContacts.swift
@@ -2,7 +2,7 @@ import Foundation
import XCTestDynamicOverlay
import XXClient
-public struct MessengerSearchUsers {
+public struct MessengerSearchContacts {
public struct Query: Equatable {
public init(
username: String? = nil,
@@ -31,9 +31,9 @@ public struct MessengerSearchUsers {
}
}
-extension MessengerSearchUsers {
- public static func live(_ env: MessengerEnvironment) -> MessengerSearchUsers {
- MessengerSearchUsers { query in
+extension MessengerSearchContacts {
+ public static func live(_ env: MessengerEnvironment) -> MessengerSearchContacts {
+ MessengerSearchContacts { query in
guard let e2e = env.e2e() else {
throw Error.notConnected
}
@@ -63,7 +63,7 @@ extension MessengerSearchUsers {
}
}
-extension MessengerSearchUsers.Query {
+extension MessengerSearchContacts.Query {
public var isEmpty: Bool {
[username, email, phone]
.compactMap { $0 }
@@ -86,8 +86,8 @@ extension MessengerSearchUsers.Query {
}
}
-extension MessengerSearchUsers {
- public static let unimplemented = MessengerSearchUsers(
+extension MessengerSearchContacts {
+ public static let unimplemented = MessengerSearchContacts(
run: XCTUnimplemented("\(Self.self)")
)
}
diff --git a/Sources/XXMessengerClient/Messenger/Messenger.swift b/Sources/XXMessengerClient/Messenger/Messenger.swift
index 4995f9a1..6a3c417b 100644
--- a/Sources/XXMessengerClient/Messenger/Messenger.swift
+++ b/Sources/XXMessengerClient/Messenger/Messenger.swift
@@ -21,7 +21,7 @@ public struct Messenger {
public var waitForNetwork: MessengerWaitForNetwork
public var waitForNodes: MessengerWaitForNodes
public var destroy: MessengerDestroy
- public var searchUsers: MessengerSearchUsers
+ public var searchContacts: MessengerSearchContacts
public var registerForNotifications: MessengerRegisterForNotifications
public var verifyContact: MessengerVerifyContact
public var sendMessage: MessengerSendMessage
@@ -50,7 +50,7 @@ extension Messenger {
waitForNetwork: .live(env),
waitForNodes: .live(env),
destroy: .live(env),
- searchUsers: .live(env),
+ searchContacts: .live(env),
registerForNotifications: .live(env),
verifyContact: .live(env),
sendMessage: .live(env)
@@ -80,7 +80,7 @@ extension Messenger {
waitForNetwork: .unimplemented,
waitForNodes: .unimplemented,
destroy: .unimplemented,
- searchUsers: .unimplemented,
+ searchContacts: .unimplemented,
registerForNotifications: .unimplemented,
verifyContact: .unimplemented,
sendMessage: .unimplemented
diff --git a/Tests/XXMessengerClientTests/Messenger/Functions/MessengerSearchUsersTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerSearchContactsTests.swift
similarity index 84%
rename from Tests/XXMessengerClientTests/Messenger/Functions/MessengerSearchUsersTests.swift
rename to Tests/XXMessengerClientTests/Messenger/Functions/MessengerSearchContactsTests.swift
index 21152086..f3ab082c 100644
--- a/Tests/XXMessengerClientTests/Messenger/Functions/MessengerSearchUsersTests.swift
+++ b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerSearchContactsTests.swift
@@ -3,7 +3,7 @@ import XCTest
import XXClient
@testable import XXMessengerClient
-final class MessengerSearchUsersTests: XCTestCase {
+final class MessengerSearchContactsTests: XCTestCase {
func testSearch() throws {
struct SearchUdParams: Equatable {
var e2eId: Int
@@ -41,8 +41,8 @@ final class MessengerSearchUsersTests: XCTestCase {
return SingleUseSendReport(rounds: [], roundURL: "", ephId: 0, receptionId: Data())
}
- let search: MessengerSearchUsers = .live(env)
- let query = MessengerSearchUsers.Query(
+ let search: MessengerSearchContacts = .live(env)
+ let query = MessengerSearchContacts.Query(
username: "Username",
email: "Email",
phone: "Phone"
@@ -67,10 +67,10 @@ final class MessengerSearchUsersTests: XCTestCase {
func testSearchNotConnected() {
var env: MessengerEnvironment = .unimplemented
env.e2e.get = { nil }
- let search: MessengerSearchUsers = .live(env)
+ let search: MessengerSearchContacts = .live(env)
XCTAssertThrowsError(try search(query: .init())) { error in
- XCTAssertNoDifference(error as? MessengerSearchUsers.Error, .notConnected)
+ XCTAssertNoDifference(error as? MessengerSearchContacts.Error, .notConnected)
}
}
@@ -78,10 +78,10 @@ final class MessengerSearchUsersTests: XCTestCase {
var env: MessengerEnvironment = .unimplemented
env.e2e.get = { .unimplemented }
env.ud.get = { nil }
- let search: MessengerSearchUsers = .live(env)
+ let search: MessengerSearchContacts = .live(env)
XCTAssertThrowsError(try search(query: .init())) { error in
- XCTAssertNoDifference(error as? MessengerSearchUsers.Error, .notLoggedIn)
+ XCTAssertNoDifference(error as? MessengerSearchContacts.Error, .notLoggedIn)
}
}
@@ -103,7 +103,7 @@ final class MessengerSearchUsersTests: XCTestCase {
env.getSingleUseParams.run = { Data() }
env.searchUD.run = { _, _, _, _, _ in throw error }
- let search: MessengerSearchUsers = .live(env)
+ let search: MessengerSearchContacts = .live(env)
XCTAssertThrowsError(try search(query: .init())) { err in
XCTAssertNoDifference(err as? Failure, error)
@@ -131,7 +131,7 @@ final class MessengerSearchUsersTests: XCTestCase {
return SingleUseSendReport(rounds: [], roundURL: "", ephId: 0, receptionId: Data())
}
- let search: MessengerSearchUsers = .live(env)
+ let search: MessengerSearchContacts = .live(env)
XCTAssertThrowsError(try search(query: .init())) { err in
XCTAssertNoDifference(err as? Failure, error)
@@ -139,7 +139,7 @@ final class MessengerSearchUsersTests: XCTestCase {
}
func testQueryIsEmpty() {
- let emptyQueries: [MessengerSearchUsers.Query] = [
+ let emptyQueries: [MessengerSearchContacts.Query] = [
.init(username: nil, email: nil, phone: nil),
.init(username: "", email: nil, phone: nil),
.init(username: nil, email: "", phone: nil),
@@ -151,7 +151,7 @@ final class MessengerSearchUsersTests: XCTestCase {
XCTAssertTrue(query.isEmpty, "\(query) should be empty")
}
- let nonEmptyQueries: [MessengerSearchUsers.Query] = [
+ let nonEmptyQueries: [MessengerSearchContacts.Query] = [
.init(username: "test", email: nil, phone: nil),
.init(username: nil, email: "test", phone: nil),
.init(username: nil, email: nil, phone: "test"),
@@ -165,17 +165,17 @@ final class MessengerSearchUsersTests: XCTestCase {
func testQueryFacts() {
XCTAssertNoDifference(
- MessengerSearchUsers.Query(username: nil, email: nil, phone: nil).facts,
+ MessengerSearchContacts.Query(username: nil, email: nil, phone: nil).facts,
[]
)
XCTAssertNoDifference(
- MessengerSearchUsers.Query(username: "", email: "", phone: "").facts,
+ MessengerSearchContacts.Query(username: "", email: "", phone: "").facts,
[]
)
XCTAssertNoDifference(
- MessengerSearchUsers.Query(
+ MessengerSearchContacts.Query(
username: "username",
email: "email",
phone: "phone"
@@ -188,7 +188,7 @@ final class MessengerSearchUsersTests: XCTestCase {
)
XCTAssertNoDifference(
- MessengerSearchUsers.Query(
+ MessengerSearchContacts.Query(
username: "username",
email: "",
phone: nil
--
GitLab