Formatting

tari-project · Oct 27, 2022 · 95944be · 95944be
1 parent 636152a
commit 95944be
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 21 deletions.
diff --git a/base_layer/wallet/src/output_manager_service/service.rs b/base_layer/wallet/src/output_manager_service/service.rs
@@ -2558,11 +2558,7 @@ where
                         // match found
                         Some(matched_key) => {
                             match PrivateKey::from_bytes(
-                                CommsDHKE::new(
-                                    &matched_key.private_key,
-                                    &output.sender_offset_public_key,
-                                )
-                                .as_bytes(),
+                                CommsDHKE::new(&matched_key.private_key, &output.sender_offset_public_key).as_bytes(),
                             ) {
                                 Ok(spending_sk) => scanned_outputs.push((
                                     output.clone(),

diff --git a/base_layer/wallet/src/transaction_service/service.rs b/base_layer/wallet/src/transaction_service/service.rs
@@ -37,7 +37,10 @@ use tari_common_types::{
     transaction::{ImportStatus, TransactionDirection, TransactionStatus, TxId},
     types::{PrivateKey, PublicKey},
 };
-use tari_comms::{peer_manager::NodeIdentity, types::{CommsDHKE, CommsPublicKey}};
+use tari_comms::{
+    peer_manager::NodeIdentity,
+    types::{CommsDHKE, CommsPublicKey},
+};
 use tari_comms_dht::outbound::OutboundMessageRequester;
 use tari_core::{
     covenants::Covenant,
@@ -1062,10 +1065,9 @@ where
             .get_recipient_sender_offset_private_key(0)
             .map_err(|e| TransactionServiceProtocolError::new(tx_id, e.into()))?;
 
-        let spend_key = PrivateKey::from_bytes(
-            CommsDHKE::new(&sender_offset_private_key.clone(), &dest_pubkey.clone()).as_bytes(),
-        )
-        .map_err(|e| TransactionServiceProtocolError::new(tx_id, e.into()))?;
+        let spend_key =
+            PrivateKey::from_bytes(CommsDHKE::new(&sender_offset_private_key.clone(), &dest_pubkey.clone()).as_bytes())
+                .map_err(|e| TransactionServiceProtocolError::new(tx_id, e.into()))?;
 
         let sender_message = TransactionSenderMessage::new_single_round_message(stp.get_single_round_message()?);
         let rewind_blinding_key = PrivateKey::from_bytes(&hash_secret_key(&spend_key))?;
@@ -1223,10 +1225,9 @@ where
         let sender_offset_private_key = stp
             .get_recipient_sender_offset_private_key(0)
             .map_err(|e| TransactionServiceProtocolError::new(tx_id, e.into()))?;
-        let spend_key = PrivateKey::from_bytes(
-            CommsDHKE::new(&sender_offset_private_key, &dest_pubkey.clone()).as_bytes(),
-        )
-        .map_err(|e| TransactionServiceProtocolError::new(tx_id, e.into()))?;
+        let spend_key =
+            PrivateKey::from_bytes(CommsDHKE::new(&sender_offset_private_key, &dest_pubkey.clone()).as_bytes())
+                .map_err(|e| TransactionServiceProtocolError::new(tx_id, e.into()))?;
 
         let sender_message = TransactionSenderMessage::new_single_round_message(stp.get_single_round_message()?);
         let rewind_blinding_key = PrivateKey::from_bytes(&hash_secret_key(&spend_key))?;

diff --git a/comms/dht/src/crypt.rs b/comms/dht/src/crypt.rs
@@ -41,9 +41,7 @@ use tari_comms::{
     types::{CommsDHKE, CommsPublicKey},
     BufMut,
 };
-use tari_crypto::{
-    tari_utilities::{epoch_time::EpochTime, ByteArray},
-};
+use tari_crypto::tari_utilities::{epoch_time::EpochTime, ByteArray};
 use zeroize::Zeroize;
 
 use crate::{

diff --git a/comms/dht/src/dht.rs b/comms/dht/src/dht.rs
@@ -457,7 +457,8 @@ mod test {
         pipeline::SinkService,
         runtime,
         test_utils::mocks::create_connectivity_mock,
-        wrap_in_envelope_body, types::CommsDHKE,
+        types::CommsDHKE,
+        wrap_in_envelope_body,
     };
     use tari_shutdown::Shutdown;
     use tokio::{sync::mpsc, task, time};

diff --git a/comms/dht/src/outbound/broadcast.rs b/comms/dht/src/outbound/broadcast.rs
@@ -35,7 +35,7 @@ use tari_comms::{
     message::{MessageExt, MessageTag},
     peer_manager::{NodeId, NodeIdentity, Peer},
     pipeline::PipelineError,
-    types::{CommsPublicKey, CommsDHKE},
+    types::{CommsDHKE, CommsPublicKey},
     Bytes,
     BytesMut,
 };

diff --git a/comms/dht/src/store_forward/saf_handler/task.rs b/comms/dht/src/store_forward/saf_handler/task.rs
@@ -33,7 +33,7 @@ use tari_comms::{
     message::{EnvelopeBody, MessageTag},
     peer_manager::{NodeId, NodeIdentity, Peer, PeerFeatures, PeerManagerError},
     pipeline::PipelineError,
-    types::{CommsPublicKey, CommsDHKE},
+    types::{CommsDHKE, CommsPublicKey},
     BytesMut,
 };
 use tari_utilities::ByteArray;

diff --git a/comms/dht/src/test_utils/makers.rs b/comms/dht/src/test_utils/makers.rs
@@ -27,7 +27,7 @@ use tari_comms::{
     multiaddr::Multiaddr,
     peer_manager::{NodeId, NodeIdentity, Peer, PeerFeatures, PeerFlags, PeerManager},
     transports::MemoryTransport,
-    types::{CommsDatabase, CommsDHKE, CommsPublicKey, CommsSecretKey},
+    types::{CommsDHKE, CommsDatabase, CommsPublicKey, CommsSecretKey},
     Bytes,
 };
 use tari_crypto::keys::PublicKey;