From 5cbc80cd1584844d0d83f992b4885c3c15335fc6 Mon Sep 17 00:00:00 2001 From: Edyta Pawlak Date: Mon, 25 Mar 2024 17:40:01 +0100 Subject: [PATCH] refactor: minor changes and reformat --- components/witness/src/tests.rs | 16 ++++++++++--- keriox_core/src/actor/error.rs | 4 ++-- keriox_core/src/actor/mod.rs | 9 ++++--- keriox_core/src/processor/event_storage.rs | 26 ++++++++++++--------- keriox_core/src/query/query_event.rs | 1 - keriox_tests/tests/indirect_mode_signing.rs | 10 +------- 6 files changed, 37 insertions(+), 29 deletions(-) diff --git a/components/witness/src/tests.rs b/components/witness/src/tests.rs index b52932d2..2a9d83fe 100644 --- a/components/witness/src/tests.rs +++ b/components/witness/src/tests.rs @@ -8,13 +8,23 @@ use keri_core::{ prelude::{HashFunctionCode, SerializationFormats}, simple_controller::{PossibleResponse, SimpleController}, SignedQueryError, - }, database::{escrow::EscrowDb, SledEventDatabase}, error::Error, event::sections::{ + }, + database::{escrow::EscrowDb, SledEventDatabase}, + error::Error, + event::sections::{ seal::{EventSeal, Seal}, threshold::SignatureThreshold, - }, event_message::signed_event_message::{Message, Notice, Op, SignedEventMessage}, keys::PublicKey, mailbox::{exchange::ForwardTopic, MailboxResponse}, prefix::{BasicPrefix, IdentifierPrefix, SelfSigningPrefix}, processor::{ + }, + event_message::signed_event_message::{Message, Notice, Op, SignedEventMessage}, + keys::PublicKey, + mailbox::{exchange::ForwardTopic, MailboxResponse}, + prefix::{BasicPrefix, IdentifierPrefix, SelfSigningPrefix}, + processor::{ basic_processor::BasicProcessor, escrow::EscrowConfig, event_storage::EventStorage, Processor, - }, query::query_event::LogsQueryArgs, signer::{CryptoBox, Signer} + }, + query::query_event::LogsQueryArgs, + signer::{CryptoBox, Signer}, }; use tempfile::Builder; use url::Url; diff --git a/keriox_core/src/actor/error.rs b/keriox_core/src/actor/error.rs index 5b5f42c9..71ae696e 100644 --- a/keriox_core/src/actor/error.rs +++ b/keriox_core/src/actor/error.rs @@ -51,9 +51,9 @@ pub enum ActorError { #[error("Signing error: {0}")] SigningError(#[from] KeysError), - + #[error("Error: {0}")] - GeneralError(String) + GeneralError(String), } #[cfg(feature = "oobi")] diff --git a/keriox_core/src/actor/mod.rs b/keriox_core/src/actor/mod.rs index ef38101f..a4619ce4 100644 --- a/keriox_core/src/actor/mod.rs +++ b/keriox_core/src/actor/mod.rs @@ -231,8 +231,11 @@ pub fn process_query(qr: &QueryRoute, storage: &EventStorage) -> Result { let mail = storage.get_mailbox_messages(args)?; Ok(ReplyType::Mbx(mail)) - }, - QueryRoute::Logs { reply_route: _, args } => { + } + QueryRoute::Logs { + reply_route: _, + args, + } => { let sn_kel = storage .get_kel_messages_with_receipts(&args.i, args.s)? .ok_or_else(|| QueryError::UnknownId { id: args.i.clone() })? @@ -240,7 +243,7 @@ pub fn process_query(qr: &QueryRoute, storage: &EventStorage) -> Result + sn: Option, ) -> Result>, Error> { let events = self.db.get_kel_finalized_events(id); - Ok(match (events, sn) { - (None, _) => None, + Ok(match (events, sn) { + (None, _) => None, (Some(events), None) => self.collect_with_receipts(events), (Some(events), Some(sn)) => { - let evs = events - .filter(|ev| ev.signed_event_message.event_message.data.get_sn() <= sn ); + let evs = + events.filter(|ev| ev.signed_event_message.event_message.data.get_sn() <= sn); self.collect_with_receipts(evs) } }) - } - fn collect_with_receipts<'a, I>(&self, events: I ) -> Option> - where I: IntoIterator> { + fn collect_with_receipts<'a, I>(&self, events: I) -> Option> + where + I: IntoIterator>, + { let evs = events .into_iter() .flat_map(|event: Timestamped| { @@ -112,7 +116,7 @@ impl EventStorage { None => vec![Notice::Event(event.into())], } }); - Some(evs.collect()) + Some(evs.collect()) } pub fn get_event_at_sn( diff --git a/keriox_core/src/query/query_event.rs b/keriox_core/src/query/query_event.rs index 4d933cfd..3269ac46 100644 --- a/keriox_core/src/query/query_event.rs +++ b/keriox_core/src/query/query_event.rs @@ -160,7 +160,6 @@ fn test_query_deserialize() { let input_query = r#"{"v":"KERI10JSON000105_","t":"qry","d":"EHtaQHsKzezkQUEYjMjEv6nIf4AhhR9Zy6AvcfyGCXkI","dt":"2021-01-01T00:00:00.000000+00:00","r":"logs","rr":"","q":{"s":0,"i":"EIaGMMWJFPmtXznY1IIiKDIrg-vIyge6mBl2QV8dDjI3","src":"BGKVzj4ve0VSd8z_AmvhLg4lqcC_9WYX90k03q-R_Ydo"}}"#; let qr: QueryEvent = serde_json::from_str(input_query).unwrap(); assert!(matches!(qr.data.data, QueryRoute::Logs { .. },)); - } #[test] diff --git a/keriox_tests/tests/indirect_mode_signing.rs b/keriox_tests/tests/indirect_mode_signing.rs index 274cfb8f..66ff7a4d 100644 --- a/keriox_tests/tests/indirect_mode_signing.rs +++ b/keriox_tests/tests/indirect_mode_signing.rs @@ -244,14 +244,6 @@ async fn indirect_mode_signing() -> Result<(), ControllerError> { .await; } - // Now get expected KEL - let kel = verifying_identifier - .source - .storage - .get_kel(&signing_identifier.id) - .unwrap(); - println!("{:?}", String::from_utf8(kel.unwrap()).unwrap()); - // Verify signed message. assert!(verifying_controller .verify(first_message, &first_signature) @@ -264,7 +256,7 @@ async fn indirect_mode_signing() -> Result<(), ControllerError> { // Rotation needs two witness receipts to be accepted let rotation_event = signing_identifier - .rotate(vec![pk], vec![npk], 1, vec![], vec![], 1) + .rotate(vec![pk], vec![npk], 1, vec![], vec![], 2) .await?; let signature = SelfSigningPrefix::Ed25519Sha512(key_manager.sign(rotation_event.as_bytes())?);