Merge branch 'master' into mempool-perf

tiram88 · Oct 6, 2023 · acc3016 · acc3016
2 parents d01ebd6 + b247698
commit acc3016
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 16 deletions.
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/rpc/grpc/server/src/connection.rs b/rpc/grpc/server/src/connection.rs
@@ -315,7 +315,6 @@ impl Connection {
             match payload {
                 Payload::NotifyBlockAddedRequest(ref request) => match kaspa_rpc_core::NotifyBlockAddedRequest::try_from(request) {
                     Ok(request) => {
-                        let listener_id = listener_id;
                         let result = notifier
                             .clone()
                             .execute_subscribe_command(listener_id, Scope::BlockAdded(BlockAddedScope::default()), request.command)
@@ -328,7 +327,6 @@ impl Connection {
                 Payload::NotifyVirtualChainChangedRequest(ref request) => {
                     match kaspa_rpc_core::NotifyVirtualChainChangedRequest::try_from(request) {
                         Ok(request) => {
-                            let listener_id = listener_id;
                             let result = notifier
                                 .clone()
                                 .execute_subscribe_command(
@@ -348,7 +346,6 @@ impl Connection {
                 Payload::NotifyFinalityConflictRequest(ref request) => {
                     match kaspa_rpc_core::NotifyFinalityConflictRequest::try_from(request) {
                         Ok(request) => {
-                            let listener_id = listener_id;
                             let result = notifier
                                 .clone()
                                 .execute_subscribe_command(
@@ -376,7 +373,6 @@ impl Connection {
                 Payload::NotifyUtxosChangedRequest(ref request) => {
                     match kaspa_rpc_core::NotifyUtxosChangedRequest::try_from(request) {
                         Ok(request) => {
-                            let listener_id = listener_id;
                             let result = notifier
                                 .clone()
                                 .execute_subscribe_command(
@@ -394,7 +390,6 @@ impl Connection {
                 Payload::NotifySinkBlueScoreChangedRequest(ref request) => {
                     match kaspa_rpc_core::NotifySinkBlueScoreChangedRequest::try_from(request) {
                         Ok(request) => {
-                            let listener_id = listener_id;
                             let result = notifier
                                 .clone()
                                 .execute_subscribe_command(
@@ -412,7 +407,6 @@ impl Connection {
                 Payload::NotifyVirtualDaaScoreChangedRequest(ref request) => {
                     match kaspa_rpc_core::NotifyVirtualDaaScoreChangedRequest::try_from(request) {
                         Ok(request) => {
-                            let listener_id = listener_id;
                             let result = notifier
                                 .clone()
                                 .execute_subscribe_command(
@@ -430,7 +424,6 @@ impl Connection {
                 Payload::NotifyPruningPointUtxoSetOverrideRequest(ref request) => {
                     match kaspa_rpc_core::NotifyPruningPointUtxoSetOverrideRequest::try_from(request) {
                         Ok(request) => {
-                            let listener_id = listener_id;
                             let result = notifier
                                 .clone()
                                 .execute_subscribe_command(
@@ -448,7 +441,6 @@ impl Connection {
                 Payload::NotifyNewBlockTemplateRequest(ref request) => {
                     match kaspa_rpc_core::NotifyNewBlockTemplateRequest::try_from(request) {
                         Ok(request) => {
-                            let listener_id = listener_id;
                             let result = notifier
                                 .clone()
                                 .execute_subscribe_command(
@@ -468,7 +460,6 @@ impl Connection {
                     let response: StopNotifyingUtxosChangedResponseMessage =
                         match kaspa_rpc_core::NotifyUtxosChangedRequest::try_from(&notify_request) {
                             Ok(request) => {
-                                let listener_id = listener_id;
                                 let result = notifier
                                     .clone()
                                     .execute_subscribe_command(
@@ -489,7 +480,6 @@ impl Connection {
                     let response: StopNotifyingPruningPointUtxoSetOverrideResponseMessage =
                         match kaspa_rpc_core::NotifyPruningPointUtxoSetOverrideRequest::try_from(&notify_request) {
                             Ok(request) => {
-                                let listener_id = listener_id;
                                 let result = notifier
                                     .clone()
                                     .execute_subscribe_command(

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)) }
     }