From 81c28379194c8db1e8a110537edfe9fcadcc0140 Mon Sep 17 00:00:00 2001
From: Dariusz Rybicki <dariusz@elixxir.io>
Date: Fri, 9 Sep 2022 14:07:31 +0200
Subject: [PATCH] Wait for network and nodes before verifying

---
 .../AuthCallbackHandler/AuthCallbackHandlerRequest.swift    | 2 ++
 .../AuthCallbackHandlerRequestTests.swift                   | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/Examples/xx-messenger/Sources/AppCore/AuthCallbackHandler/AuthCallbackHandlerRequest.swift b/Examples/xx-messenger/Sources/AppCore/AuthCallbackHandler/AuthCallbackHandlerRequest.swift
index e8f14806..d8ac3d18 100644
--- a/Examples/xx-messenger/Sources/AppCore/AuthCallbackHandler/AuthCallbackHandlerRequest.swift
+++ b/Examples/xx-messenger/Sources/AppCore/AuthCallbackHandler/AuthCallbackHandlerRequest.swift
@@ -33,6 +33,8 @@ extension AuthCallbackHandlerRequest {
       dbContact = try db().saveContact(dbContact)
 
       do {
+        try messenger.waitForNetwork()
+        try messenger.waitForNodes()
         let verified = try messenger.verifyContact(xxContact)
         dbContact.authStatus = verified ? .verified : .verificationFailed
         dbContact = try db().saveContact(dbContact)
diff --git a/Examples/xx-messenger/Tests/AppCoreTests/AuthCallbackHandler/AuthCallbackHandlerRequestTests.swift b/Examples/xx-messenger/Tests/AppCoreTests/AuthCallbackHandler/AuthCallbackHandlerRequestTests.swift
index 07359d1f..65786884 100644
--- a/Examples/xx-messenger/Tests/AppCoreTests/AuthCallbackHandler/AuthCallbackHandlerRequestTests.swift
+++ b/Examples/xx-messenger/Tests/AppCoreTests/AuthCallbackHandler/AuthCallbackHandlerRequestTests.swift
@@ -14,6 +14,8 @@ final class AuthCallbackHandlerRequestTests: XCTestCase {
     var didSaveContact: [XXModels.Contact] = []
 
     var messenger: Messenger = .unimplemented
+    messenger.waitForNetwork.run = { _ in }
+    messenger.waitForNodes.run = { _, _, _, _ in }
     messenger.verifyContact.run = { contact in
       didVerifyContact.append(contact)
       return true
@@ -91,6 +93,8 @@ final class AuthCallbackHandlerRequestTests: XCTestCase {
     var didSaveContact: [XXModels.Contact] = []
 
     var messenger: Messenger = .unimplemented
+    messenger.waitForNetwork.run = { _ in }
+    messenger.waitForNodes.run = { _, _, _, _ in }
     messenger.verifyContact.run = { _ in false }
 
     let request = AuthCallbackHandlerRequest.live(
@@ -135,6 +139,8 @@ final class AuthCallbackHandlerRequestTests: XCTestCase {
     var didSaveContact: [XXModels.Contact] = []
 
     var messenger: Messenger = .unimplemented
+    messenger.waitForNetwork.run = { _ in }
+    messenger.waitForNodes.run = { _, _, _, _ in }
     messenger.verifyContact.run = { _ in throw failure }
 
     let request = AuthCallbackHandlerRequest.live(
-- 
GitLab