Remove an unused CancellationToken from Subscribe() #12

Author: hadashiA

Assets/UniTaskPubSub/Runtime/AsyncMessageBus.cs

@@ -13,9 +13,7 @@ public interface IAsyncPublisher
 
     public interface IAsyncSubscriber
     {
-        IDisposable Subscribe<T>(
-            Func<T, CancellationToken, UniTask> action,
-            CancellationToken cancellation = default);
+        IDisposable Subscribe<T>(Func<T, CancellationToken, UniTask> action);
     }
 
     public static class AsyncPublisherExtensions
@@ -113,7 +111,8 @@ public void Dispose()
                 {
                     if (parent.pipes.TryGetValue(typeof(T), out var entry))
                     {
-                        pipe = (Pipe<T>)entry; }
+                        pipe = (Pipe<T>)entry;
+                    }
                 }
                 pipe?.RemoveSubscriber(subscriber);
             }
@@ -159,9 +158,7 @@ public UniTask PublishAsync<T>(T msg, CancellationToken cancellation = default)
             return pipe.FireAllAsync(msg, cancellation);
         }
 
-        public IDisposable Subscribe<T>(
-            Func<T, CancellationToken, UniTask> action,
-            CancellationToken cancellationToken = default)
+        public IDisposable Subscribe<T>(Func<T, CancellationToken, UniTask> action)
         {
             Pipe<T> pipe;
             lock (pipes)

Assets/UniTaskPubSub/Tests/AsyncMessageBusTest.cs

@@ -55,6 +55,8 @@ public IEnumerator Cancellation() => UniTask.ToCoroutine(async () =>
         {
             var messageBus = new AsyncMessageBus();
             var cts = new CancellationTokenSource();
+
+            var exception = default(Exception);
             var receives = 0;
 
             messageBus.Subscribe<TestMessage>(async (msg, cancellation) =>
@@ -74,8 +76,13 @@ public IEnumerator Cancellation() => UniTask.ToCoroutine(async () =>
             {
                 await messageBus.PublishAsync(new TestMessage(100), cts.Token);
             }
-            catch (OperationCanceledException) {}
+            catch (Exception ex)
+            {
+                exception = ex;
+            }
+
             Assert.That(receives, Is.Zero);
+            Assert.That(exception, Is.InstanceOf<OperationCanceledException>());
         });
 
         [UnityTest]