Update to use mainActorFactory API

cashapp · Jul 20, 2024 · 3508b25 · 3508b25
1 parent 2bd07f8
commit 3508b25
Showing 1 changed file with 26 additions and 36 deletions.
diff --git a/Tests/KnitTests/MainActorTests.swift b/Tests/KnitTests/MainActorTests.swift
@@ -97,64 +97,54 @@ private class TestAssembly: Assembly {
 
         container.register(
             ActorA.self,
-            factory: { resolver in
-                MainActor.assumeIsolated {
-                    return ActorA()
-                }
+            mainActorFactory: { @MainActor resolver in
+                ActorA()
             }
         )
 
         container.register(
             MainClassA.self,
-            factory: { resolver in
-                MainActor.assumeIsolated {
-                    return MainClassA()
-                }
+            mainActorFactory: { @MainActor resolver in
+                MainClassA()
             }
         )
 
         container.register(
             Future<CustomGlobalActorClass, Never>.self,
-            factory: { resolver in
-                MainActor.assumeIsolated {
-                    let mainClassA = resolver.resolve(MainClassA.self)!
-
-                    return Future<CustomGlobalActorClass, Never>() { promise in
-                        let customGlobalActorClass = await CustomGlobalActorClass(
-                            mainClassA: mainClassA
-                        )
-                        promise(.success(customGlobalActorClass))
-                    }
+            mainActorFactory: { @MainActor resolver in
+                let mainClassA = resolver.resolve(MainClassA.self)!
+
+                return Future<CustomGlobalActorClass, Never>() { promise in
+                    let customGlobalActorClass = await CustomGlobalActorClass(
+                        mainClassA: mainClassA
+                    )
+                    promise(.success(customGlobalActorClass))
                 }
             }
         )
 
         container.register(
             Future<AsyncInitClass, Never>.self,
-            factory: { resolver in
-                MainActor.assumeIsolated {
-                    return Future<AsyncInitClass, Never>() { promise in
-                        promise(.success(await AsyncInitClass()))
-                    }
+            mainActorFactory: { @MainActor resolver in
+                return Future<AsyncInitClass, Never>() { promise in
+                    promise(.success(await AsyncInitClass()))
                 }
             }
         )
 
         container.register(
             FinalConsumer.self,
-            factory: { resolver in
-                MainActor.assumeIsolated {
-                    let actorA = resolver.resolve(ActorA.self)!
-                    let mainClassA = resolver.resolve(MainClassA.self)!
-                    let customGlobalActorClass = resolver.resolve(Future<CustomGlobalActorClass, Never>.self)!
-                    let asyncInitClass = resolver.resolve(Future<AsyncInitClass, Never>.self)!
-                    return FinalConsumer(
-                        actorA: actorA,
-                        mainClassA: mainClassA,
-                        customGlobalActorClass: customGlobalActorClass,
-                        asyncInitClass: asyncInitClass
-                    )
-                }
+            mainActorFactory: { @MainActor resolver in
+                let actorA = resolver.resolve(ActorA.self)!
+                let mainClassA = resolver.resolve(MainClassA.self)!
+                let customGlobalActorClass = resolver.resolve(Future<CustomGlobalActorClass, Never>.self)!
+                let asyncInitClass = resolver.resolve(Future<AsyncInitClass, Never>.self)!
+                return FinalConsumer(
+                    actorA: actorA,
+                    mainClassA: mainClassA,
+                    customGlobalActorClass: customGlobalActorClass,
+                    asyncInitClass: asyncInitClass
+                )
             }
         )