chore: reformat and fix warnings

THCLab · Feb 12, 2025 · 255254b · 255254b
1 parent b7b2aa0
commit 255254b
Show file tree

Hide file tree

Showing 10 changed files with 324 additions and 218 deletions.
diff --git a/components/controller/src/identifier/mechanics/group.rs b/components/controller/src/identifier/mechanics/group.rs
@@ -159,10 +159,7 @@ impl Identifier {
             let index = self.index_in_current_keys(&kc)?;
             let signature = vec![Signature::Transferable(
                 SignerData::LastEstablishment(self.id.clone()),
-                vec![IndexedSignature::new_both_same(
-                    exn_signature,
-                    index as u16,
-                )],
+                vec![IndexedSignature::new_both_same(exn_signature, index as u16)],
             )];
             let signer_exn = Message::Op(Op::Exchange(SignedExchange {
                 exchange_message: exn,

diff --git a/components/controller/src/identifier/mechanics/kel_managing.rs b/components/controller/src/identifier/mechanics/kel_managing.rs
@@ -1,6 +1,10 @@
 use keri_core::{
     actor::{event_generator, prelude::SelfAddressingIdentifier},
-    event::{event_data::EventData, sections::{seal::Seal, KeyConfig}, KeyEvent},
+    event::{
+        event_data::EventData,
+        sections::{seal::Seal, KeyConfig},
+        KeyEvent,
+    },
     event_message::{
         cesr_adapter::{parse_event_type, EventType},
         msg::KeriEvent,
@@ -161,9 +165,7 @@ impl Identifier {
     /// group's current keys list.
     pub(crate) fn get_index(&self, key_event: &KeyEvent) -> Result<usize, MechanicsError> {
         match &key_event.event_data {
-            EventData::Icp(icp) => {
-                self.index_in_current_keys(&icp.key_config)
-            }
+            EventData::Icp(icp) => self.index_in_current_keys(&icp.key_config),
             EventData::Rot(rot) => {
                 let own_npk = &self.known_events.next_keys_hashes(&self.id)?[0];
                 rot.key_config
@@ -172,9 +174,7 @@ impl Identifier {
                     .position(|pk| own_npk.verify_binding(pk.to_str().as_bytes()))
                     .ok_or(MechanicsError::NotGroupParticipantError)
             }
-            EventData::Dip(dip) => {
-                self.index_in_current_keys(&dip.inception_data.key_config)
-            }
+            EventData::Dip(dip) => self.index_in_current_keys(&dip.inception_data.key_config),
             EventData::Drt(drt) => {
                 let own_npk = &self.known_events.next_keys_hashes(&self.id)?[0];
                 drt.key_config

diff --git a/components/controller/src/identifier/mechanics/mailbox.rs b/components/controller/src/identifier/mechanics/mailbox.rs
@@ -74,12 +74,10 @@ impl Identifier {
         mb: &MailboxResponse,
         group_id: &IdentifierPrefix,
     ) -> Result<Vec<ActionRequired>, MechanicsError> {
-
-
         for event in mb.multisig.iter() {
             self.process_group_multisig(event).await?;
         }
-        
+
         let action_required = futures::stream::iter(&mb.delegate)
             .then(|del_event| self.process_group_delegate(del_event, group_id))
             .try_filter_map(|del| async move { Ok(del) })

diff --git a/keriox_tests/src/lib.rs b/keriox_tests/src/lib.rs
@@ -1,9 +1,16 @@
 use std::{path::Path, sync::Arc};
 
 use keri_controller::{
-    config::ControllerConfig, controller::Controller, error::ControllerError, identifier::Identifier, mailbox_updating::ActionRequired, BasicPrefix, CryptoBox, IdentifierPrefix, KeyManager, LocationScheme, SelfSigningPrefix
+    config::ControllerConfig, controller::Controller, error::ControllerError,
+    identifier::Identifier, mailbox_updating::ActionRequired, BasicPrefix, CryptoBox,
+    IdentifierPrefix, KeyManager, LocationScheme, SelfSigningPrefix,
+};
+use keri_core::{
+    actor::error::ActorError,
+    mailbox::exchange::{Exchange, ForwardTopic, FwdArgs},
+    prefix::IndexedSignature,
+    transport::test::TestTransport,
 };
-use keri_core::{actor::error::ActorError, mailbox::exchange::{Exchange, ForwardTopic, FwdArgs}, prefix::IndexedSignature, transport::test::TestTransport};
 use said::{derivation::HashFunctionCode, sad::SerializationFormats};
 use transport::TelTestTransport;
 
@@ -85,65 +92,65 @@ pub async fn setup_identifier(
     (verifier, verifier_keypair, verifier_controller)
 }
 
-pub async fn handle_delegation_request(id: &mut Identifier, keypair: &CryptoBox, witness_id: &[BasicPrefix], delegator_group_id: IdentifierPrefix, delegatee_id: &IdentifierPrefix) -> Result<(), ControllerError>{
+pub async fn handle_delegation_request(
+    id: &mut Identifier,
+    keypair: &CryptoBox,
+    witness_id: &[BasicPrefix],
+    delegator_group_id: IdentifierPrefix,
+    delegatee_id: &IdentifierPrefix,
+) -> Result<(), ControllerError> {
     let query = id.query_mailbox(&delegator_group_id, witness_id)?;
     for qry in query {
         let signature = SelfSigningPrefix::Ed25519Sha512(keypair.sign(&qry.encode()?)?);
-        let ar = id
-            .finalize_query_mailbox(vec![(qry, signature)])
-            .await?;
+        let ar = id.finalize_query_mailbox(vec![(qry, signature)]).await?;
 
         assert_eq!(ar.len(), 1);
         match &ar[0] {
             ActionRequired::MultisigRequest(_, _) => unreachable!(),
             ActionRequired::DelegationRequest(delegating_event, exn) => {
-                let signature_ixn = SelfSigningPrefix::Ed25519Sha512(
-                    keypair.sign(&delegating_event.encode()?)?,
-                );
-                let signature_exn =
-                    SelfSigningPrefix::Ed25519Sha512(keypair.sign(&exn.encode()?)?);
+                let signature_ixn =
+                    SelfSigningPrefix::Ed25519Sha512(keypair.sign(&delegating_event.encode()?)?);
+                let signature_exn = SelfSigningPrefix::Ed25519Sha512(keypair.sign(&exn.encode()?)?);
                 id.finalize_group_incept(
-                        &delegating_event.encode()?,
-                        signature_ixn.clone(),
-                        vec![(exn.encode()?, signature_exn)],
-                    )
-                    .await
-                    .unwrap();
+                    &delegating_event.encode()?,
+                    signature_ixn.clone(),
+                    vec![(exn.encode()?, signature_exn)],
+                )
+                .await
+                .unwrap();
                 id.notify_witnesses().await?;
 
                 // Query for receipts
                 let query = id.query_mailbox(&delegator_group_id, witness_id)?;
 
                 for qry in query {
-                    let signature =
-                        SelfSigningPrefix::Ed25519Sha512(keypair.sign(&qry.encode()?)?);
+                    let signature = SelfSigningPrefix::Ed25519Sha512(keypair.sign(&qry.encode()?)?);
                     let action_required = id
                         .finalize_query_mailbox(vec![(qry, signature)])
                         .await
                         .unwrap();
                     assert!(action_required.is_empty());
                 }
-                
+
                 let kc = id.find_state(&delegator_group_id).unwrap().current;
                 let index = id.index_in_current_keys(&kc).unwrap();
                 // send accepted event to child
                 let exn_message = Exchange::Fwd {
-                        args: FwdArgs {
-                            recipient_id: delegatee_id.clone(),
-                            topic: ForwardTopic::Delegate,
-                        },
-                        to_forward: delegating_event.clone(),
-                    }
-                    .to_message(SerializationFormats::JSON, HashFunctionCode::Blake3_256);
+                    args: FwdArgs {
+                        recipient_id: delegatee_id.clone(),
+                        topic: ForwardTopic::Delegate,
+                    },
+                    to_forward: delegating_event.clone(),
+                }
+                .to_message(SerializationFormats::JSON, HashFunctionCode::Blake3_256);
                 let signature_exn =
                     SelfSigningPrefix::Ed25519Sha512(keypair.sign(&exn_message.encode()?)?);
 
                 let data_signature = IndexedSignature::new_both_same(signature_ixn, index as u16);
-                id
-                    .finalize_exchange(&exn_message.encode()?, signature_exn, data_signature)
+                id.finalize_exchange(&exn_message.encode()?, signature_exn, data_signature)
                     .await?;
             }
         };
-    };
+    }
     Ok(())
-}
+}
diff --git a/keriox_tests/src/settings.rs b/keriox_tests/src/settings.rs
@@ -36,7 +36,6 @@ impl AsyncTestContext for InfrastructureContext {
 
         async_std::task::spawn(first_witness.listen_http((Ipv4Addr::UNSPECIFIED, 3232)));
 
-
         let second_witness = {
             let wit_root = Builder::new().prefix("wit-db").tempdir().unwrap();
             Arc::new(
@@ -88,11 +87,10 @@ impl AsyncTestContext for InfrastructureContext {
         }
     }
 
-    async fn teardown(self) {
-    }
+    async fn teardown(self) {}
 }
 
-impl  InfrastructureContext {
+impl InfrastructureContext {
     pub fn first_witness_data(&self) -> (BasicPrefix, LocationScheme) {
         if let IdentifierPrefix::Basic(bp) = &self.first_witness_oobi.eid {
             (bp.clone(), self.first_witness_oobi.clone())
@@ -116,4 +114,4 @@ impl  InfrastructureContext {
             unreachable!()
         }
     }
-}
+}
diff --git a/keriox_tests/tests/indirect_mode_signing.rs b/keriox_tests/tests/indirect_mode_signing.rs
@@ -146,7 +146,9 @@ async fn indirect_mode_signing(ctx: &mut InfrastructureContext) -> Result<(), Co
     let (watcher_id, watcher_oobi) = ctx.watcher_data();
 
     // Resolve watcher oobi
-    verifying_identifier.resolve_oobi(&Oobi::Location(watcher_oobi)).await?;
+    verifying_identifier
+        .resolve_oobi(&Oobi::Location(watcher_oobi))
+        .await?;
 
     // Generate and sign event, that will be sent to watcher, so it knows to act
     // as verifier's watcher.