minor cleanup

Author: ktoso

InternalPlugins/MultiNodeTest/Plugins/MultiNodeTestPlugin/plugin.swift

@@ -47,8 +47,6 @@ final class MultiNodeTestPlugin: CommandPlugin {
             log("Building multi-node project for debugging...")
         case .release:
             log("Building multi-node project for production...")
-        @unknown default:
-            break
         }
 
         let buildResult = try packageManager.build(
@@ -77,13 +75,12 @@ final class MultiNodeTestPlugin: CommandPlugin {
             process.arguments?.append(arg)
         }
 
-        log("> swift \(process.arguments?.joined(separator: " ") ?? "")")
-
         do {
+            log("> swift \(process.arguments?.joined(separator: " ") ?? "")")
             try process.runProcess()
             process.waitUntilExit()
         } catch {
-            log("[error] Failed to execute multi-node [\(process.binaryPath) \(process.arguments)]! Error: \(error)")
+            log("[error] Failed to execute multi-node [\(process.binaryPath!) \(process.arguments!)]! Error: \(error)")
         }
     }
 

Sources/DistributedActors/Plugins/ClusterSingleton/ClusterSingletonPlugin.swift

@@ -52,7 +52,7 @@ public actor ClusterSingletonPlugin {
         _ type: Act.Type = Act.self,
         name: String,
         settings: ClusterSingletonSettings = .init(),
-        makeInstance factory: ((ClusterSystem) async throws -> Act)? = nil
+        makeInstance factory: (@Sendable (ClusterSystem) async throws -> Act)? = nil
     ) async throws -> Act where Act: ClusterSingleton {
         var settings = settings
         settings.name = name
@@ -63,7 +63,7 @@ public actor ClusterSingletonPlugin {
         _ type: Act.Type,
         settings: ClusterSingletonSettings,
         system: ClusterSystem,
-        makeInstance factory: ((ClusterSystem) async throws -> Act)?
+        makeInstance factory: (@Sendable (ClusterSystem) async throws -> Act)?
     ) async throws -> Act where Act: ClusterSingleton {
         let singletonName = settings.name
         guard !singletonName.isEmpty else {

Sources/DistributedActors/Serialization/Serialization+Invocation.swift

@@ -123,10 +123,6 @@ public struct ClusterInvocationDecoder: DistributedTargetInvocationDecoder {
                 buffer: Serialization.Buffer.data(argumentData)
             )
             let argument = try system.serialization.deserialize(as: Argument.self, from: serialized)
-//            let decoder = JSONDecoder()
-//            decoder.userInfo[.actorSystemKey] = self.system
-//            decoder.userInfo[.actorSerializationContext] = self.system.serialization.context
-//            let argument = try decoder.decode(Argument.self, from: serialized.buffer.readData())
             return argument
 
         case .localProxyCall(let invocation):

Sources/DistributedActors/Serialization/Serialization.swift

@@ -76,10 +76,10 @@ public class Serialization {
         settings.register(InvocationMessage.self, serializerID: .foundationJSON)
 
         // ==== Declare mangled names of some known popular types // TODO: hardcoded mangled name until we have _mangledTypeName
-        settings.register(Bool.self, hint: "b", serializerID: .specializedWithTypeHint)
-        settings.registerSpecializedSerializer(Bool.self, hint: "b", serializerID: .specializedWithTypeHint) { allocator in
-            BoolSerializer(allocator)
-        }
+//        settings.register(Bool.self, hint: "b", serializerID: .specializedWithTypeHint)
+//        settings.registerSpecializedSerializer(Bool.self, hint: "b", serializerID: .specializedWithTypeHint) { allocator in
+//            BoolSerializer(allocator)
+//        }
         // harder since no direct mapping to write... onto a byte buffer
         // settings.register(Float.self, hint: "f", serializerID: .specializedWithTypeHint)
         // settings.register(Float32.self, hint: "f", serializerID: .specializedWithTypeHint)

Sources/DistributedActorsTestKit/ClusterSystemXCTestCase.swift

@@ -45,20 +45,12 @@ open class ClusterSystemXCTestCase: ClusteredActorSystemsXCTestCase {
     }
 
     override open func setUp() async throws {
-        self.actorStatsBefore = try InspectKit.actorStats()
-
         try await super.setUp()
         _ = await self.setUpNode(String(describing: type(of: self)))
     }
 
     override open func tearDown() async throws {
         try await super.tearDown()
-
-        let actorStatsAfter = try InspectKit.actorStats()
-        // TODO: Enable and fix leaks; today we have reference cycles between system actors and the system that don't get broken
-        // if let error = self.actorStatsBefore.detectLeaks(latest: actorStatsAfter) {
-        //     fatalError(error.message)
-        // }
     }
 
     override open func setUpNode(_ name: String, _ modifySettings: ((inout ClusterSystemSettings) -> Void)? = nil) async -> ClusterSystem {

Sources/DistributedActorsTestKit/InspectKit.swift

@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
+import RegexBuilder
 import XCTest
 
 internal struct InspectKit {
@@ -140,13 +141,14 @@ internal struct InspectKit {
         }
     }
 
+    #if swift(>=5.8.0) // FIXME: Regex is missing on Swift 5.7.0 nightly docker builds?
     /// Actor names to their counts
     static func actorStats() throws -> ActorStats {
         let (out, err, _) = Self.runCommand(cmd: "\(self.baseDir)/scripts/dump_actors.sh")
 
         var stats: [String: ActorStats.Row] = [:]
         for line in out {
-            let line = line.trimmingPrefix { $0 == " " }
+            let line = line.drop(while: { $0 == " " })
 
             guard let idAndType = line.firstMatch(of: try Regex(".*?(?= state)"))?.0 else {
                 continue
@@ -170,6 +172,8 @@ internal struct InspectKit {
 
         return ActorStats(stats: stats)
     }
+    #endif
+
 }
 
 extension [Substring: InspectKit.ActorStats] {}

Tests/DistributedActorsTests/RemoteCallTests.swift

@@ -97,7 +97,7 @@ final class RemoteCallTests: ClusteredActorSystemsXCTestCase {
         let remote = await setUpNode("remote") { settings in
             settings.serialization.registerInbound(GreeterCodableError.self)
         }
-        local.cluster.join(node: remote.cluster.uniqueNode)
+        try await self.joinNodes(node: local, with: remote)
 
         let greeter = Greeter(actorSystem: local)
         let remoteGreeterRef = try Greeter.resolve(id: greeter.id, using: remote)
@@ -106,7 +106,8 @@ final class RemoteCallTests: ClusteredActorSystemsXCTestCase {
             try await remoteGreeterRef.mutedThrow(codable: true)
         }
         guard error is GreeterCodableError else {
-            throw TestError("Expected GreeterCodableError, got \(error)")
+            _ = self.testKit(local).fail("Expected GreeterCodableError, got \(error)")
+            return
         }
     }
 
@@ -115,7 +116,7 @@ final class RemoteCallTests: ClusteredActorSystemsXCTestCase {
         let remote = await setUpNode("remote") { settings in
             settings.serialization.registerInbound(GreeterCodableError.self)
         }
-        local.cluster.join(node: remote.cluster.uniqueNode)
+        try await self.joinNodes(node: local, with: remote)
 
         let greeter = Greeter(actorSystem: local)
         let remoteGreeterRef = try Greeter.resolve(id: greeter.id, using: remote)
@@ -132,7 +133,7 @@ final class RemoteCallTests: ClusteredActorSystemsXCTestCase {
     func test_remoteCall_shouldConfigureTimeout() async throws {
         let local = await setUpNode("local")
         let remote = await setUpNode("remote")
-        local.cluster.join(node: remote.cluster.uniqueNode)
+        try await self.joinNodes(node: local, with: remote)
 
         let greeter = Greeter(actorSystem: local)
         let remoteGreeterRef = try Greeter.resolve(id: greeter.id, using: remote)