#20 Fix the bug in 'channel.filter(...)'.

Author: yruslan

src/main/scala/com/github/yruslan/channel/ChannelDecoratorFilter.scala

@@ -53,21 +53,18 @@ class ChannelDecoratorFilter[T](inputChannel: ReadChannel[T], pred: T => Boolean
 
     val timeoutMilli = if (timeout.isFinite) timeout.toMillis else 0L
     val startInstant = Instant.now()
-    var valueOpt = inputChannel.tryRecv(timeout)
-    var found = valueOpt.isEmpty || valueOpt.forall(v => pred(v))
-    var elapsedTime = java.time.Duration.between(startInstant, now).toMillis
+    var elapsedTime = 0L
 
-    if (found || elapsedTime >= timeoutMilli) {
-      valueOpt
-    } else {
-      while (!found && elapsedTime < timeoutMilli) {
-        val newTimeout = Duration(timeoutMilli - elapsedTime, MILLISECONDS)
-        valueOpt = inputChannel.tryRecv(newTimeout)
-        found = valueOpt.isEmpty || valueOpt.forall(v => pred(v))
-        elapsedTime = java.time.Duration.between(startInstant, now).toMillis
+    while (elapsedTime < timeoutMilli) {
+      val newTimeout = Duration(timeoutMilli - elapsedTime, MILLISECONDS)
+      val valueOpt = inputChannel.tryRecv(newTimeout)
+      val found = valueOpt.isEmpty || valueOpt.forall(v => pred(v))
+      elapsedTime = java.time.Duration.between(startInstant, now).toMillis
+      if (found) {
+        return valueOpt
       }
-      valueOpt
     }
+    None
   }
 
   override def recver(action: T => Unit): Selector = inputChannel.recver(t => if (pred(t)) action(t))

src/test/scala/com/github/yruslan/channel/ChannelFilterSuite.scala

@@ -95,7 +95,7 @@ class ChannelFilterSuite extends AnyWordSpec {
     }
 
     "filter input channel on tryRecv(duration)" when {
-      val timeout = Duration(2, MILLISECONDS)
+      val timeout = Duration(200, MILLISECONDS)
       "values either available or not" in {
         val ch1 = Channel.make[Int](3)