validate against "main" swift cluster membership after async changes

Author: ktoso

Package.swift

@@ -142,7 +142,7 @@ var dependencies: [Package.Dependency] = [
 
     // .package(url: "https://github.com/apple/swift-cluster-membership", from: "0.3.0"),
 //    .package(name: "swift-cluster-membership", path: "Packages/swift-cluster-membership"), // FIXME: just work in progress
-    .package(url: "https://github.com/yim-lee/swift-cluster-membership", branch: "async-await"),
+    .package(url: "https://github.com/apple/swift-cluster-membership", branch: "main"),
 
     .package(url: "https://github.com/apple/swift-nio", from: "2.40.0"),
     .package(url: "https://github.com/apple/swift-nio-extras", from: "1.2.0"),

Sources/DistributedActors/ActorLogging.swift

@@ -20,7 +20,7 @@ import Logging
 /// - Warning: NOT thread safe! Only use from Actors, properly synchronize access, or create multiple instances for each execution context.
 internal final class LoggingContext {
     // TODO: deprecate, we should not need this explicit type
-    
+
     let identifier: String
 
     // TODO: want to eventually not have this; also move to more structured logging perhaps...

Sources/DistributedActors/Cluster/SWIM/SWIMActorShell.swift

@@ -25,7 +25,7 @@ import SWIM
 internal distributed actor SWIMActorShell: SWIMPeer, SWIMAddressablePeer, CustomStringConvertible {
     typealias ActorSystem = ClusterSystem
     typealias SWIMInstance = SWIM.Instance<SWIMActorShell, SWIMActorShell, SWIMActorShell>
-    
+
     private let settings: SWIM.Settings
     private let clusterRef: ClusterShell.Ref
 
@@ -38,9 +38,10 @@ internal distributed actor SWIMActorShell: SWIMPeer, SWIMAddressablePeer, Custom
             protocol: self.id.uniqueNode.node.protocol,
             host: self.id.uniqueNode.host,
             port: self.id.uniqueNode.port,
-            uid: self.id.uniqueNode.nid.value)
+            uid: self.id.uniqueNode.nid.value
+        )
     }
-    
+
     private lazy var log: Logger = {
         var log = Logger(actor: self)
         log.logLevel = self.settings.logger.logLevel
@@ -445,7 +446,7 @@ internal distributed actor SWIMActorShell: SWIMPeer, SWIMAddressablePeer, Custom
 
         throw SWIMActorError.noResponse
     }
-    
+
     nonisolated func pingRequest(
         target: SWIMActorShell,
         payload: SWIM.GossipPayload<SWIMActorShell>,
@@ -463,7 +464,6 @@ internal distributed actor SWIMActorShell: SWIMPeer, SWIMAddressablePeer, Custom
         }
     }
 
