Merge #536

536: Switch to using stable Rust instead of nightly r=thomaseizinger a=thomaseizinger



Co-authored-by: Thomas Eizinger <thomas@eizinger.io>

swap/src/bin/asb.rs

@@ -353,7 +353,7 @@ async fn register_tor_services(
                 }
             })
         })
-        .filter_map(|details| details)
+        .flatten()
         .collect::<Vec<_>>();
 
     let key = seed.derive_torv3_key();

swap/src/bitcoin/timelocks.rs

@@ -17,18 +17,6 @@ impl From<BlockHeight> for u32 {
     }
 }
 
-impl BlockHeight {
-    pub const fn new(block_height: u32) -> Self {
-        Self(block_height)
-    }
-    pub const fn checked_sub(self, rhs: Self) -> Option<Self> {
-        match self.0.checked_sub(rhs.0) {
-            Some(result) => Some(BlockHeight(result)),
-            None => None,
-        }
-    }
-}
-
 impl TryFrom<HeaderNotification> for BlockHeight {
     type Error = anyhow::Error;
 

swap/src/protocol/alice/state.rs

@@ -314,8 +314,8 @@ impl State2 {
 
         let tx_cancel_sig = self.a.sign(tx_cancel.digest());
         Message3 {
-            tx_refund_encsig,
             tx_cancel_sig,
+            tx_refund_encsig,
         }
     }