From 09426404263b4835ec44918f7ecfa8d149ea46ee Mon Sep 17 00:00:00 2001
From: Bruno Muniz Azevedo Filho <bruno@elixxir.io>
Date: Wed, 22 Jun 2022 01:55:44 -0300
Subject: [PATCH] Finished cleaning integration except fT
---
Sources/Integration/Mocks/BindingsMock.swift | 87 ++++++++++---------
.../Integration/Mocks/UserDiscoveryMock.swift | 23 ++---
2 files changed, 56 insertions(+), 54 deletions(-)
diff --git a/Sources/Integration/Mocks/BindingsMock.swift b/Sources/Integration/Mocks/BindingsMock.swift
index cf886b5d..61ccceb4 100644
--- a/Sources/Integration/Mocks/BindingsMock.swift
+++ b/Sources/Integration/Mocks/BindingsMock.swift
@@ -188,12 +188,12 @@ public final class BindingsMock: BindingsInterface {
extension Group {
static let mockGroup = Group(
- leader: "mockGroupLeader".data(using: .utf8)!,
+ id: "mockGroup".data(using: .utf8)!,
name: "Bruno's birthday 6/1",
- groupId: "mockGroup".data(using: .utf8)!,
- status: .pending,
+ leaderId: "mockGroupLeader".data(using: .utf8)!,
createdAt: Date.distantPast,
- serialize: "mockGroup".data(using: .utf8)!
+ authStatus: .pending,
+ serialized: "mockGroup".data(using: .utf8)!
)
}
@@ -202,17 +202,18 @@ extension Contact {
var mocks = [Contact]()
for n in 0..<count {
- mocks.append(.init(
- photo: nil,
- userId: "brad\(n)".data(using: .utf8)!,
- email: "brad\(n)@xx.io",
- phone: "819820212\(n)5BR",
- status: .verified,
- marshaled: "brad\(n)".data(using: .utf8)!,
- username: "brad\(n)",
- nickname: nil,
- createdAt: Date(),
- isRecent: false
+ mocks.append(
+ .init(
+ id: "brad\(n)".data(using: .utf8)!,
+ marshaled: "brad\(n)".data(using: .utf8)!,
+ username: "brad\(n)",
+ email: "brad\(n)@xx.io",
+ phone: "819820212\(n)5BR",
+ nickname: nil,
+ photo: nil,
+ authStatus: .verified,
+ isRecent: false,
+ createdAt: Date()
))
}
@@ -220,55 +221,55 @@ extension Contact {
}
static let angelinaRequested = Contact(
- photo: nil,
- userId: "angelinajolie".data(using: .utf8)!,
- email: nil,
- phone: nil,
- status: .verificationInProgress,
+ id: "angelinajolie".data(using: .utf8)!,
marshaled: "angelinajolie".data(using: .utf8)!,
username: "angelinajolie",
+ email: nil,
+ phone: nil,
nickname: "Angelica Jolie",
- createdAt: Date(),
- isRecent: false
+ photo: nil,
+ authStatus: .verificationInProgress,
+ isRecent: false,
+ createdAt: Date()
)
static let carlRequested = Contact(
- photo: nil,
- userId: "carlsagan".data(using: .utf8)!,
- email: "carl@jpl.nasa",
- phone: "81982022244BR",
- status: .verified,
+ id: "carlsagan".data(using: .utf8)!,
marshaled: "carlsagan".data(using: .utf8)!,
username: "carlsagan",
+ email: "carl@jpl.nasa",
+ phone: "81982022244BR",
nickname: "Carl Sagan",
- createdAt: Date.distantPast,
- isRecent: false
+ photo: nil,
+ authStatus: .verified,
+ isRecent: false,
+ createdAt: Date.distantPast
)
static let elonRequested = Contact(
- photo: nil,
- userId: "elonmusk".data(using: .utf8)!,
- email: "elon@tesla.com",
- phone: nil,
- status: .verified,
+ id: "elonmusk".data(using: .utf8)!,
marshaled: "elonmusk".data(using: .utf8)!,
username: "elonmusk",
+ email: "elon@tesla.com",
+ phone: nil,
nickname: "Elon Musk",
- createdAt: Date.distantPast,
- isRecent: false
+ photo: nil,
+ authStatus: .verified,
+ isRecent: false,
+ createdAt: Date.distantPast
)
static let georgeDiscovered = Contact(
- photo: nil,
- userId: "georgebenson74".data(using: .utf8)!,
- email: "george@xx.io",
- phone: "81987022255BR",
- status: .stranger,
+ id: "georgebenson74".data(using: .utf8)!,
marshaled: "georgebenson74".data(using: .utf8)!,
username: "bruno_muniz74",
+ email: "george@xx.io",
+ phone: "81987022255BR",
nickname: "Bruno Muniz",
- createdAt: Date(),
- isRecent: false
+ photo: nil,
+ authStatus: .stranger,
+ isRecent: false,
+ createdAt: Date()
)
}
diff --git a/Sources/Integration/Mocks/UserDiscoveryMock.swift b/Sources/Integration/Mocks/UserDiscoveryMock.swift
index 86458744..bb1a8f24 100644
--- a/Sources/Integration/Mocks/UserDiscoveryMock.swift
+++ b/Sources/Integration/Mocks/UserDiscoveryMock.swift
@@ -27,17 +27,18 @@ final class UserDiscoveryMock: UserDiscoveryInterface {
_ completion: @escaping (Result<Contact, Error>) -> Void
) {
DispatchQueue.global().asyncAfter(deadline: .now() + 1) {
- completion(.success(.init(
- photo: nil,
- userId: "mock_username".data(using: .utf8)!,
- email: nil,
- phone: nil,
- status: .stranger,
- marshaled: "mock_username".data(using: .utf8)!,
- username: "mock_username",
- nickname: "mock_nickname",
- createdAt: Date(),
- isRecent: false
+ completion(.success(
+ .init(
+ id: "mock_username".data(using: .utf8)!,
+ marshaled: "mock_username".data(using: .utf8)!,
+ username: "mock_username",
+ email: nil,
+ phone: nil,
+ nickname: "mock_nickname",
+ photo: nil,
+ authStatus: .stranger,
+ isRecent: false,
+ createdAt: Date()
)))
}
}
--
GitLab