diff --git a/Sources/XXClient/Functors/NewOrLoadUd.swift b/Sources/XXClient/Functors/NewOrLoadUd.swift index cdb7f011b17e67a90dcb56d1c02f53f46fc5c354..f0a69b0271c1253044db9cddbe8480b35ca6e3dd 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 7e6381c5d3f97121da31031112706626184fbdcb..b82e808a3fc8e9bb3daf97bd07df9fbc5093efe8 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 116b1a1837b2fff29249f8ba51c3e4ef0aaae32a..6baad0eb3875b59035e007d92394c9db9e6e589e 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 c0c3aaf3558ed14fa878b12bd80996ca3598a482..db4e9742a0c6d5160c144243443d68c2babce8bc 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 ed48dc263326d52b26dd866f134fdbdae7bc2671..35d078c2a38314245dbd1ede4517d82022ef1507 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)