dbus daemon scope fix

worldcoin · Feb 14, 2025 · 9efcf2f · 9efcf2f
1 parent ab6b135
commit 9efcf2f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/.github/workflows/rust-ci.yaml b/.github/workflows/rust-ci.yaml
@@ -128,9 +128,7 @@ jobs:
           key: custom-${{ hashFiles('**/*.nix', 'flake.lock') }}
       - name: Install dbus
         if: matrix.platform == 'macos-14'
-        run: |
-          brew install dbus
-          brew services start dbus
+        run: brew install dbus
       - name: Print environment
         run: |
           uname -a

diff --git a/orb-info/src/orb_token.rs b/orb-info/src/orb_token.rs
@@ -1,6 +1,5 @@
 use color_eyre::eyre::{Result, WrapErr};
 use orb_attest_dbus::AuthTokenManagerProxy;
-use std::sync::Arc;
 use tokio::sync::watch;
 use tokio_util::sync::CancellationToken;
 use tracing::debug;
@@ -9,10 +8,10 @@ use zbus::Connection;
 
 use crate::OrbInfoError;
 
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub struct TokenTaskHandle {
     pub token_receiver: watch::Receiver<String>,
-    pub join_handle: Arc<tokio::task::JoinHandle<Result<()>>>,
+    pub join_handle: tokio::task::JoinHandle<Result<()>>,
 }
 
 impl TokenTaskHandle {
@@ -24,7 +23,7 @@ impl TokenTaskHandle {
             Self::setup_dbus(connection, cancel_token).await?;
         Ok(TokenTaskHandle {
             token_receiver,
-            join_handle: Arc::new(join_handle),
+            join_handle,
         })
     }
 
@@ -141,7 +140,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_get_orb_token() -> Result<()> {
-        let (connection, _, mock_manager) = setup_test_server().await?;
+        let (connection, _daemon, mock_manager) = setup_test_server().await?;
 
         // Create client
         let cancel_token = CancellationToken::new();
@@ -160,7 +159,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_token_update() -> Result<()> {
-        let (connection, _, mock_manager) = setup_test_server().await?;
+        let (connection, _daemon, mock_manager) = setup_test_server().await?;
         let object_server = connection.object_server();
         let iface_ref = object_server
             .interface::<_, AuthTokenManagerIface>("/org/worldcoin/AuthTokenManager1")