Revert "Remove need for 04/16 nightly rust (#689)" (#692)

Author: benthecarman

.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
 
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-2023-04-16
           components: clippy
           target: wasm32-unknown-unknown
           override: true
@@ -45,7 +45,7 @@ jobs:
 
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-2023-04-16
           components: clippy
           target: wasm32-unknown-unknown
           override: true
@@ -68,11 +68,11 @@ jobs:
 
       - name: Build wasm
         env:
-          RUSTUP_TOOLCHAIN: nightly
+          RUSTUP_TOOLCHAIN: nightly-2023-04-16
         run: wasm-pack build ./mutiny-wasm --release --target web --scope mutinywallet
 
       - name: Publish wasm
         run: wasm-pack publish --access public -t web
         env:
-          RUSTUP_TOOLCHAIN: nightly
+          RUSTUP_TOOLCHAIN: nightly-2023-04-16
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/test.yml

@@ -24,13 +24,13 @@ jobs:
       - name: Install nightly toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-2023-04-16
           components: rustfmt
           profile: minimal
 
       - name: Check formatting
         run: |
-          cargo +nightly fmt -- --check
+          cargo +nightly-2023-04-16 fmt -- --check
 
   website:
     name: Build WASM binary
@@ -39,7 +39,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-2023-04-16
           target: wasm32-unknown-unknown
           override: true
           profile: minimal
@@ -61,20 +61,20 @@ jobs:
 
       - name: Build wasm package
         env:
-          RUSTUP_TOOLCHAIN: nightly
+          RUSTUP_TOOLCHAIN: nightly-2023-04-16
         run: wasm-pack build ./mutiny-wasm --release --target web
 
   browser_tests:
     name: Browser Tests
     runs-on: ubuntu-latest
     env:
-      RUSTUP_TOOLCHAIN: nightly
+      RUSTUP_TOOLCHAIN: nightly-2023-04-16
       WASM_BINDGEN_TEST_TIMEOUT: 240
     steps:
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-2023-04-16
           target: wasm32-unknown-unknown
           override: true
           profile: minimal
@@ -112,7 +112,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-2023-04-16
           components: clippy
           target: wasm32-unknown-unknown
           override: true
@@ -155,7 +155,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-2023-04-16
           override: true
           profile: minimal
           components: clippy
@@ -202,7 +202,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-2023-04-16
           override: true
           profile: minimal
           components: clippy
@@ -249,7 +249,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-2023-04-16
           override: true
           profile: minimal
           components: clippy

README.md

@@ -29,7 +29,7 @@ AR=/opt/homebrew/opt/llvm/bin/llvm-ar CC=/opt/homebrew/opt/llvm/bin/clang
 
 ### Dependencies
 
-- [rust](https://www.rust-lang.org/) (specifically, nightly: `rustup toolchain install nightly` and `rustup target add wasm32-unknown-unknown --toolchain nightly`)
+- [rust](https://www.rust-lang.org/) (specifically, nightly: `rustup toolchain install nightly-2023-04-16` and `rustup target add wasm32-unknown-unknown --toolchain nightly-2023-04-16`)
 
 - [node](https://nodejs.org/en/)
 

mutiny-core/Cargo.toml

@@ -50,7 +50,7 @@ log = "=0.4.18"
 futures = "0.3.25"
 thiserror = "1.0"
 anyhow = "1.0"
-miniscript = { version = "9.0.1", default-features = false, features = ["no-std"] }
+miniscript = { version = "9.0.0", default-features = false, features = ["no-std"] }
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.33"

mutiny-core/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-default = "nightly"
+channel = "nightly-2023-04-16"

mutiny-core/src/gossip.rs

@@ -335,7 +335,11 @@ impl LnPeerMetadata {
         };
 
         // combine nodes from both
-        let mut nodes: Vec<String> = primary.nodes.into_iter().chain(secondary.nodes).collect();
+        let mut nodes: Vec<String> = primary
+            .nodes
+            .into_iter()
+            .chain(secondary.nodes.into_iter())
+            .collect();
 
         // remove duplicates
         nodes.sort();

mutiny-core/src/ldkstorage.rs

@@ -134,10 +134,11 @@ impl<S: MutinyStorage> MutinyNodePersister<S> {
             .scan(MONITORS_PREFIX_KEY, Some(suffix))
             .map_err(|_| io::ErrorKind::Other)?;
 
-        let res =
-            channel_monitor_list
-                .into_iter()
-                .try_fold(Vec::new(), |mut accum, (_, data)| {
+        let res = channel_monitor_list
+            .iter()
+            .fold(Ok(Vec::new()), |current_res, (_, data)| match current_res {
+                Err(e) => Err(e),
+                Ok(mut accum) => {
                     let mut buffer = Cursor::new(data);
                     match <(BlockHash, ChannelMonitor<InMemorySigner>)>::read(
                         &mut buffer,
@@ -152,7 +153,8 @@ impl<S: MutinyStorage> MutinyNodePersister<S> {
                             format!("Failed to deserialize ChannelMonitor: {e}"),
                         )),
                     }
-                })?;
+                }
+            })?;
 
         Ok(res)
     }
@@ -254,12 +256,8 @@ impl<S: MutinyStorage> MutinyNodePersister<S> {
             channel_monitor_mut_references,
         );
         let mut readable_kv_value = Cursor::new(bytes);
-        let Ok((_, channel_manager)) =
-            <(BlockHash, PhantomChannelManager<S>)>::read(&mut readable_kv_value, read_args)
-        else {
-            return Err(MutinyError::ReadError {
-                source: MutinyStorageError::Other(anyhow!("could not read manager")),
-            });
+        let Ok((_, channel_manager)) = <(BlockHash, PhantomChannelManager<S>)>::read(&mut readable_kv_value, read_args) else {
+            return Err(MutinyError::ReadError { source: MutinyStorageError::Other(anyhow!("could not read manager")) })
         };
         Ok(ReadChannelManager {
             channel_manager,

mutiny-core/src/lib.rs

@@ -3,7 +3,6 @@
 #![allow(
     incomplete_features,
     clippy::extra_unused_type_parameters,
-    clippy::arc_with_non_send_sync,
     type_alias_bounds
 )]
 #![feature(io_error_other)]

mutiny-core/src/nodemanager.rs

@@ -1169,7 +1169,7 @@ impl<S: MutinyStorage> NodeManager<S> {
                 log_warn!(self.logger, "Failed to get bdk history: {e}");
                 e
             })
-            .unwrap_or_default();
+            .unwrap_or(vec![]);
 
         let mut activity = Vec::with_capacity(lightning.len() + onchain.len());
         for ln in lightning {
@@ -2117,7 +2117,7 @@ impl<S: MutinyStorage> NodeManager<S> {
             .collect();
 
         // correctly set is_connected
-        for peer in &mut storage_peers {
+        for mut peer in &mut storage_peers {
             if connected_peers.contains(&peer.pubkey) {
                 peer.is_connected = true;
             }

mutiny-core/src/nostr/nwc.rs

@@ -345,7 +345,9 @@ pub struct PendingNwcInvoice {
 
 impl PartialOrd for PendingNwcInvoice {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
+        self.invoice
+            .to_string()
+            .partial_cmp(&other.invoice.to_string())
     }
 }