Fixed issue with CurrentValueRelay and PassthroughRelay subscription

Author: reiley.kim

Sources/Relays/CurrentValueRelay.swift

@@ -42,14 +42,6 @@ public class CurrentValueRelay<Output>: Relay {
         subscriber.receive(subscription: subscription)
     }
 
-    public func subscribe<P: Publisher>(_ publisher: P) -> AnyCancellable where Output == P.Output, P.Failure == Never {
-        publisher.subscribe(storage)
-    }
-
-    public func subscribe<P: Relay>(_ publisher: P) -> AnyCancellable where Output == P.Output {
-        publisher.subscribe(storage)
-    }
-
     deinit {
         // Send a finished event upon dealloation
         subscriptions.forEach { $0.forceFinish() }

Sources/Relays/PassthroughRelay.swift

@@ -41,14 +41,6 @@ public class PassthroughRelay<Output>: Relay {
         subscriber.receive(subscription: subscription)
     }
 
-    public func subscribe<P: Publisher>(_ publisher: P) -> AnyCancellable where Output == P.Output, P.Failure == Never {
-        publisher.subscribe(storage)
-    }
-
-    public func subscribe<P: Relay>(_ publisher: P) -> AnyCancellable where Output == P.Output {
-        publisher.subscribe(storage)
-    }
-
     deinit {
         // Send a finished event upon dealloation
         subscriptions.forEach { $0.forceFinish() }

Sources/Relays/Relay.swift

@@ -19,13 +19,6 @@ public protocol Relay: Publisher where Failure == Never {
     ///
     /// - Parameter value: The value to send.
     func accept(_ value: Output)
-
-    /// Attaches the specified publisher to this relay.
-    ///
-    /// - parameter publisher: An infallible publisher with the relay's Output type
-    ///
-    /// - returns: `AnyCancellable`
-    func subscribe<P: Publisher>(_ publisher: P) -> AnyCancellable where P.Failure == Failure, P.Output == Output
 }
 
 @available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
@@ -36,7 +29,10 @@ public extension Publisher where Failure == Never {
     ///
     /// - returns: `AnyCancellable`
     func subscribe<R: Relay>(_ relay: R) -> AnyCancellable where R.Output == Output {
-        relay.subscribe(self)
+        sink(receiveValue: { output in
+            relay.accept(output)
+        })
+
     }
 }
 

Tests/CurrentValueRelayTests.swift

@@ -75,6 +75,11 @@ class CurrentValueRelayTests: XCTestCase {
 
         XCTAssertFalse(completed)
         XCTAssertEqual(values, ["initial", "1", "2", "3"])
+
+        relay!.accept("4")
+
+        XCTAssertFalse(completed)
+        XCTAssertEqual(values, ["initial", "1", "2", "3", "4"])
     }
 
     func testSubscribeRelay_CurrentValues() {

Tests/PassthroughRelayTests.swift

@@ -90,6 +90,11 @@ class PassthroughRelayTests: XCTestCase {
 
         XCTAssertFalse(completed)
         XCTAssertEqual(values, ["1", "2", "3"])
+
+        relay!.accept("4")
+
+        XCTAssertFalse(completed)
+        XCTAssertEqual(values, ["1", "2", "3", "4"])
     }
 
     func testSubscribeRelay_Passthroughs() {
@@ -133,7 +138,7 @@ class PassthroughRelayTests: XCTestCase {
         input.accept("3")
 
         XCTAssertFalse(completed)
-        XCTAssertEqual(values, ["initial", "1", "2", "3"])
+        XCTAssertEqual(values, ["1", "2", "3"])
     }
 }
 #endif