07/14: substitute: Stop using call-with-cached-connection in fetch-narinfos.

[guix-commits]

cbaines pushed a commit to branch master
in repository guix.

commit 7b812f7c84c43455cdd68a0e51b6ded018afcc8e
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Thu Jan 7 19:44:56 2021 +0000

    substitute: Stop using call-with-cached-connection in fetch-narinfos.
    
    Instead, just pass open-connection-for-uri/maybe to http-multiple-get. This
    code should be functionaly similar to the previous code. The eventual aim of
    this is to make the connection caching not mandatory in fetch-narinfos.
    
    * guix/scripts/substitute.scm (fetch-narinfos): Remove use of
    call-with-cached-connection.
---
 guix/scripts/substitute.scm | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index f01c11b..cd52ad7 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -412,20 +412,14 @@ port to it, or, if connection failed, print a warning and 
return #f.  Pass
        ;; on the X.509 PKI.  We can do it because we authenticate
        ;; narinfos, which provides a much stronger guarantee.
        (let* ((requests (map (cut narinfo-request url <>) paths))
-              (result   (call-with-cached-connection uri
-                          (lambda (port)
-                            (if port
-                                (begin
-                                  (update-progress!)
-                                  (http-multiple-get uri
-                                                     handle-narinfo-response 
'()
-                                                     requests
-                                                     #:open-connection
-                                                     
open-connection-for-uri/cached
-                                                     #:verify-certificate? #f
-                                                     #:port port))
-                                '()))
-                          open-connection-for-uri/maybe)))
+              (result   (begin
+                          (update-progress!)
+                          (http-multiple-get uri
+                                             handle-narinfo-response '()
+                                             requests
+                                             #:open-connection
+                                             open-connection-for-uri/maybe
+                                             #:verify-certificate? #f))))
          (newline (current-error-port))
          result))
       ((file #f)