1 files changed, 11 insertions, 22 deletions

diff --git a/gnu/gnunet/nse/client.scm b/gnu/gnunet/nse/client.scm
index 0cc4300..126dedc 100644
--- a/gnu/gnunet/nse/client.scm
+++ b/gnu/gnunet/nse/client.scm
@@ -66,12 +66,8 @@
           (gnu gnunet message protocols)
           (only (gnu gnunet server)
                 <server> make-disconnect!
-                server-terminal-condition
-                server-control-channel
                 handle-control-message!
-                <loop> run-loop server->loop-arguments
-                loop:connected loop:disconnected
-                loop:control-channel loop:terminal-condition)
+                <loop> spawn-server-loop run-loop loop:terminal-condition)
           (only (gnu gnunet nse struct)
                 /:msg:nse:estimate))
   (begin
@@ -129,7 +125,8 @@ timestamp."
               (immutable estimate/box loop:estimate/box))
       (protocol
        (lambda (%make)
-         (lambda* (#:key updated estimate/box #:allow-other-keys #:rest r)
+         (lambda* (#:key (updated values) estimate/box #:allow-other-keys
+                   #:rest r)
            ((apply %make r) updated estimate/box)))))
 
     ;; See 'connect'.  TODO: gc test fails
@@ -187,8 +184,8 @@ timestamp."
          (handle-control-message! message message-queue
                                   (loop:terminal-condition loop) k/reconnect!))))
 
-    (define* (connect config #:key (updated values) (connected values)
-                      (disconnected values) (spawn spawn-fiber))
+    (define* (connect config #:key updated connected disconnected spawn
+                      #:rest r)
       "Connect to the NSE service in the background.
 
 When connected, the thunk @var{connected} is called and estimates
@@ -201,17 +198,9 @@ shortly after calling @var{disconnected}.
 
 The procedures @var{updated}, @var{connected} and @var{disconnected} are optional."
       (define server (%make-server))
-      (define loop
-        (apply make-loop:nse
-               #:make-message-handlers make-message-handlers
-               #:control-message-handler control-message-handler
-               #:service-name "nse"
-               #:configuration config
-               #:connected connected
-               #:disconnected disconnected
-               #:spawn spawn
-               #:estimate/box (server-estimate/box server)
-               #:updated updated
-               (server->loop-arguments server)))
-      (spawn (lambda () (run-loop loop)))
-      server)))
+      (apply spawn-server-loop server #:make-loop make-loop:nse
+             #:make-message-handlers make-message-handlers
+             #:control-message-handler control-message-handler
+             #:service-name "nse"
+             #:configuration config
+             #:estimate/box (server-estimate/box server) r))))