From eeb4d06ca882b8daccafe89c1a2da1a0783adcea Mon Sep 17 00:00:00 2001
From: Dariusz Rybicki <dariusz@elixxir.io>
Date: Fri, 26 Aug 2022 13:03:11 +0100
Subject: [PATCH] Refactor NewOrLoadUd.Params

---
 Sources/XXClient/Functors/NewOrLoadUd.swift               | 8 ++++----
 .../Messenger/Functors/MessengerLogIn.swift               | 2 +-
 .../Messenger/Functors/MessengerRegister.swift            | 2 +-
 .../Messenger/Functors/MessengerLogInTests.swift          | 4 ++--
 .../Messenger/Functors/MessengerRegisterTests.swift       | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Sources/XXClient/Functors/NewOrLoadUd.swift b/Sources/XXClient/Functors/NewOrLoadUd.swift
index cdb7f011..f0a69b02 100644
--- a/Sources/XXClient/Functors/NewOrLoadUd.swift
+++ b/Sources/XXClient/Functors/NewOrLoadUd.swift
@@ -8,14 +8,14 @@ public struct NewOrLoadUd {
       username: String?,
       registrationValidationSignature: Data?,
       cert: Data,
-      contactFile: Data,
+      contact: Data,
       address: String
     ) {
       self.e2eId = e2eId
       self.username = username
       self.registrationValidationSignature = registrationValidationSignature
       self.cert = cert
-      self.contactFile = contactFile
+      self.contact = contact
       self.address = address
     }
 
@@ -23,7 +23,7 @@ public struct NewOrLoadUd {
     public var username: String?
     public var registrationValidationSignature: Data?
     public var cert: Data
-    public var contactFile: Data
+    public var contact: Data
     public var address: String
   }
 
@@ -46,7 +46,7 @@ extension NewOrLoadUd {
       params.username,
       params.registrationValidationSignature,
       params.cert,
-      params.contactFile,
+      params.contact,
       params.address,
       &error
     )
diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerLogIn.swift b/Sources/XXMessengerClient/Messenger/Functors/MessengerLogIn.swift
index 7e6381c5..b82e808a 100644
--- a/Sources/XXMessengerClient/Messenger/Functors/MessengerLogIn.swift
+++ b/Sources/XXMessengerClient/Messenger/Functors/MessengerLogIn.swift
@@ -29,7 +29,7 @@ extension MessengerLogIn {
           username: nil,
           registrationValidationSignature: nil,
           cert: env.udCert ?? e2e.getUdCertFromNdf(),
-          contactFile: env.udContact ?? (try e2e.getUdContactFromNdf()),
+          contact: env.udContact ?? (try e2e.getUdContactFromNdf()),
           address: env.udAddress ?? e2e.getUdAddressFromNdf()
         ),
         follower: .init {
diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerRegister.swift b/Sources/XXMessengerClient/Messenger/Functors/MessengerRegister.swift
index 116b1a18..6baad0eb 100644
--- a/Sources/XXMessengerClient/Messenger/Functors/MessengerRegister.swift
+++ b/Sources/XXMessengerClient/Messenger/Functors/MessengerRegister.swift
@@ -31,7 +31,7 @@ extension MessengerRegister {
           username: username,
           registrationValidationSignature: cMix.getReceptionRegistrationValidationSignature(),
           cert: env.udCert ?? e2e.getUdCertFromNdf(),
-          contactFile: env.udContact ?? (try e2e.getUdContactFromNdf()),
+          contact: env.udContact ?? (try e2e.getUdContactFromNdf()),
           address: env.udAddress ?? e2e.getUdAddressFromNdf()
         ),
         follower: .init {
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerLogInTests.swift b/Tests/XXMessengerClientTests/Messenger/Functors/MessengerLogInTests.swift
index c0c3aaf3..db4e9742 100644
--- a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerLogInTests.swift
+++ b/Tests/XXMessengerClientTests/Messenger/Functors/MessengerLogInTests.swift
@@ -46,7 +46,7 @@ final class MessengerLogInTests: XCTestCase {
       username: nil,
       registrationValidationSignature: nil,
       cert: udCertFromNDF,
-      contactFile: udContactFromNDF,
+      contact: udContactFromNDF,
       address: udAddressFromNDF
     )])
     XCTAssertEqual(didNewOrLoadUDWithFollower.count, 1)
@@ -93,7 +93,7 @@ final class MessengerLogInTests: XCTestCase {
       username: nil,
       registrationValidationSignature: nil,
       cert: altUdCert,
-      contactFile: altUdContact,
+      contact: altUdContact,
       address: altUdAddress
     )])
     XCTAssertEqual(didSetUD.compactMap { $0 }.count, 1)
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerRegisterTests.swift b/Tests/XXMessengerClientTests/Messenger/Functors/MessengerRegisterTests.swift
index ed48dc26..35d078c2 100644
--- a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerRegisterTests.swift
+++ b/Tests/XXMessengerClientTests/Messenger/Functors/MessengerRegisterTests.swift
@@ -51,7 +51,7 @@ final class MessengerRegisterTests: XCTestCase {
       username: username,
       registrationValidationSignature: registrationSignature,
       cert: udCertFromNDF,
-      contactFile: udContactFromNDF,
+      contact: udContactFromNDF,
       address: udAddressFromNDF
     )])
     XCTAssertEqual(didNewOrLoadUDWithFollower.count, 1)
@@ -103,7 +103,7 @@ final class MessengerRegisterTests: XCTestCase {
       username: username,
       registrationValidationSignature: registrationSignature,
       cert: altUdCert,
-      contactFile: altUdContact,
+      contact: altUdContact,
       address: altUdAddress
     )])
     XCTAssertEqual(didSetUD.compactMap { $0 }.count, 1)
-- 
GitLab