fix rebase

Author: Septias

deny.toml

@@ -33,13 +33,13 @@ skip = [
     { name = "ed25519-dalek", version = "1.0.1" },
     { name = "ed25519", version = "1.5.3" },
     { name = "event-listener", version = "2.5.3" },
-     { name = "fd-lock", version = "3.0.13" },
+    { name = "fd-lock", version = "3.0.13" },
     { name = "getrandom", version = "<0.2" },
-     { name = "h2", version = "0.3.22" },
-     { name = "http-body", version = "0.4.5" },
-     { name = "http", version = "0.2.11" },
-     { name = "hyper", version = "0.14.27" },
-     { name = "idna", version = "0.4.0" },
+    { name = "h2", version = "0.3.22" },
+    { name = "http-body", version = "0.4.5" },
+    { name = "http", version = "0.2.11" },
+    { name = "hyper", version = "0.14.27" },
+    { name = "idna", version = "0.4.0" },
     { name = "pem-rfc7468", version = "0.6.0" },
     { name = "pkcs8", version = "0.9.0" },
     { name = "quick-error", version = "<2.0" },
@@ -60,14 +60,14 @@ skip = [
     { name = "time", version = "<0.3" },
     { name = "untrusted", version = "0.7.1" },
     { name = "wasi", version = "<0.11" },
-     { name = "windows_aarch64_gnullvm", version = "<0.52" },
+    { name = "windows_aarch64_gnullvm", version = "<0.52" },
     { name = "windows_aarch64_msvc", version = "<0.52" },
     { name = "windows_i686_gnu", version = "<0.52" },
     { name = "windows_i686_msvc", version = "<0.52" },
-     { name = "windows-sys", version = "<0.52" },
-     { name = "windows-targets", version = "<0.52" },
+    { name = "windows-sys", version = "<0.52" },
+    { name = "windows-targets", version = "<0.52" },
     { name = "windows", version = "0.32.0" },
-     { name = "windows_x86_64_gnullvm", version = "<0.52" },
+    { name = "windows_x86_64_gnullvm", version = "<0.52" },
     { name = "windows_x86_64_gnu", version = "<0.52" },
     { name = "windows_x86_64_msvc", version = "<0.52" },
 ]

src/peer_channels.rs

@@ -20,7 +20,10 @@ impl Context {
         let secret_key: SecretKey = self.get_or_create_iroh_keypair().await?;
 
         if self.endpoint.lock().await.is_some() {
-            warn!(self, "Tried to create gossip even tough there still exists an instance");
+            warn!(
+                self,
+                "Tried to create gossip even tough there still exists an instance"
+            );
             return Ok(());
         }
 
@@ -38,7 +41,6 @@ impl Context {
             .bind(0)
             .await?;
 
-
         // create gossip
         let my_addr = endpoint.my_addr().await?;
         let gossip = Gossip::from_endpoint(endpoint.clone(), Default::default(), &my_addr.info);

src/sql/migrations.rs

@@ -762,35 +762,6 @@ CREATE INDEX smtp_messageid ON imap(rfc724_mid);
         )
         .await?;
     }
-    if dbversion < 105 {
-        // Create UNIQUE uid column and drop unused update_item_read column.
-        sql.execute_migration(
-            r#"CREATE TABLE new_msgs_status_updates (
-id INTEGER PRIMARY KEY AUTOINCREMENT,
-msg_id INTEGER,
-update_item TEXT DEFAULT '',
-uid TEXT UNIQUE
-);
-INSERT OR IGNORE INTO new_msgs_status_updates SELECT
-  id, msg_id, update_item, NULL
-FROM msgs_status_updates;
-DROP TABLE msgs_status_updates;
-ALTER TABLE new_msgs_status_updates RENAME TO msgs_status_updates;
-CREATE INDEX msgs_status_updates_index1 ON msgs_status_updates (msg_id);
-CREATE INDEX msgs_status_updates_index2 ON msgs_status_updates (uid);
-"#,
-            105,
-        )
-        .await?;
-    }
-
-    if dbversion < 106 {
-        sql.execute_migration(
-            "CREATE TABLE iroh_gossip_peers (topic TEXT NOT NULL, public_key TEXT NOT NULL)",
-            106,
-        )
-        .await?;
-    }
 
     if dbversion < 105 {
         // Create UNIQUE uid column and drop unused update_item_read column.
@@ -863,6 +834,14 @@ CREATE INDEX msgs_status_updates_index2 ON msgs_status_updates (uid);
         .await?;
     }
 
+    if dbversion < 108 {
+        sql.execute_migration(
+            "CREATE TABLE iroh_gossip_peers (topic TEXT NOT NULL, public_key TEXT NOT NULL)",
+            108,
+        )
+        .await?;
+    }
+
     let new_version = sql
         .get_raw_config_int(VERSION_CFG)
         .await?

src/webxdc.rs

@@ -1731,9 +1731,12 @@ mod tests {
             )
             .await?;
         alice.flush_status_updates().await?;
-        
+
         // Setting ephemeral should noot prepare a message
-        assert!(&alice.pop_sent_msg_opt(Duration::from_secs(1)).await.is_none());
+        assert!(&alice
+            .pop_sent_msg_opt(Duration::from_secs(1))
+            .await
+            .is_none());
         Ok(())
     }