explicit args for denyliststate

dfinity · Jul 30, 2024 · 1ad62e7 · 1ad62e7
1 parent 80548f7
commit 1ad62e7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/src/routing/middleware/denylist.rs b/src/routing/middleware/denylist.rs
@@ -1,4 +1,4 @@
-use std::sync::Arc;
+use std::{path::PathBuf, sync::Arc, time::Duration};
 
 use anyhow::{Context, Error};
 use axum::{
@@ -7,6 +7,7 @@ use axum::{
     response::Response,
 };
 use prometheus::Registry;
+use reqwest::Url;
 
 use crate::{
     cli::Cli,
@@ -22,19 +23,21 @@ pub struct DenylistState(Arc<Denylist>);
 #[allow(clippy::type_complexity)]
 impl DenylistState {
     pub fn new(
-        cli: &Cli,
+        denylist_url: Option<Url>,
+        denylist_seed: Option<PathBuf>,
+        allowlist: Option<PathBuf>,
+        poll_interval: Duration,
         tasks: &mut TaskManager,
         http_client: Arc<dyn Client>,
         registry: &Registry,
     ) -> Result<Self, Error> {
-        let denylist_url = cli.policy.policy_denylist_url.clone();
         let denylist = Arc::new(
             Denylist::init(
                 denylist_url.clone(),
-                cli.policy.policy_denylist_allowlist.clone(),
-                cli.policy.policy_denylist_seed.clone(),
+                allowlist,
+                denylist_seed,
                 http_client,
-                cli.policy.policy_denylist_poll_interval,
+                poll_interval,
                 registry,
             )
             .context("unable to init denylist")?,

diff --git a/src/routing/mod.rs b/src/routing/mod.rs
@@ -156,7 +156,15 @@ pub fn setup_router(
     let denylist_mw =
         if cli.policy.policy_denylist_seed.is_some() || cli.policy.policy_denylist_url.is_some() {
             Some(from_fn_with_state(
-                denylist::DenylistState::new(cli, tasks, http_client.clone(), registry)?,
+                denylist::DenylistState::new(
+                    cli.policy.policy_denylist_url.clone(),
+                    cli.policy.policy_denylist_seed.clone(),
+                    cli.policy.policy_denylist_allowlist.clone(),
+                    cli.policy.policy_denylist_poll_interval,
+                    tasks,
+                    http_client.clone(),
+                    registry,
+                )?,
                 denylist::middleware,
             ))
         } else {