Merge branch 'master' into grpc-server-enhancements

tiram88 · Oct 6, 2023 · 99983da · 99983da
2 parents 54d3317 + 51a1240
commit 99983da
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -229,7 +229,9 @@ jobs:
 
       - name: Install gcc-multilib
         # gcc-multilib allows clang to find gnu libraries properly
-        run: sudo apt install -y gcc-multilib
+        run: |
+          sudo apt-get update
+          sudo apt install -y gcc-multilib
 
       - name: Install stable toolchain
         if: steps.install_llvm.outcome == 'success' && steps.install_llvm.conclusion == 'success'
@@ -290,7 +292,9 @@ jobs:
 
       - name: Install gcc-multilib
         # gcc-multilib allows clang to find gnu libraries properly
-        run: sudo apt install -y gcc-multilib
+        run: |
+          sudo apt-get update
+          sudo apt install -y gcc-multilib
 
       - name: Install stable toolchain
         if: steps.install_llvm.outcome == 'success' && steps.install_llvm.conclusion == 'success'

diff --git a/crypto/txscript/src/data_stack.rs b/crypto/txscript/src/data_stack.rs
@@ -64,7 +64,7 @@ fn deserialize_i64(v: &[u8]) -> Result<i64, TxScriptError> {
         l if l > size_of::<i64>() => {
             Err(TxScriptError::NotMinimalData(format!("numeric value encoded as {v:x?} is longer than 8 bytes")))
         }
-        l if l == 0 => Ok(0),
+        0 => Ok(0),
         _ => {
             check_minimal_data_encoding(v)?;
             let msb = v[v.len() - 1];

diff --git a/kos/src/imports.rs b/kos/src/imports.rs
@@ -1,3 +1,4 @@
+pub use crate::core::MetricsCtl;
 pub use crate::core::*;
 pub use crate::error::Error;
 pub use crate::ipc::*;

diff --git a/rpc/grpc/client/src/route.rs b/rpc/grpc/client/src/route.rs
@@ -22,7 +22,6 @@ macro_rules! route {
                         return __ret;
                     }
                     let __self = self;
-                    let request = request;
                     let __ret: RpcResult<[<$name Response>]> =
                         { __self.inner.call(RpcApiOps::$name, request).await?.as_ref().try_into() };
                     #[allow(unreachable_code)]

diff --git a/wallet/core/src/settings.rs b/wallet/core/src/settings.rs
@@ -101,15 +101,15 @@ where
             None
         };
 
-        let list = if list.is_none() {
+        let list = if let Some(value) = list {
+            value
+        } else {
             Value::Object(Map::from_iter(<K as DefaultSettings>::defaults().await.into_iter().map(|(k, v)| {
                 let ks = to_value(k).unwrap();
                 let ks = ks.as_str().expect("Unable to convert key to string");
 
                 (ks.to_string(), v)
             })))
-        } else {
-            list.unwrap()
         };
 
         self.map.clear();

diff --git a/wallet/core/src/utxo/processor.rs b/wallet/core/src/utxo/processor.rs
@@ -70,7 +70,7 @@ pub struct UtxoProcessor {
 
 impl UtxoProcessor {
     pub fn new(rpc: Option<Rpc>, network_id: Option<NetworkId>, multiplexer: Option<Multiplexer<Box<Events>>>) -> Self {
-        let multiplexer = multiplexer.unwrap_or_else(Multiplexer::new);
+        let multiplexer = multiplexer.unwrap_or_default();
         UtxoProcessor { inner: Arc::new(Inner::new(rpc, network_id, multiplexer)) }
     }