-
     distributed func pingRequest(
         target: SWIMActorShell,
         pingRequestOrigin: SWIMActorShell,

Sources/DistributedActorsTestKit/Cluster/ClusteredActorSystemsXCTestCase.swift

@@ -99,15 +99,15 @@ open class ClusteredActorSystemsXCTestCase: XCTestCase {
         return (first, second)
     }
 
-    override open func tearDown() {
+    override open func tearDown() async throws {
         let testsFailed = self.testRun?.totalFailureCount ?? 0 > 0
         if self.captureLogs, self.alwaysPrintCaptureLogs || testsFailed {
             self.printAllCapturedLogs()
         }
 
-        self._nodes.forEach { node in
+        for node in self._nodes {
             node.log.warning("======================== TEST TEAR DOWN: SHUTDOWN ========================")
-            try! node.shutdown().wait()
+            try! await node.shutdown().wait()
         }
 
         self._nodes = []

Sources/DistributedActorsTestKit/ClusterSystemXCTestCase.swift

@@ -46,8 +46,8 @@ open class ClusterSystemXCTestCase: ClusteredActorSystemsXCTestCase {
         _ = await self.setUpNode(String(describing: type(of: self)))
     }
 
-    override open func tearDown() {
-        super.tearDown()
+    override open func tearDown() async throws {
+        try await super.tearDown()
     }
 
     override open func setUpNode(_ name: String, _ modifySettings: ((inout ClusterSystemSettings) -> Void)? = nil) async -> ClusterSystem {

Tests/DistributedActorsTests/Cluster/Protobuf/Membership+SerializationTests.swift

@@ -26,8 +26,8 @@ final class MembershipSerializationTests: ClusterSystemXCTestCase {
         allocator: system.settings.serialization.allocator
     )
 
-    override func tearDown() {
-        super.tearDown()
+    override func tearDown() async throws {
+        try await super.tearDown()
         self.context = nil
     }
 

Tests/DistributedActorsTests/Cluster/SWIM/SWIMActorShellClusteredTests.swift

@@ -31,8 +31,8 @@ final class SWIMShellClusteredTests: ClusteredActorSystemsXCTestCase {
         super.setUp()
     }
 
-    override func tearDown() {
-        super.tearDown()
+    override func tearDown() async throws {
+        try await super.tearDown()
         self.metrics = nil
         MetricsSystem.bootstrapInternal(NOOPMetricsHandler.instance)
     }
@@ -109,7 +109,7 @@ final class SWIMShellClusteredTests: ClusteredActorSystemsXCTestCase {
             throw testKit(firstNode).fail("Expected ack, but got \(response)")
         }
 
-        (pinged as! SWIMActorShell).shouldEqual(first)
+        pinged.shouldEqual(first)
         incarnation.shouldEqual(0)
     }
 
@@ -218,7 +218,7 @@ final class SWIMShellClusteredTests: ClusteredActorSystemsXCTestCase {
             throw testKit(firstNode).fail("Expected ack, but got \(response)")
         }
 
-        (pinged as! SWIMActorShell).shouldEqual(third)
+        pinged.shouldEqual(third)
         incarnation.shouldEqual(0)
     }
 
@@ -392,8 +392,8 @@ final class SWIMShellClusteredTests: ClusteredActorSystemsXCTestCase {
         }
 
         members.count.shouldEqual(2)
-        members.shouldContain(where: { ($0.peer as! SWIMActorShell) == secondPeer && $0.status == .alive(incarnation: 0) })
-        members.shouldContain(where: { ($0.peer as! SWIMActorShell) == first && $0.status == .alive(incarnation: 0) })
+        members.shouldContain(where: { $0.peer == secondPeer && $0.status == .alive(incarnation: 0) })
+        members.shouldContain(where: { $0.peer == first && $0.status == .alive(incarnation: 0) })
     }
 
     func test_SWIMShell_shouldMonitorJoinedClusterMembers() async throws {
@@ -466,7 +466,7 @@ final class SWIMShellClusteredTests: ClusteredActorSystemsXCTestCase {
             } ?? []
 
             let otherStatus = membership
-                .first(where: { $0.peer as! SWIMActorShell == peer })
+                .first(where: { $0.peer == peer })
                 .map(\.status)
 
             guard otherStatus == status else {

Tests/DistributedActorsTests/Metrics/ActorMetricsTests.swift

@@ -29,8 +29,8 @@ final class ActorMetricsTests: ClusteredActorSystemsXCTestCase {
         MetricsSystem.bootstrapInternal(self.metrics)
     }
 
-    override func tearDown() {
-        super.tearDown()
+    override func tearDown() async throws {
+        try await super.tearDown()
         self.metrics = nil
         MetricsSystem.bootstrapInternal(NOOPMetricsHandler.instance)
     }

Tests/DistributedActorsTests/Metrics/SWIMActorPeerMetricsTests.swift

@@ -29,8 +29,8 @@ final class ActorMetricsSWIMActorPeerMetricsTests: ClusteredActorSystemsXCTestCa
         super.setUp()
     }
 
-    override func tearDown() {
-        super.tearDown()
+    override func tearDown() async throws {
+        try await super.tearDown()
         self.metrics = nil
         MetricsSystem.bootstrapInternal(NOOPMetricsHandler.instance)
     }

Tests/DistributedActorsTests/SerializationPoolTests.swift

@@ -106,8 +106,8 @@ final class SerializationPoolTests: XCTestCase {
         self.actorPath2 = try! ActorPath([ActorPathSegment("foo"), ActorPathSegment("baz")])
     }
 
-    override func tearDown() {
-        try! self.system.shutdown().wait()
+    override func tearDown() async throws {
+        try! await self.system.shutdown().wait()
         self.system = nil
         self.testKit = nil
         try! self.elg.syncShutdownGracefully()