From patchwork Thu Dec 29 18:13:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45687 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0B42B27BBEB; Thu, 29 Dec 2022 19:02:53 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1AC4D27BBE9 for ; Thu, 29 Dec 2022 19:02:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pAxQt-0000Eh-AL; Thu, 29 Dec 2022 13:15:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pAxQm-0000BK-D6 for guix-patches@gnu.org; Thu, 29 Dec 2022 13:15:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pAxQm-0004Dz-3F for guix-patches@gnu.org; Thu, 29 Dec 2022 13:15:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pAxQl-0007Rm-U2 for guix-patches@gnu.org; Thu, 29 Dec 2022 13:15:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52555] [PATCH v3 7/8] eris: Use parameterized %eris-peers when getting blocks. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 29 Dec 2022 18:15:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52555 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52555@debbugs.gnu.org Cc: pukkamustard Received: via spool by 52555-submit@debbugs.gnu.org id=B52555.167233767828517 (code B ref 52555); Thu, 29 Dec 2022 18:15:03 +0000 Received: (at 52555) by debbugs.gnu.org; 29 Dec 2022 18:14:38 +0000 Received: from localhost ([127.0.0.1]:32812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAxQL-0007Pm-No for submit@debbugs.gnu.org; Thu, 29 Dec 2022 13:14:38 -0500 Received: from mout02.posteo.de ([185.67.36.66]:48273) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAxQE-0007OO-Cy for 52555@debbugs.gnu.org; Thu, 29 Dec 2022 13:14:31 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id DB00B2401E3 for <52555@debbugs.gnu.org>; Thu, 29 Dec 2022 19:14:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1672337664; bh=0t3VJ7QgKBL8gGBqmmcrMOnEDnoXjqRl59gNRajS6t0=; h=From:To:Cc:Subject:Date:From; b=U/q3HYZOys4d1YBYzUtEZlljzp+hqeMAqPiQLTzdDE9pXf/uBTN03ug5BDGu8NGF2 Ldzki+Ii9Tfqp3ARCb8x/TG76OEhcPlVNONebJap9BSn1GGlZK0GEqd5KoPu34BDo8 QMPEvM0AbwRABqRGehvtRkXNbmMo04jaNUDvEWnWgjhZ/ed6qVPEZ4ETQPXl03jzHc noCHXXMwAQAMA+ksjxaeGfxqrmJMcREri1PxlNOkAqzZFG9HBTw/NrBuJWGN4xRCbu zzhB//HNFmwoAurcy60M3cSS/DstFAE30P+vn+l/4CcExmVxjj5vgRtY02JYNjsc9J 9ycM2TUuSHbLg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Njc3h1JwQz6tnW; Thu, 29 Dec 2022 19:14:24 +0100 (CET) From: pukkamustard Date: Thu, 29 Dec 2022 18:13:26 +0000 Message-Id: <20221229181327.758-8-pukkamustard@posteo.net> In-Reply-To: <20221229181327.758-1-pukkamustard@posteo.net> References: <20221229181327.758-1-pukkamustard@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches --- guix/eris.scm | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/guix/eris.scm b/guix/eris.scm index 4af17c2807..d56643bec4 100644 --- a/guix/eris.scm +++ b/guix/eris.scm @@ -54,15 +54,30 @@ (define* (try-in-order ref #:key block-refs) (try-in-order ref #:block-refs rest)))) (() #f))) +(define* (peer->block-ref peer #:key open-connection) + (case (uri-scheme peer) + + ((http https) + (lambda (ref) + (eris-http-block-ref ref + #:host peer + #:open-connection open-connection))) + + ;; unsupported ERIS peer URL + (else (lambda (_) #f)))) + (define* (guix-eris-block-ref ref #:key open-connection) (try-in-order ref #:block-refs - (list + (cons + + ;; first try and get block from local block store (lambda (ref) (eris-fs-store-ref ref #:store-directory (%eris-block-store-directory))) - (lambda (ref) - (eris-http-block-ref ref - #:host (string->uri "http://localhost:8081") - #:open-connection open-connection))))) + + ;; then try peers + (map (lambda (peer) + (peer->block-ref peer #:open-connection open-connection)) + (%eris-peers)))))