chore: Cleanup

Satellite-im · Oct 7, 2023 · 6c5cc59 · 6c5cc59
1 parent 27b566e
commit 6c5cc59
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 21 deletions.
diff --git a/extensions/warp-ipfs/src/lib.rs b/extensions/warp-ipfs/src/lib.rs
@@ -451,35 +451,20 @@ impl WarpIpfs {
             relays.clone(),
         );
 
+        info!("Initializing identity profile");
         let identity_store = IdentityStore::new(
             ipfs.clone(),
             config.path.clone(),
             tesseract.clone(),
-            config.store_setting.auto_push,
             self.multipass_tx.clone(),
             pb_tx,
             &config,
             discovery.clone(),
         )
         .await?;
-        info!("Identity store initialized");
-
-        // let friend_store = FriendsStore::new(
-        //     ipfs.clone(),
-        //     identity_store.clone(),
-        //     discovery.clone(),
-        //     config.clone(),
-        //     tesseract.clone(),
-        //     self.multipass_tx.clone(),
-        //
-        // )
-        // .await?;
-        // info!("friends store initialized");
-
-        // identity_store.set_friend_store(friend_store.clone()).await;
+        info!("Identity initialized");
 
         *self.identity_store.write() = Some(identity_store.clone());
-        // *self.friend_store.write() = Some(friend_store.clone());
 
         *self.ipfs.write() = Some(ipfs.clone());
 

diff --git a/extensions/warp-ipfs/src/store/identity.rs b/extensions/warp-ipfs/src/store/identity.rs
@@ -52,6 +52,7 @@ use super::{
 };
 
 #[derive(Clone)]
+#[allow(clippy::type_complexity)]
 pub struct IdentityStore {
     ipfs: Ipfs,
 
@@ -238,7 +239,6 @@ impl IdentityStore {
         ipfs: Ipfs,
         path: Option<PathBuf>,
         tesseract: Tesseract,
-        interval: Option<Duration>,
         tx: broadcast::Sender<MultiPassEventKind>,
         pb_tx: futures::channel::mpsc::Sender<PhoneBookCommand>,
         config: &config::Config,
@@ -357,9 +357,12 @@ impl IdentityStore {
                 futures::pin_mut!(event_stream);
                 futures::pin_mut!(friend_stream);
 
-                let auto_push = interval.is_some();
+                let auto_push = store.config.store_setting.auto_push.is_some();
 
-                let interval = interval
+                let interval = store
+                    .config
+                    .store_setting
+                    .auto_push
                     .map(|i| {
                         if i.as_millis() < 300000 {
                             Duration::from_millis(300000)
@@ -2829,7 +2832,7 @@ impl IdentityStore {
         }
 
         if broadcast {
-            let local_public_key = (&*self.did_key).clone();
+            let local_public_key = (*self.did_key).clone();
 
             let payload = RequestResponsePayload {
                 sender: local_public_key,