update test

open-web3-stack · Nov 3, 2024 · ab6497f · ab6497f
1 parent 9698005
commit ab6497f
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 32 deletions.
diff --git a/Networking/Sources/Networking/Connection.swift b/Networking/Sources/Networking/Connection.swift
@@ -124,12 +124,10 @@ public final class Connection<Handler: StreamHandler>: Sendable, ConnectionInfoP
 
     public var needReconnect: Bool {
         state.read {
-            switch $0 {
-            case .reconnect:
-                true
-            default:
-                false
+            if case .reconnect = $0 {
+                return true
             }
+            return false
         }
     }
 

diff --git a/Networking/Sources/Networking/Peer.swift b/Networking/Sources/Networking/Peer.swift
@@ -166,7 +166,6 @@ public final class Peer<Handler: StreamHandler>: Sendable {
         let connections = impl.connections.read { connections in
             connections.byId.values
         }
-
         guard let messageData = try? message.encode() else {
             impl.logger.warning("Failed to encode message: \(message)")
             return
@@ -274,30 +273,27 @@ final class PeerImpl<Handler: StreamHandler>: Sendable {
 
     // TODO: Add reconnection attempts & Apply exponential backoff delay
     func reconnect(to address: NetAddr, role: PeerRole) throws {
-        Task {
-            try await Task.sleep(for: .microseconds(2000))
-            logger.debug("reconnecting", metadata: ["to address": "\(address)", "role": "\(role)"])
-            try connections.write { connections in
-                if connections.byAddr[address] != nil {
-                    logger.warning("reconnecting to \(address) already connected")
-                    return
-                }
-                let quicConn = try QuicConnection(
-                    handler: PeerEventHandler(self),
-                    registration: clientConfiguration.registration,
-                    configuration: clientConfiguration
-                )
-                try quicConn.connect(to: address)
-                let conn = Connection(
-                    quicConn,
-                    impl: self,
-                    role: role,
-                    remoteAddress: address,
-                    initiatedByLocal: true
-                )
-                connections.byAddr[address] = conn
-                connections.byId[conn.id] = conn
+        logger.debug("reconnecting", metadata: ["to address": "\(address)", "role": "\(role)"])
+        try connections.write { connections in
+            if connections.byAddr[address] != nil {
+                logger.warning("reconnecting to \(address) already connected")
+                return
             }
+            let quicConn = try QuicConnection(
+                handler: PeerEventHandler(self),
+                registration: clientConfiguration.registration,
+                configuration: clientConfiguration
+            )
+            try quicConn.connect(to: address)
+            let conn = Connection(
+                quicConn,
+                impl: self,
+                role: role,
+                remoteAddress: address,
+                initiatedByLocal: true
+            )
+            connections.byAddr[address] = conn
+            connections.byId[conn.id] = conn
         }
     }
 

diff --git a/Networking/Tests/NetworkingTests/PeerTests.swift b/Networking/Tests/NetworkingTests/PeerTests.swift
@@ -87,7 +87,7 @@ struct PeerTests {
     struct MockEphemeralStreamHandler: EphemeralStreamHandler {
         typealias StreamKind = EphemeralStreamKind
         typealias Request = MockRequest<EphemeralStreamKind>
-        private let dataStorage = DataStorage()
+        private let dataStorage: PeerTests.DataStorage = DataStorage()
 
         var lastReceivedData: Data? {
             get async { await dataStorage.data.last }
@@ -302,13 +302,13 @@ struct PeerTests {
         peer1.broadcast(
             kind: .uniqueC, message: .init(kind: .uniqueC, data: messageData)
         )
-        try? await Task.sleep(for: .milliseconds(5000))
+        try? await Task.sleep(for: .milliseconds(1000))
         let lastReceivedData = await handler2.lastReceivedData
         #expect(lastReceivedData == messageData)
     }
 
     @Test
-    func ConnectionNoNeedToReconnect() async throws {
+    func connectionNoNeedToReconnect() async throws {
         let handler2 = MockPresentStreamHandler()
         let messageData = Data("Post-recovery message".utf8)