From e11375fdebf6fc36af190577336b1622fb96e824 Mon Sep 17 00:00:00 2001
From: Morgan Pretty <morgan.t.pretty@gmail.com>
Date: Fri, 14 Mar 2025 09:30:29 +1100
Subject: [PATCH] Fixed the broken unit tests

---
 SessionMessagingKit/Open Groups/OpenGroupAPI.swift          | 4 ++--
 SessionMessagingKitTests/Open Groups/OpenGroupAPISpec.swift | 1 +
 SessionSnodeKit/Types/PreparedRequest.swift                 | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/SessionMessagingKit/Open Groups/OpenGroupAPI.swift b/SessionMessagingKit/Open Groups/OpenGroupAPI.swift
index 7afb36218..e274a5941 100644
--- a/SessionMessagingKit/Open Groups/OpenGroupAPI.swift	
+++ b/SessionMessagingKit/Open Groups/OpenGroupAPI.swift	
@@ -321,7 +321,7 @@ public enum OpenGroupAPI {
                 using: dependencies
             )
             .signed(db, with: OpenGroupAPI.signRequest, using: dependencies)
-            .map { (info: ResponseInfoType, response: Network.BatchResponseMap<Endpoint>) -> CapabilitiesAndRoomResponse in
+            .tryMap { (info: ResponseInfoType, response: Network.BatchResponseMap<Endpoint>) -> CapabilitiesAndRoomResponse in
                 let maybeCapabilities: Network.BatchSubResponse<Capabilities>? = (response[.capabilities] as? Network.BatchSubResponse<Capabilities>)
                 let maybeRoomResponse: Any? = response.data
                     .first(where: { key, _ in
@@ -372,7 +372,7 @@ public enum OpenGroupAPI {
                 using: dependencies
             )
             .signed(db, with: OpenGroupAPI.signRequest, using: dependencies)
-            .map { (info: ResponseInfoType, response: Network.BatchResponseMap<Endpoint>) -> CapabilitiesAndRoomsResponse in
+            .tryMap { (info: ResponseInfoType, response: Network.BatchResponseMap<Endpoint>) -> CapabilitiesAndRoomsResponse in
                 let maybeCapabilities: Network.BatchSubResponse<Capabilities>? = (response[.capabilities] as? Network.BatchSubResponse<Capabilities>)
                 let maybeRooms: Network.BatchSubResponse<[Room]>? = response.data
                     .first(where: { key, _ in
diff --git a/SessionMessagingKitTests/Open Groups/OpenGroupAPISpec.swift b/SessionMessagingKitTests/Open Groups/OpenGroupAPISpec.swift
index 595dbcde2..87f362c45 100644
--- a/SessionMessagingKitTests/Open Groups/OpenGroupAPISpec.swift	
+++ b/SessionMessagingKitTests/Open Groups/OpenGroupAPISpec.swift	
@@ -17,6 +17,7 @@ class OpenGroupAPISpec: QuickSpec {
         
         @TestState var dependencies: TestDependencies! = TestDependencies { dependencies in
             dependencies.dateNow = Date(timeIntervalSince1970: 1234567890)
+            dependencies.forceSynchronous = true
         }
         @TestState(singleton: .storage, in: dependencies) var mockStorage: Storage! = SynchronousStorage(
             customWriter: try! DatabaseQueue(),
diff --git a/SessionSnodeKit/Types/PreparedRequest.swift b/SessionSnodeKit/Types/PreparedRequest.swift
index c6cf77171..224e8340f 100644
--- a/SessionSnodeKit/Types/PreparedRequest.swift
+++ b/SessionSnodeKit/Types/PreparedRequest.swift
@@ -488,7 +488,7 @@ public extension Network.PreparedRequest {
     /// Due to the way prepared requests work we need to cast between different types and as a result can't avoid potentially
     /// throwing when mapping so the `map` function just calls through to the `tryMap` function, but we have both to make
     /// the interface more consistent for dev use
-    func map<O>(transform: @escaping (ResponseInfoType, R) throws -> O) -> Network.PreparedRequest<O> {
+    func map<O>(transform: @escaping (ResponseInfoType, R) -> O) -> Network.PreparedRequest<O> {
         return tryMap(transform: transform)
     }