6e52f1d refactor(src/broker.rs): drop unnecessary adapter method — radicle-ci-broker

Radicle CI broker

refactor(src/broker.rs): drop unnecessary adapter method

Lars Wirzenius committed 1 year ago

commit 6e52f1da50d3f7b461a92c78f5781993555e4bae
parent 346b8719382a3b96696764463a80a65ac8de0957

1 file changed +4 -15

modified src/broker.rs

@@ -57,10 +57,6 @@ impl Broker {

         self.default_adapter.as_ref()
     }
     fn adapter(&self, _rid: &RepoId) -> Option<&Adapter> {
         self.default_adapter.as_ref()
     }
     #[allow(clippy::result_large_err)]
     pub fn execute_ci(
         &mut self,

@@ -70,7 +66,7 @@ impl Broker {

         let broker_run_id = RunId::default();
         let span = span!(Level::TRACE, "execute_ci_run", %broker_run_id,).entered();
         let rid = trigger.repo();
         let adapter = self.adapter(&rid).ok_or(BrokerError::NoAdapter(rid))?;
         let adapter = self.default_adapter().ok_or(BrokerError::NoAdapter(rid))?;
         let run = span
             .in_scope(|| self.execute_helper(adapter, broker_run_id, trigger, run_notification))?;
         Ok(run)

@@ -198,7 +194,7 @@ mod test {

     use std::{path::Path, time::Duration};
     use tempfile::tempdir;
     use super::{Adapter, Broker, RepoId};
     use super::{Adapter, Broker};
     use crate::{
         msg::{RunId, RunResult},
         notif::NotificationChannel,

@@ -210,18 +206,12 @@ mod test {

         Ok(Broker::new(filename, Duration::from_secs(1))?)
     }
     fn rid() -> anyhow::Result<RepoId> {
         const RID: &str = "rad:zwTxygwuz5LDGBq255RA2CbNGrz8";
         Ok(RepoId::from_urn(RID)?)
     }
     #[test]
     fn has_no_adapters_initially() -> TestResult<()> {
         let tmp = tempdir()?;
         let db = tmp.path().join("db.db");
         let broker = broker(&db)?;
         let rid = rid()?;
         assert_eq!(broker.adapter(&rid), None);
         assert_eq!(broker.default_adapter(), None);
         Ok(())
     }

@@ -256,8 +246,7 @@ mod test {

         let adapter = Adapter::default();
         broker.set_default_adapter(&adapter);
         let rid = rid()?;
         assert_eq!(broker.adapter(&rid), Some(&adapter));
         assert_eq!(broker.default_adapter(), Some(&adapter));
         Ok(())
     }