Skip to content
Snippets Groups Projects
Commit 4689bc1b authored by Dariusz Rybicki's avatar Dariusz Rybicki
Browse files

Don't start network follower on logIn/register

parent 11d7fe88
No related branches found
No related tags found
2 merge requests!102Release 1.0.0,!33XXMessengerClient
...@@ -23,9 +23,6 @@ extension MessengerLogIn { ...@@ -23,9 +23,6 @@ extension MessengerLogIn {
guard let e2e = env.ctx.getE2E() else { guard let e2e = env.ctx.getE2E() else {
throw Error.notConnected throw Error.notConnected
} }
if cMix.networkFollowerStatus() != .running {
try cMix.startNetworkFollower(timeoutMS: 30_000)
}
env.ctx.setUD(try env.newOrLoadUd( env.ctx.setUD(try env.newOrLoadUd(
params: .init( params: .init(
e2eId: e2e.getId(), e2eId: e2e.getId(),
......
...@@ -25,9 +25,6 @@ extension MessengerRegister { ...@@ -25,9 +25,6 @@ extension MessengerRegister {
guard let e2e = env.ctx.getE2E() else { guard let e2e = env.ctx.getE2E() else {
throw Error.notConnected throw Error.notConnected
} }
if cMix.networkFollowerStatus() != .running {
try cMix.startNetworkFollower(timeoutMS: 30_000)
}
env.ctx.setUD(try env.newOrLoadUd( env.ctx.setUD(try env.newOrLoadUd(
params: .init( params: .init(
e2eId: e2e.getId(), e2eId: e2e.getId(),
......
...@@ -5,7 +5,6 @@ import XXClient ...@@ -5,7 +5,6 @@ import XXClient
final class MessengerLogInTests: XCTestCase { final class MessengerLogInTests: XCTestCase {
func testLogin() throws { func testLogin() throws {
var didStartNetworkFollower: [Int] = []
var didNewOrLoadUDWithParams: [NewOrLoadUd.Params] = [] var didNewOrLoadUDWithParams: [NewOrLoadUd.Params] = []
var didNewOrLoadUDWithFollower: [UdNetworkStatus] = [] var didNewOrLoadUDWithFollower: [UdNetworkStatus] = []
var didSetUD: [UserDiscovery?] = [] var didSetUD: [UserDiscovery?] = []
...@@ -20,9 +19,6 @@ final class MessengerLogInTests: XCTestCase { ...@@ -20,9 +19,6 @@ final class MessengerLogInTests: XCTestCase {
env.ctx.getCMix = { env.ctx.getCMix = {
var cMix: CMix = .unimplemented var cMix: CMix = .unimplemented
cMix.networkFollowerStatus.run = { networkFollowerStatus } cMix.networkFollowerStatus.run = { networkFollowerStatus }
cMix.startNetworkFollower.run = { timeout in
didStartNetworkFollower.append(timeout)
}
return cMix return cMix
} }
env.ctx.getE2E = { env.ctx.getE2E = {
...@@ -45,7 +41,6 @@ final class MessengerLogInTests: XCTestCase { ...@@ -45,7 +41,6 @@ final class MessengerLogInTests: XCTestCase {
let logIn: MessengerLogIn = .live(env) let logIn: MessengerLogIn = .live(env)
try logIn() try logIn()
XCTAssertEqual(didStartNetworkFollower, [30_000])
XCTAssertNoDifference(didNewOrLoadUDWithParams, [.init( XCTAssertNoDifference(didNewOrLoadUDWithParams, [.init(
e2eId: e2eId, e2eId: e2eId,
username: nil, username: nil,
...@@ -131,25 +126,6 @@ final class MessengerLogInTests: XCTestCase { ...@@ -131,25 +126,6 @@ final class MessengerLogInTests: XCTestCase {
} }
} }
func testStartNetworkFollowerFailure() {
struct Error: Swift.Error, Equatable {}
let error = Error()
var env: MessengerEnvironment = .unimplemented
env.ctx.getCMix = {
var cMix: CMix = .unimplemented
cMix.networkFollowerStatus.run = { .stopped }
cMix.startNetworkFollower.run = { _ in throw error }
return cMix
}
env.ctx.getE2E = { .unimplemented }
let logIn: MessengerLogIn = .live(env)
XCTAssertThrowsError(try logIn()) { err in
XCTAssertEqual(err as? Error, error)
}
}
func testGetUdContactFromNdfFailure() { func testGetUdContactFromNdfFailure() {
struct Error: Swift.Error, Equatable {} struct Error: Swift.Error, Equatable {}
let error = Error() let error = Error()
......
...@@ -5,7 +5,6 @@ import XXClient ...@@ -5,7 +5,6 @@ import XXClient
final class MessengerRegisterTests: XCTestCase { final class MessengerRegisterTests: XCTestCase {
func testRegister() throws { func testRegister() throws {
var didStartNetworkFollower: [Int] = []
var didNewOrLoadUDWithParams: [NewOrLoadUd.Params] = [] var didNewOrLoadUDWithParams: [NewOrLoadUd.Params] = []
var didNewOrLoadUDWithFollower: [UdNetworkStatus] = [] var didNewOrLoadUDWithFollower: [UdNetworkStatus] = []
var didSetUD: [UserDiscovery?] = [] var didSetUD: [UserDiscovery?] = []
...@@ -22,9 +21,6 @@ final class MessengerRegisterTests: XCTestCase { ...@@ -22,9 +21,6 @@ final class MessengerRegisterTests: XCTestCase {
env.ctx.getCMix = { env.ctx.getCMix = {
var cMix: CMix = .unimplemented var cMix: CMix = .unimplemented
cMix.networkFollowerStatus.run = { networkFollowerStatus } cMix.networkFollowerStatus.run = { networkFollowerStatus }
cMix.startNetworkFollower.run = { timeout in
didStartNetworkFollower.append(timeout)
}
cMix.getReceptionRegistrationValidationSignature.run = { cMix.getReceptionRegistrationValidationSignature.run = {
registrationSignature registrationSignature
} }
...@@ -50,7 +46,6 @@ final class MessengerRegisterTests: XCTestCase { ...@@ -50,7 +46,6 @@ final class MessengerRegisterTests: XCTestCase {
let register: MessengerRegister = .live(env) let register: MessengerRegister = .live(env)
try register(username: username) try register(username: username)
XCTAssertEqual(didStartNetworkFollower, [30_000])
XCTAssertNoDifference(didNewOrLoadUDWithParams, [.init( XCTAssertNoDifference(didNewOrLoadUDWithParams, [.init(
e2eId: e2eId, e2eId: e2eId,
username: username, username: username,
...@@ -141,25 +136,6 @@ final class MessengerRegisterTests: XCTestCase { ...@@ -141,25 +136,6 @@ final class MessengerRegisterTests: XCTestCase {
} }
} }
func testStartNetworkFollowerFailure() {
struct Error: Swift.Error, Equatable {}
let error = Error()
var env: MessengerEnvironment = .unimplemented
env.ctx.getCMix = {
var cMix: CMix = .unimplemented
cMix.networkFollowerStatus.run = { .stopped }
cMix.startNetworkFollower.run = { _ in throw error }
return cMix
}
env.ctx.getE2E = { .unimplemented }
let register: MessengerRegister = .live(env)
XCTAssertThrowsError(try register(username: "new-user-name")) { err in
XCTAssertEqual(err as? Error, error)
}
}
func testGetUdContactFromNdfFailure() { func testGetUdContactFromNdfFailure() {
struct Error: Swift.Error, Equatable {} struct Error: Swift.Error, Equatable {}
let error = Error() let error = Error()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment