mq-impl/stream: Eliminate 'return' argument of 'handle-input!'.

* gnu/gnunet/mq-impl/stream.scm
  (handle-input!): Remove 'return' argument.  Return errors from
  'add-from-port!' instead of injecting them.
  (prepare-port-message-queue)[start-reader!]: Remove #:return argument.
* tests/mq-stream.scm
  (handle-input*): New procedure.
  ("messages + eof are injected in-order")
  ("overly small message is detected (--> stop)")
  ("premature eof is detected (--> stop)"): Use new procedure.

1 files changed, 10 insertions, 4 deletions

diff --git a/tests/mq-stream.scm b/tests/mq-stream.scm
index 6b1850a..360e41a 100644
--- a/tests/mq-stream.scm
+++ b/tests/mq-stream.scm
@@ -76,6 +76,12 @@
 ;; writing to a broken pipe.
 (sigaction SIGPIPE SIG_IGN)
 
+(define (handle-input*! mq input)
+  (call-with-values (lambda () (handle-input! mq input))
+    (lambda e
+      (apply inject-error! mq e)
+      (values))))
+
 (test-assert "messages + eof are injected in-order"
   (let^ ((! input/bv #vu8(0 4 0 1 ; Message type 1, size 4
                             0 5 0 2 1 ; Message type 2, size 6
@@ -99,9 +105,9 @@
             (assert (equal? arguments '(input:regular-end-of-file)))
             (set! received 'end-of-file))
          (! mq (make-message-queue handlers error-handler no-sender))
-         (<-- () (handle-input! mq input)))
+         (<-- () (handle-input*! mq input)))
         ;; TODO: should the port be closed?
-        (assert (equal? received 'end-of-file))))
+        (assert (equal? received 'end-of-file)))
 
 (test-assert "overly small message is detected (--> stop)"
   (let^ ((! input/bv #vu8(0 4 0 0 ; Message type 0, size 4
@@ -128,7 +134,7 @@
             (assert (equal? arguments `(input:overly-small ,(* 256 9) 3)))
             (set! received 'overly-small))
          (! mq (make-message-queue handlers error-handler no-sender))
-         (<-- () (handle-input! mq input)))
+         (<-- () (handle-input*! mq input)))
         (assert (equal? received 'overly-small))))
 
 (test-assert "premature eof is detected (--> stop)"
@@ -140,7 +146,7 @@
             (assert (equal? arguments '(input:premature-end-of-file)))
             (set! received #t))
          (! mq (make-message-queue no-handlers error-handler no-sender))
-         (<-- () (handle-input! mq input)))
+         (<-- () (handle-input*! mq input)))
         (assert (equal? received #t))))
 
 (test-equal "envelopes are written (no blocking)"