[gnunet-scheme] 04/06: dht/client: Simplify request-search-result-iterator with previous commit.

[gnunet]

This is an automated email from the git hooks/post-receive script.

maxime-devos pushed a commit to branch master
in repository gnunet-scheme.

commit 0853898c22c13e2f1f61f406c416a4dcec5cf45a
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Wed Aug 17 13:35:54 2022 +0200

    dht/client: Simplify request-search-result-iterator with previous commit.
    
    * gnu/gnunet/dht/client.scm
    (reconnect)[request-search-result-iterator]: Use 
'maybe-send-control-message!*'.
    (reconnect)[control*]{request-search-result-iterator}: Adjust to type 
change.
---
 gnu/gnunet/dht/client.scm | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/gnu/gnunet/dht/client.scm b/gnu/gnunet/dht/client.scm
index 8ab011b..1c6a479 100644
--- a/gnu/gnunet/dht/client.scm
+++ b/gnu/gnunet/dht/client.scm
@@ -79,7 +79,8 @@
          (gnu gnunet mq-impl stream)
          (gnu gnunet mq envelope)
          (only (gnu gnunet server)
-               maybe-send-control-message! make-error-handler
+               maybe-send-control-message! maybe-send-control-message!*
+               make-error-handler
                <server> server-terminal-condition server-control-channel
                make-disconnect! handle-control-message!)
          (only (guile)
@@ -798,17 +799,12 @@ operation is cancelled, return @code{#false} instead."
        ;; but hash tables are thread-unsafe.
        ;; TODO: reduce allocations
        (define response-channel (make-channel))
-       (perform-operation
-        (choice-operation
-         ;; TODO: is this case needed?
-         (wrap-operation (wait-operation terminal-condition)
-                         (lambda () #false))
-         (wrap-operation
-          (put-operation control-channel
-                         (vector 'request-search-result-iterator unique-id
-                                 response-channel))
-          (lambda ()
-            (get-message response-channel))))))
+       ;; TODO: is the 'terminal-condition' case needed?
+       (and (maybe-send-control-message!* terminal-condition control-channel
+                                          'request-search-result-iterator
+                                          unique-id
+                                          response-channel)
+            (get-message response-channel)))
       (define handlers
        (message-handlers
         (message-handler
@@ -910,7 +906,7 @@ operation is cancelled, return @code{#false} instead."
           ;; Continue!
           (control))
          ;; Send by @code{request-search-result-iterator}.
-         (#('request-search-result-iterator unique-id response-channel)
+         (('request-search-result-iterator unique-id response-channel)
           (put-message response-channel
                        (and=> (hashv-ref id->operation-map unique-id)
                               dereference))

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.