Fix rebase problems

Author: yim-lee

Sources/DistributedActors/Cluster/ClusterShell.swift

@@ -280,7 +280,7 @@ internal class ClusterShell {
     }
 
     /// Actually starts the shell which kicks off binding to a port, and all further cluster work
-    internal func start(system: ClusterSystem, clusterEvents: ClusterEventStream) throws -> _ActorRef<Message> {
+    internal func start(system: ClusterSystem, clusterEvents: ClusterEventStream) async throws -> _ActorRef<Message> {
         let instrumentation = system.settings.instrumentation.makeInternalActorTransportInstrumentation()
         self._serializationPool = try _SerializationPool(settings: .default, serialization: system.serialization, instrumentation: instrumentation)
         self.clusterEvents = clusterEvents

Sources/DistributedActors/Cluster/SWIM/SWIMActorShell.swift

@@ -31,8 +31,6 @@ internal distributed actor SWIMActorShell: CustomStringConvertible {
 
     private lazy var swim = SWIM.Instance(settings: self.customizeSWIMSettings(self._settings), myself: self)
 
-    private lazy var timers = ActorTimers<SWIMActorShell>(self)
-
     private lazy var log: Logger = {
         var log = Logger(actor: self)
         log.logLevel = self._settings.logger.logLevel
@@ -102,8 +100,9 @@ internal distributed actor SWIMActorShell: CustomStringConvertible {
                 }
 
             case .scheduleNextTick(let delay):
-                // Keep scheduling the timer (cancelAfter = false) so that it fires for each tick
-                self.timers.startSingle(key: SWIMActorShell.protocolPeriodTimerKey, delay: .nanoseconds(delay.nanoseconds), cancelAfter: false) {
+                // Keep scheduling the timer so that it fires for each tick
+                Task {
+                    try await Task.sleep(until: .now + .nanoseconds(delay.nanoseconds), clock: .continuous)
                     self.handlePeriodicProtocolPeriodTick()
                 }
             }
@@ -549,8 +548,6 @@ extension SWIMActorShell {
         ps._wellKnown = true
         return ps.metrics(group: "swim.shell", measure: [.serialization, .deserialization])
     }
-
-    static let protocolPeriodTimerKey = _TimerKey("\(SWIMActorShell.name)/periodic-ping")
 }
 
 extension ActorID {

Tests/DistributedActorsTests/Cluster/SWIM/SWIMActorShellClusteredTests.swift

@@ -136,7 +136,7 @@ final class SWIMShellClusteredTests: ClusteredActorSystemsXCTestCase {
 
         // FIXME: use a non-responsive test probe instead of real system
         // Down the node so it doesn't respond to ping
-        thirdNode.shutdown()
+        try thirdNode.shutdown()
         try await self.ensureNodes(.removed, on: secondNode, nodes: thirdNode.cluster.uniqueNode)
 
         let originPeer = try SWIMActorShell.resolve(id: first.id._asRemote, using: secondNode)
@@ -456,7 +456,7 @@ final class SWIMShellClusteredTests: ClusteredActorSystemsXCTestCase {
     private func awaitStatus(
         _ status: SWIM.Status, for peer: SWIMActorShell,
         on swimShell: SWIMActorShell, within timeout: Duration,
-        file: StaticString = #file, line: UInt = #line, column: UInt = #column
+        file: StaticString = #filePath, line: UInt = #line, column: UInt = #column
     ) async throws {
         let testKit = self.testKit(swimShell.actorSystem)