From 2943fd0c5ea419bd84b47380ee9e0dbea07b57cc Mon Sep 17 00:00:00 2001 From: archipelago Date: Tue, 16 Jun 2026 03:09:18 -0400 Subject: [PATCH] =?UTF-8?q?style(core):=20cargo=20fmt=20(B1/B3/B13=20follo?= =?UTF-8?q?w-up=20=E2=80=94=20satisfy=20release=20fmt=20gate)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/archipelago/src/api/handler/proxy.rs | 3 +-- core/archipelago/src/bootstrap.rs | 8 ++------ core/archipelago/src/federation/storage.rs | 6 +++++- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/core/archipelago/src/api/handler/proxy.rs b/core/archipelago/src/api/handler/proxy.rs index 1df9427c..a3e9d1cb 100644 --- a/core/archipelago/src/api/handler/proxy.rs +++ b/core/archipelago/src/api/handler/proxy.rs @@ -225,8 +225,7 @@ impl ApiHandler { return bad("invalid onion or content id"); } - let fips_npub = - crate::federation::fips_npub_for_onion(&self.config.data_dir, onion).await; + let fips_npub = crate::federation::fips_npub_for_onion(&self.config.data_dir, onion).await; let peer_path = format!("/content/{}", content_id); let mut req = crate::fips::dial::PeerRequest::new(fips_npub.as_deref(), onion, &peer_path) .service(crate::settings::transport::PeerService::PeerFiles) diff --git a/core/archipelago/src/bootstrap.rs b/core/archipelago/src/bootstrap.rs index 97a66f91..f7892471 100644 --- a/core/archipelago/src/bootstrap.rs +++ b/core/archipelago/src/bootstrap.rs @@ -36,8 +36,7 @@ const NGINX_ENABLED_CONF_PATH: &str = "/etc/nginx/sites-enabled/archipelago"; /// own `/app/fedimint/` location, so it needs the same B13 asset-rewrite heal as /// the main conf — browsers reach fedimint over HTTPS via this snippet. Absent on /// HTTP-only nodes, in which case the bootstrap loop skips it. -const NGINX_HTTPS_SNIPPET_PATH: &str = - "/etc/nginx/snippets/archipelago-https-app-proxies.conf"; +const NGINX_HTTPS_SNIPPET_PATH: &str = "/etc/nginx/snippets/archipelago-https-app-proxies.conf"; const RUNTIME_ASSETS_DIR: &str = "/opt/archipelago/web-ui/archipelago-runtime"; /// Inserted into every server block of the nginx config that lacks the @@ -615,10 +614,7 @@ async fn patch_nginx_conf(path: &str) -> Result { // so insert the reroot set after the unique :8175 proxy_pass. Guarded on // the marker so it can never double-apply after Style A already healed. if !patched.contains("'href=\"/' 'href=\"/app/fedimint/'") { - patched = patched.replace( - NGINX_FEDIMINT_SNIPPET_ANCHOR, - NGINX_FEDIMINT_SNIPPET_INSERT, - ); + patched = patched.replace(NGINX_FEDIMINT_SNIPPET_ANCHOR, NGINX_FEDIMINT_SNIPPET_INSERT); } } diff --git a/core/archipelago/src/federation/storage.rs b/core/archipelago/src/federation/storage.rs index 53c26521..0f89b079 100644 --- a/core/archipelago/src/federation/storage.rs +++ b/core/archipelago/src/federation/storage.rs @@ -371,7 +371,11 @@ mod tests { Some("npub1merged"), "merges fips_npub from the dropped duplicate" ); - assert_eq!(kept.name.as_deref(), Some("Sapien"), "merges name from the dup"); + assert_eq!( + kept.name.as_deref(), + Some("Sapien"), + "merges name from the dup" + ); } #[test]