commit ed2accfc67043d76b9bf4f83a062dc66a8f14729 parent ef5f79a17ec3c901f5fe5dec5777ad6efbb04bac Author: triesap <tyson@radroots.org> Date: Wed, 4 Mar 2026 13:30:30 +0000 events-codec: rename metadata and index decode helpers Diffstat:
41 files changed, 149 insertions(+), 149 deletions(-)
diff --git a/crates/events-codec/src/app_data/decode.rs b/crates/events-codec/src/app_data/decode.rs @@ -47,7 +47,7 @@ pub fn app_data_from_tags( }) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -65,7 +65,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -74,7 +74,7 @@ pub fn index_from_event( tags: Vec<Vec<String>>, sig: String, ) -> Result<RadrootsAppDataEventIndex, EventParseError> { - let metadata = metadata_from_event( + let metadata = data_from_event( id.clone(), author.clone(), published_at, diff --git a/crates/events-codec/src/comment/decode.rs b/crates/events-codec/src/comment/decode.rs @@ -54,7 +54,7 @@ pub fn comment_from_tags( }) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -72,7 +72,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -81,7 +81,7 @@ pub fn index_from_event( tags: Vec<Vec<String>>, sig: String, ) -> Result<RadrootsCommentEventIndex, EventParseError> { - let metadata = metadata_from_event( + let metadata = data_from_event( id.clone(), author.clone(), published_at, diff --git a/crates/events-codec/src/coop/decode.rs b/crates/events-codec/src/coop/decode.rs @@ -62,7 +62,7 @@ pub fn coop_from_event( Ok(coop) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -80,7 +80,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -89,7 +89,7 @@ pub fn index_from_event( tags: Vec<Vec<String>>, sig: String, ) -> Result<RadrootsCoopEventIndex, EventParseError> { - let metadata = metadata_from_event( + let metadata = data_from_event( id.clone(), author.clone(), published_at, diff --git a/crates/events-codec/src/document/decode.rs b/crates/events-codec/src/document/decode.rs @@ -123,7 +123,7 @@ pub fn document_from_event( Ok(document) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -141,7 +141,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -150,7 +150,7 @@ pub fn index_from_event( tags: Vec<Vec<String>>, sig: String, ) -> Result<RadrootsDocumentEventIndex, EventParseError> { - let metadata = metadata_from_event( + let metadata = data_from_event( id.clone(), author.clone(), published_at, diff --git a/crates/events-codec/src/farm/decode.rs b/crates/events-codec/src/farm/decode.rs @@ -61,7 +61,7 @@ pub fn farm_from_event( Ok(farm) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -79,7 +79,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -88,7 +88,7 @@ pub fn index_from_event( tags: Vec<Vec<String>>, sig: String, ) -> Result<RadrootsFarmEventIndex, EventParseError> { - let metadata = metadata_from_event( + let metadata = data_from_event( id.clone(), author.clone(), published_at, diff --git a/crates/events-codec/src/follow/decode.rs b/crates/events-codec/src/follow/decode.rs @@ -68,7 +68,7 @@ pub fn follow_from_tags( Ok(RadrootsFollow { list }) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -86,7 +86,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -95,7 +95,7 @@ pub fn index_from_event( tags: Vec<Vec<String>>, sig: String, ) -> Result<RadrootsFollowEventIndex, EventParseError> { - let metadata = metadata_from_event( + let metadata = data_from_event( id.clone(), author.clone(), published_at, diff --git a/crates/events-codec/src/geochat/decode.rs b/crates/events-codec/src/geochat/decode.rs @@ -88,7 +88,7 @@ pub fn geochat_from_tags( }) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -106,7 +106,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -115,7 +115,7 @@ pub fn index_from_event( tags: Vec<Vec<String>>, sig: String, ) -> Result<RadrootsGeoChatEventIndex, EventParseError> { - let metadata = metadata_from_event( + let metadata = data_from_event( id.clone(), author.clone(), published_at, diff --git a/crates/events-codec/src/gift_wrap/decode.rs b/crates/events-codec/src/gift_wrap/decode.rs @@ -77,7 +77,7 @@ pub fn gift_wrap_from_tags( }) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -95,7 +95,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -104,7 +104,7 @@ pub fn index_from_event( tags: Vec<Vec<String>>, sig: String, ) -> Result<RadrootsGiftWrapEventIndex, EventParseError> { - let metadata = metadata_from_event( + let metadata = data_from_event( id.clone(), author.clone(), published_at, diff --git a/crates/events-codec/src/job/feedback/decode.rs b/crates/events-codec/src/job/feedback/decode.rs @@ -77,7 +77,7 @@ pub fn job_feedback_from_tags( }) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -98,7 +98,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -107,7 +107,7 @@ pub fn index_from_event( tags: Vec<Vec<String>>, sig: String, ) -> Result<RadrootsJobFeedbackEventIndex, JobParseError> { - let metadata = metadata_from_event( + let metadata = data_from_event( id.clone(), author.clone(), published_at, diff --git a/crates/events-codec/src/job/request/decode.rs b/crates/events-codec/src/job/request/decode.rs @@ -67,7 +67,7 @@ pub fn job_request_from_tags( }) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -87,7 +87,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -97,7 +97,7 @@ pub fn index_from_event( sig: String, ) -> Result<RadrootsJobRequestEventIndex, JobParseError> { let metadata = - metadata_from_event(id.clone(), author.clone(), published_at, kind, tags.clone())?; + data_from_event(id.clone(), author.clone(), published_at, kind, tags.clone())?; Ok(RadrootsJobRequestEventIndex { event: RadrootsNostrEvent { id, diff --git a/crates/events-codec/src/job/result/decode.rs b/crates/events-codec/src/job/result/decode.rs @@ -72,7 +72,7 @@ pub fn job_result_from_tags( }) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -93,7 +93,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -102,7 +102,7 @@ pub fn index_from_event( tags: Vec<Vec<String>>, sig: String, ) -> Result<RadrootsJobResultEventIndex, JobParseError> { - let metadata = metadata_from_event( + let metadata = data_from_event( id.clone(), author.clone(), published_at, diff --git a/crates/events-codec/src/job/traits.rs b/crates/events-codec/src/job/traits.rs @@ -12,16 +12,16 @@ use radroots_events::{ use crate::job::{ error::JobParseError, feedback::decode::{ - index_from_event as feedback_index_from_event, - metadata_from_event as feedback_metadata_from_event, + parsed_from_event as feedback_index_from_event, + data_from_event as feedback_metadata_from_event, }, request::decode::{ - index_from_event as request_index_from_event, - metadata_from_event as request_metadata_from_event, + parsed_from_event as request_index_from_event, + data_from_event as request_metadata_from_event, }, result::decode::{ - index_from_event as result_index_from_event, - metadata_from_event as result_metadata_from_event, + parsed_from_event as result_index_from_event, + data_from_event as result_metadata_from_event, }, }; diff --git a/crates/events-codec/src/list/decode.rs b/crates/events-codec/src/list/decode.rs @@ -49,7 +49,7 @@ pub fn list_from_tags( Ok(RadrootsList { content, entries }) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -67,7 +67,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -76,7 +76,7 @@ pub fn index_from_event( tags: Vec<Vec<String>>, sig: String, ) -> Result<RadrootsListEventIndex, EventParseError> { - let metadata = metadata_from_event( + let metadata = data_from_event( id.clone(), author.clone(), published_at, diff --git a/crates/events-codec/src/list_set/decode.rs b/crates/events-codec/src/list_set/decode.rs @@ -100,7 +100,7 @@ pub fn list_set_from_tags( }) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -118,7 +118,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -127,7 +127,7 @@ pub fn index_from_event( tags: Vec<Vec<String>>, sig: String, ) -> Result<RadrootsListSetEventIndex, EventParseError> { - let metadata = metadata_from_event( + let metadata = data_from_event( id.clone(), author.clone(), published_at, diff --git a/crates/events-codec/src/listing/decode.rs b/crates/events-codec/src/listing/decode.rs @@ -225,7 +225,7 @@ pub fn listing_from_event( Ok(listing) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -243,7 +243,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -252,7 +252,7 @@ pub fn index_from_event( tags: Vec<Vec<String>>, sig: String, ) -> Result<RadrootsListingEventIndex, EventParseError> { - let metadata = metadata_from_event( + let metadata = data_from_event( id.clone(), author.clone(), published_at, diff --git a/crates/events-codec/src/message/decode.rs b/crates/events-codec/src/message/decode.rs @@ -44,7 +44,7 @@ pub fn message_from_tags( }) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -62,7 +62,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -71,7 +71,7 @@ pub fn index_from_event( tags: Vec<Vec<String>>, sig: String, ) -> Result<RadrootsMessageEventIndex, EventParseError> { - let metadata = metadata_from_event( + let metadata = data_from_event( id.clone(), author.clone(), published_at, diff --git a/crates/events-codec/src/message_file/decode.rs b/crates/events-codec/src/message_file/decode.rs @@ -155,7 +155,7 @@ pub fn message_file_from_tags( }) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -173,7 +173,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -182,7 +182,7 @@ pub fn index_from_event( tags: Vec<Vec<String>>, sig: String, ) -> Result<RadrootsMessageFileEventIndex, EventParseError> { - let metadata = metadata_from_event( + let metadata = data_from_event( id.clone(), author.clone(), published_at, diff --git a/crates/events-codec/src/plot/decode.rs b/crates/events-codec/src/plot/decode.rs @@ -122,7 +122,7 @@ pub fn plot_from_event( Ok(plot) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -140,7 +140,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -149,7 +149,7 @@ pub fn index_from_event( tags: Vec<Vec<String>>, sig: String, ) -> Result<RadrootsPlotEventIndex, EventParseError> { - let metadata = metadata_from_event( + let metadata = data_from_event( id.clone(), author.clone(), published_at, diff --git a/crates/events-codec/src/post/decode.rs b/crates/events-codec/src/post/decode.rs @@ -29,7 +29,7 @@ pub fn post_from_content(kind: u32, content: &str) -> Result<RadrootsPost, Event }) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -47,7 +47,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -56,7 +56,7 @@ pub fn index_from_event( tags: Vec<Vec<String>>, sig: String, ) -> Result<RadrootsPostEventIndex, EventParseError> { - let metadata = metadata_from_event( + let metadata = data_from_event( id.clone(), author.clone(), published_at, diff --git a/crates/events-codec/src/profile/decode.rs b/crates/events-codec/src/profile/decode.rs @@ -67,7 +67,7 @@ pub fn profile_from_content(content: &str) -> Result<RadrootsProfile, EventParse }) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -93,7 +93,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -102,7 +102,7 @@ pub fn index_from_event( tags: Vec<Vec<String>>, sig: String, ) -> Result<RadrootsProfileEventIndex, EventParseError> { - let metadata = metadata_from_event( + let metadata = data_from_event( id.clone(), author.clone(), published_at, diff --git a/crates/events-codec/src/reaction/decode.rs b/crates/events-codec/src/reaction/decode.rs @@ -43,7 +43,7 @@ pub fn reaction_from_tags( }) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -61,7 +61,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -70,7 +70,7 @@ pub fn index_from_event( tags: Vec<Vec<String>>, sig: String, ) -> Result<RadrootsReactionEventIndex, EventParseError> { - let metadata = metadata_from_event( + let metadata = data_from_event( id.clone(), author.clone(), published_at, diff --git a/crates/events-codec/src/resource_area/decode.rs b/crates/events-codec/src/resource_area/decode.rs @@ -63,7 +63,7 @@ pub fn resource_area_from_event( Ok(area) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -81,7 +81,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -90,7 +90,7 @@ pub fn index_from_event( tags: Vec<Vec<String>>, sig: String, ) -> Result<RadrootsResourceAreaEventIndex, EventParseError> { - let metadata = metadata_from_event( + let metadata = data_from_event( id.clone(), author.clone(), published_at, diff --git a/crates/events-codec/src/resource_cap/decode.rs b/crates/events-codec/src/resource_cap/decode.rs @@ -64,7 +64,7 @@ pub fn resource_harvest_cap_from_event( Ok(cap) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -82,7 +82,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -91,7 +91,7 @@ pub fn index_from_event( tags: Vec<Vec<String>>, sig: String, ) -> Result<RadrootsResourceHarvestCapEventIndex, EventParseError> { - let metadata = metadata_from_event( + let metadata = data_from_event( id.clone(), author.clone(), published_at, diff --git a/crates/events-codec/src/seal/decode.rs b/crates/events-codec/src/seal/decode.rs @@ -36,7 +36,7 @@ pub fn seal_from_parts( }) } -pub fn metadata_from_event( +pub fn data_from_event( id: String, author: String, published_at: u32, @@ -54,7 +54,7 @@ pub fn metadata_from_event( }) } -pub fn index_from_event( +pub fn parsed_from_event( id: String, author: String, published_at: u32, @@ -63,7 +63,7 @@ pub fn index_from_event( tags: Vec<Vec<String>>, sig: String, ) -> Result<RadrootsSealEventIndex, EventParseError> { - let metadata = metadata_from_event( + let metadata = data_from_event( id.clone(), author.clone(), published_at, diff --git a/crates/events-codec/tests/app_data.rs b/crates/events-codec/tests/app_data.rs @@ -3,7 +3,7 @@ use radroots_events::{ kinds::KIND_POST, }; use radroots_events_codec::app_data::decode::{ - app_data_from_tags, index_from_event, metadata_from_event, + app_data_from_tags, parsed_from_event, data_from_event, }; use radroots_events_codec::app_data::encode::{ app_data_build_tags, to_wire_parts, to_wire_parts_with_kind, @@ -92,7 +92,7 @@ fn app_data_from_tags_rejects_invalid_d_tag_shape() { #[test] fn app_data_metadata_and_index_from_event_roundtrip() { let tags = vec![vec!["d".to_string(), "radroots.app".to_string()]]; - let metadata = metadata_from_event( + let metadata = data_from_event( "id".to_string(), "author".to_string(), 42, @@ -108,7 +108,7 @@ fn app_data_metadata_and_index_from_event_roundtrip() { assert_eq!(metadata.app_data.d_tag, "radroots.app"); assert_eq!(metadata.app_data.content, "payload"); - let index = index_from_event( + let index = parsed_from_event( "id".to_string(), "author".to_string(), 42, @@ -129,7 +129,7 @@ fn app_data_metadata_and_index_from_event_roundtrip() { #[test] fn app_data_index_from_event_propagates_parse_errors() { - let err = index_from_event( + let err = parsed_from_event( "id".to_string(), "author".to_string(), 42, diff --git a/crates/events-codec/tests/comment.rs b/crates/events-codec/tests/comment.rs @@ -7,7 +7,7 @@ use radroots_events::{ }; use radroots_events_codec::comment::decode::comment_from_tags; -use radroots_events_codec::comment::decode::{index_from_event, metadata_from_event}; +use radroots_events_codec::comment::decode::{parsed_from_event, data_from_event}; use radroots_events_codec::comment::encode::{ comment_build_tags, to_wire_parts, to_wire_parts_with_kind, }; @@ -221,7 +221,7 @@ fn comment_metadata_and_index_from_event_roundtrip() { push_nip10_ref_tags(&mut tags, &root, "E", "P", "K", "A"); push_nip10_ref_tags(&mut tags, &parent, "e", "p", "k", "a"); - let metadata = metadata_from_event( + let metadata = data_from_event( "id".to_string(), "author".to_string(), 77, @@ -237,7 +237,7 @@ fn comment_metadata_and_index_from_event_roundtrip() { assert_event_ref_fields(&metadata.comment.root, &root); assert_event_ref_fields(&metadata.comment.parent, &parent); - let index = index_from_event( + let index = parsed_from_event( "id".to_string(), "author".to_string(), 77, @@ -255,7 +255,7 @@ fn comment_metadata_and_index_from_event_roundtrip() { #[test] fn comment_index_from_event_propagates_parse_errors() { - let err = index_from_event( + let err = parsed_from_event( "id".to_string(), "author".to_string(), 77, diff --git a/crates/events-codec/tests/follow.rs b/crates/events-codec/tests/follow.rs @@ -5,7 +5,7 @@ use radroots_events::{ use radroots_events_codec::error::{EventEncodeError, EventParseError}; use radroots_events_codec::follow::decode::{ - follow_from_tags, index_from_event, metadata_from_event, + follow_from_tags, parsed_from_event, data_from_event, }; use radroots_events_codec::follow::encode::{ FollowMutation, follow_apply, follow_to_wire_parts_after, to_wire_parts, @@ -146,7 +146,7 @@ fn follow_metadata_and_index_from_event_roundtrip() { "alice".to_string(), "88".to_string(), ]]; - let metadata = metadata_from_event( + let metadata = data_from_event( "id".to_string(), "author".to_string(), 50, @@ -171,7 +171,7 @@ fn follow_metadata_and_index_from_event_roundtrip() { Some("alice") ); - let index = index_from_event( + let index = parsed_from_event( "id".to_string(), "author".to_string(), 50, @@ -188,7 +188,7 @@ fn follow_metadata_and_index_from_event_roundtrip() { #[test] fn follow_index_from_event_propagates_parse_errors() { - let err = index_from_event( + let err = parsed_from_event( "id".to_string(), "author".to_string(), 50, diff --git a/crates/events-codec/tests/geochat.rs b/crates/events-codec/tests/geochat.rs @@ -4,7 +4,7 @@ use radroots_events::{ }; use radroots_events_codec::error::{EventEncodeError, EventParseError}; use radroots_events_codec::geochat::decode::{ - geochat_from_tags, index_from_event, metadata_from_event, + geochat_from_tags, parsed_from_event, data_from_event, }; use radroots_events_codec::geochat::encode::{geochat_build_tags, to_wire_parts}; @@ -177,7 +177,7 @@ fn geochat_metadata_and_index_from_event_roundtrip() { vec!["n".to_string(), "alex".to_string()], vec!["t".to_string(), "teleport".to_string()], ]; - let metadata = metadata_from_event( + let metadata = data_from_event( "id".to_string(), "author".to_string(), 77, @@ -193,7 +193,7 @@ fn geochat_metadata_and_index_from_event_roundtrip() { assert_eq!(metadata.geochat.geohash, "dr5rsj7"); assert!(metadata.geochat.teleported); - let index = index_from_event( + let index = parsed_from_event( "id".to_string(), "author".to_string(), 77, @@ -210,7 +210,7 @@ fn geochat_metadata_and_index_from_event_roundtrip() { #[test] fn geochat_index_from_event_propagates_parse_errors() { - let err = index_from_event( + let err = parsed_from_event( "id".to_string(), "author".to_string(), 77, diff --git a/crates/events-codec/tests/gift_wrap.rs b/crates/events-codec/tests/gift_wrap.rs @@ -3,7 +3,7 @@ use radroots_events::kinds::{KIND_GIFT_WRAP, KIND_MESSAGE}; use radroots_events_codec::error::{EventEncodeError, EventParseError}; use radroots_events_codec::gift_wrap::decode::{ - gift_wrap_from_tags, index_from_event, metadata_from_event, + gift_wrap_from_tags, parsed_from_event, data_from_event, }; use radroots_events_codec::gift_wrap::encode::{ gift_wrap_build_tags, to_wire_parts, to_wire_parts_with_kind, @@ -122,7 +122,7 @@ fn gift_wrap_metadata_and_index_from_event_roundtrip() { let gift_wrap = sample_gift_wrap(); let parts = to_wire_parts(&gift_wrap).unwrap(); - let metadata = metadata_from_event( + let metadata = data_from_event( "id".to_string(), "author".to_string(), 11, @@ -145,7 +145,7 @@ fn gift_wrap_metadata_and_index_from_event_roundtrip() { assert_eq!(metadata.gift_wrap.content, gift_wrap.content); assert_eq!(metadata.gift_wrap.expiration, gift_wrap.expiration); - let index = index_from_event( + let index = parsed_from_event( "id".to_string(), "author".to_string(), 11, @@ -241,7 +241,7 @@ fn gift_wrap_from_tags_handles_missing_expiration_and_rejects_empty_fields() { #[test] fn gift_wrap_metadata_and_index_propagate_parse_errors() { let tags = vec![vec!["p".to_string(), "pubkey".to_string()]]; - let err = metadata_from_event( + let err = data_from_event( "id".to_string(), "author".to_string(), 11, @@ -252,7 +252,7 @@ fn gift_wrap_metadata_and_index_propagate_parse_errors() { .unwrap_err(); assert!(matches!(err, EventParseError::InvalidTag("content"))); - let err = index_from_event( + let err = parsed_from_event( "id".to_string(), "author".to_string(), 11, diff --git a/crates/events-codec/tests/job_feedback.rs b/crates/events-codec/tests/job_feedback.rs @@ -5,7 +5,7 @@ use radroots_events::job_feedback::RadrootsJobFeedback; use radroots_events::kinds::{KIND_JOB_FEEDBACK, KIND_JOB_REQUEST_MIN, KIND_JOB_RESULT_MIN}; use radroots_events_codec::job::encode::JobEncodeError; use radroots_events_codec::job::error::JobParseError; -use radroots_events_codec::job::feedback::decode::{index_from_event, job_feedback_from_tags}; +use radroots_events_codec::job::feedback::decode::{parsed_from_event, job_feedback_from_tags}; use radroots_events_codec::job::feedback::encode::to_wire_parts; fn sample_feedback() -> RadrootsJobFeedback { @@ -81,7 +81,7 @@ fn job_feedback_rejects_unknown_status() { #[test] fn job_feedback_metadata_rejects_wrong_kind() { - let err = radroots_events_codec::job::feedback::decode::metadata_from_event( + let err = radroots_events_codec::job::feedback::decode::data_from_event( "id".to_string(), "author".to_string(), 1, @@ -99,7 +99,7 @@ fn job_feedback_metadata_rejects_wrong_kind() { #[test] fn job_feedback_index_from_event_propagates_parse_errors() { - let err = index_from_event( + let err = parsed_from_event( "id".to_string(), "author".to_string(), 1, diff --git a/crates/events-codec/tests/job_request.rs b/crates/events-codec/tests/job_request.rs @@ -3,7 +3,7 @@ use radroots_events::job_request::{RadrootsJobInput, RadrootsJobParam, RadrootsJ use radroots_events::kinds::{KIND_JOB_FEEDBACK, KIND_JOB_REQUEST_MIN, KIND_JOB_RESULT_MIN}; use radroots_events_codec::job::encode::JobEncodeError; use radroots_events_codec::job::error::JobParseError; -use radroots_events_codec::job::request::decode::{index_from_event, job_request_from_tags}; +use radroots_events_codec::job::request::decode::{parsed_from_event, job_request_from_tags}; use radroots_events_codec::job::request::encode::to_wire_parts; fn sample_request() -> RadrootsJobRequest { @@ -92,7 +92,7 @@ fn job_request_to_wire_parts_allows_encrypted_when_provider_present() { #[test] fn job_request_metadata_rejects_wrong_kind() { - let err = radroots_events_codec::job::request::decode::metadata_from_event( + let err = radroots_events_codec::job::request::decode::data_from_event( "id".to_string(), "author".to_string(), 1, @@ -109,7 +109,7 @@ fn job_request_metadata_rejects_wrong_kind() { #[test] fn job_request_index_from_event_propagates_parse_errors() { - let err = index_from_event( + let err = parsed_from_event( "id".to_string(), "author".to_string(), 1, diff --git a/crates/events-codec/tests/job_result.rs b/crates/events-codec/tests/job_result.rs @@ -6,7 +6,7 @@ use radroots_events::job_result::RadrootsJobResult; use radroots_events::kinds::{KIND_JOB_REQUEST_MIN, KIND_JOB_RESULT_MIN}; use radroots_events_codec::job::encode::JobEncodeError; use radroots_events_codec::job::error::JobParseError; -use radroots_events_codec::job::result::decode::{index_from_event, job_result_from_tags}; +use radroots_events_codec::job::result::decode::{parsed_from_event, job_result_from_tags}; use radroots_events_codec::job::result::encode::to_wire_parts; fn sample_result() -> RadrootsJobResult { @@ -166,7 +166,7 @@ fn job_result_requires_request_event_tag() { #[test] fn job_result_metadata_rejects_wrong_kind() { - let err = radroots_events_codec::job::result::decode::metadata_from_event( + let err = radroots_events_codec::job::result::decode::data_from_event( "id".to_string(), "author".to_string(), 1, @@ -184,7 +184,7 @@ fn job_result_metadata_rejects_wrong_kind() { #[test] fn job_result_index_from_event_propagates_parse_errors() { - let err = index_from_event( + let err = parsed_from_event( "id".to_string(), "author".to_string(), 1, diff --git a/crates/events-codec/tests/list.rs b/crates/events-codec/tests/list.rs @@ -4,7 +4,7 @@ use radroots_events::{ }; use radroots_events_codec::error::{EventEncodeError, EventParseError}; use radroots_events_codec::list::decode::{ - index_from_event, list_entries_from_tags, list_from_tags, metadata_from_event, + parsed_from_event, list_entries_from_tags, list_from_tags, data_from_event, }; use radroots_events_codec::list::encode::{list_build_tags, to_wire_parts_with_kind}; @@ -92,7 +92,7 @@ fn list_metadata_and_index_from_event_roundtrip() { let list = sample_list(); let parts = to_wire_parts_with_kind(&list, KIND_LIST_MUTE).unwrap(); - let metadata = metadata_from_event( + let metadata = data_from_event( "id".to_string(), "author".to_string(), 44, @@ -110,7 +110,7 @@ fn list_metadata_and_index_from_event_roundtrip() { assert_eq!(metadata.list.entries[0].tag, list.entries[0].tag); assert_eq!(metadata.list.entries[0].values, list.entries[0].values); - let index = index_from_event( + let index = parsed_from_event( "id".to_string(), "author".to_string(), 44, @@ -127,7 +127,7 @@ fn list_metadata_and_index_from_event_roundtrip() { #[test] fn list_index_from_event_propagates_parse_errors() { - let err = index_from_event( + let err = parsed_from_event( "id".to_string(), "author".to_string(), 44, diff --git a/crates/events-codec/tests/list_set.rs b/crates/events-codec/tests/list_set.rs @@ -5,7 +5,7 @@ use radroots_events::{ }; use radroots_events_codec::error::{EventEncodeError, EventParseError}; use radroots_events_codec::list_set::decode::{ - index_from_event, list_set_from_tags, metadata_from_event, + parsed_from_event, list_set_from_tags, data_from_event, }; use radroots_events_codec::list_set::encode::{list_set_build_tags, to_wire_parts_with_kind}; @@ -145,7 +145,7 @@ fn list_set_metadata_and_index_from_event_roundtrip() { let list_set = sample_list_set(); let parts = to_wire_parts_with_kind(&list_set, KIND_LIST_SET_FOLLOW).unwrap(); - let metadata = metadata_from_event( + let metadata = data_from_event( "id".to_string(), "author".to_string(), 44, @@ -160,7 +160,7 @@ fn list_set_metadata_and_index_from_event_roundtrip() { assert_eq!(metadata.kind, KIND_LIST_SET_FOLLOW); assert_eq!(metadata.list_set.d_tag, "members.owners"); - let index = index_from_event( + let index = parsed_from_event( "id".to_string(), "author".to_string(), 44, @@ -177,7 +177,7 @@ fn list_set_metadata_and_index_from_event_roundtrip() { #[test] fn list_set_index_from_event_propagates_parse_errors() { - let err = index_from_event( + let err = parsed_from_event( "id".to_string(), "author".to_string(), 44, diff --git a/crates/events-codec/tests/message.rs b/crates/events-codec/tests/message.rs @@ -5,7 +5,7 @@ use radroots_events::{ }; use radroots_events_codec::error::{EventEncodeError, EventParseError}; use radroots_events_codec::message::decode::{ - index_from_event, message_from_tags, metadata_from_event, + parsed_from_event, message_from_tags, data_from_event, }; use radroots_events_codec::message::encode::{message_build_tags, to_wire_parts}; @@ -196,7 +196,7 @@ fn message_metadata_and_index_from_event_roundtrip() { ], vec!["subject".to_string(), "topic".to_string()], ]; - let metadata = metadata_from_event( + let metadata = data_from_event( "id".to_string(), "author".to_string(), 77, @@ -213,7 +213,7 @@ fn message_metadata_and_index_from_event_roundtrip() { assert_eq!(metadata.message.content, "hello"); assert_eq!(metadata.message.subject.as_deref(), Some("topic")); - let index = index_from_event( + let index = parsed_from_event( "id".to_string(), "author".to_string(), 77, @@ -230,7 +230,7 @@ fn message_metadata_and_index_from_event_roundtrip() { #[test] fn message_index_from_event_propagates_parse_errors() { - let err = index_from_event( + let err = parsed_from_event( "id".to_string(), "author".to_string(), 77, diff --git a/crates/events-codec/tests/message_file.rs b/crates/events-codec/tests/message_file.rs @@ -5,7 +5,7 @@ use radroots_events::message_file::{RadrootsMessageFile, RadrootsMessageFileDime use radroots_events_codec::error::{EventEncodeError, EventParseError}; use radroots_events_codec::message_file::decode::{ - index_from_event, message_file_from_tags, metadata_from_event, + parsed_from_event, message_file_from_tags, data_from_event, }; use radroots_events_codec::message_file::encode::{ message_file_build_tags, to_wire_parts, to_wire_parts_with_kind, @@ -331,7 +331,7 @@ fn message_file_from_tags_rejects_invalid_optional_tags() { fn message_file_metadata_and_index_from_event_roundtrip() { let message = sample_message_file(); let parts = to_wire_parts(&message).unwrap(); - let metadata = metadata_from_event( + let metadata = data_from_event( "id".to_string(), "author".to_string(), 77, @@ -347,7 +347,7 @@ fn message_file_metadata_and_index_from_event_roundtrip() { assert_eq!(metadata.message_file.file_type, "image/jpeg"); assert_eq!(metadata.message_file.recipients.len(), 2); - let index = index_from_event( + let index = parsed_from_event( "id".to_string(), "author".to_string(), 77, @@ -364,7 +364,7 @@ fn message_file_metadata_and_index_from_event_roundtrip() { #[test] fn message_file_index_from_event_propagates_parse_errors() { - let err = index_from_event( + let err = parsed_from_event( "id".to_string(), "author".to_string(), 77, diff --git a/crates/events-codec/tests/post.rs b/crates/events-codec/tests/post.rs @@ -4,7 +4,7 @@ use radroots_events::{ }; use radroots_events_codec::error::{EventEncodeError, EventParseError}; use radroots_events_codec::post::decode::{ - index_from_event, metadata_from_event, post_from_content, + parsed_from_event, data_from_event, post_from_content, }; use radroots_events_codec::post::encode::to_wire_parts; @@ -50,7 +50,7 @@ fn post_from_content_requires_kind_and_content() { #[test] fn post_metadata_and_index_from_event_roundtrip() { - let metadata = metadata_from_event( + let metadata = data_from_event( "id".to_string(), "author".to_string(), 77, @@ -65,7 +65,7 @@ fn post_metadata_and_index_from_event_roundtrip() { assert_eq!(metadata.kind, KIND_POST); assert_eq!(metadata.post.content, "hello"); - let index = index_from_event( + let index = parsed_from_event( "id".to_string(), "author".to_string(), 77, @@ -86,7 +86,7 @@ fn post_metadata_and_index_from_event_roundtrip() { #[test] fn post_index_from_event_propagates_parse_errors() { - let err = index_from_event( + let err = parsed_from_event( "id".to_string(), "author".to_string(), 77, diff --git a/crates/events-codec/tests/profile.rs b/crates/events-codec/tests/profile.rs @@ -43,7 +43,7 @@ fn profile_from_content_rejects_invalid_json() { #[test] fn profile_metadata_rejects_wrong_kind() { - let err = radroots_events_codec::profile::decode::metadata_from_event( + let err = radroots_events_codec::profile::decode::data_from_event( "id".to_string(), "author".to_string(), 1, @@ -64,7 +64,7 @@ fn profile_metadata_rejects_wrong_kind() { #[test] fn profile_metadata_reads_profile_type_tag() { - let metadata = radroots_events_codec::profile::decode::metadata_from_event( + let metadata = radroots_events_codec::profile::decode::data_from_event( "id".to_string(), "author".to_string(), 1, @@ -82,7 +82,7 @@ fn profile_metadata_reads_profile_type_tag() { #[test] fn profile_metadata_reads_profile_type_any_tag() { - let metadata = radroots_events_codec::profile::decode::metadata_from_event( + let metadata = radroots_events_codec::profile::decode::data_from_event( "id".to_string(), "author".to_string(), 1, @@ -100,7 +100,7 @@ fn profile_metadata_reads_profile_type_any_tag() { #[test] fn profile_metadata_reads_profile_type_radrootsd_tag() { - let metadata = radroots_events_codec::profile::decode::metadata_from_event( + let metadata = radroots_events_codec::profile::decode::data_from_event( "id".to_string(), "author".to_string(), 1, diff --git a/crates/events-codec/tests/reaction.rs b/crates/events-codec/tests/reaction.rs @@ -9,7 +9,7 @@ use radroots_events::{ use radroots_events_codec::error::{EventEncodeError, EventParseError}; use radroots_events_codec::event_ref::{build_event_ref_tag, push_nip10_ref_tags}; use radroots_events_codec::reaction::decode::{ - index_from_event, metadata_from_event, reaction_from_tags, + parsed_from_event, data_from_event, reaction_from_tags, }; use radroots_events_codec::reaction::encode::{ reaction_build_tags, to_wire_parts, to_wire_parts_with_kind, @@ -162,7 +162,7 @@ fn reaction_metadata_and_index_from_event_roundtrip() { let mut tags = Vec::new(); push_nip10_ref_tags(&mut tags, &root, "e", "p", "k", "a"); - let metadata = metadata_from_event( + let metadata = data_from_event( "id".to_string(), "author".to_string(), 99, @@ -178,7 +178,7 @@ fn reaction_metadata_and_index_from_event_roundtrip() { assert_eq!(metadata.reaction.content, "+"); assert_eq!(metadata.reaction.root.id, root.id); - let index = index_from_event( + let index = parsed_from_event( "id".to_string(), "author".to_string(), 99, @@ -196,7 +196,7 @@ fn reaction_metadata_and_index_from_event_roundtrip() { #[test] fn reaction_metadata_and_index_propagate_parse_errors() { let tags = vec![vec!["e".to_string(), "root".to_string()]]; - let err = metadata_from_event( + let err = data_from_event( "id".to_string(), "author".to_string(), 99, @@ -213,7 +213,7 @@ fn reaction_metadata_and_index_propagate_parse_errors() { } )); - let err = index_from_event( + let err = parsed_from_event( "id".to_string(), "author".to_string(), 99, diff --git a/crates/events-codec/tests/seal.rs b/crates/events-codec/tests/seal.rs @@ -2,7 +2,7 @@ use radroots_events::kinds::{KIND_MESSAGE, KIND_SEAL}; use radroots_events::seal::RadrootsSeal; use radroots_events_codec::error::{EventEncodeError, EventParseError}; -use radroots_events_codec::seal::decode::{index_from_event, metadata_from_event, seal_from_parts}; +use radroots_events_codec::seal::decode::{parsed_from_event, data_from_event, seal_from_parts}; use radroots_events_codec::seal::encode::{ seal_build_tags, to_wire_parts, to_wire_parts_with_kind, }; @@ -63,7 +63,7 @@ fn seal_from_parts_requires_content() { #[test] fn seal_metadata_and_index_from_event_roundtrip() { - let metadata = metadata_from_event( + let metadata = data_from_event( "id".to_string(), "author".to_string(), 14, @@ -78,7 +78,7 @@ fn seal_metadata_and_index_from_event_roundtrip() { assert_eq!(metadata.kind, KIND_SEAL); assert_eq!(metadata.seal.content, "payload"); - let index = index_from_event( + let index = parsed_from_event( "id".to_string(), "author".to_string(), 14, @@ -95,7 +95,7 @@ fn seal_metadata_and_index_from_event_roundtrip() { #[test] fn seal_index_from_event_propagates_parse_errors() { - let err = index_from_event( + let err = parsed_from_event( "id".to_string(), "author".to_string(), 14, diff --git a/crates/events-codec/tests/structured_decode.rs b/crates/events-codec/tests/structured_decode.rs @@ -24,29 +24,29 @@ use radroots_events::resource_cap::{ }; use radroots_events::tags::TAG_D; use radroots_events_codec::coop::decode::{ - coop_from_event, index_from_event as coop_index_from_event, - metadata_from_event as coop_metadata_from_event, + coop_from_event, parsed_from_event as coop_index_from_event, + data_from_event as coop_metadata_from_event, }; use radroots_events_codec::document::decode::{ - document_from_event, index_from_event as document_index_from_event, - metadata_from_event as document_metadata_from_event, + document_from_event, parsed_from_event as document_index_from_event, + data_from_event as document_metadata_from_event, }; use radroots_events_codec::error::EventParseError; use radroots_events_codec::farm::decode::{ - farm_from_event, index_from_event as farm_index_from_event, - metadata_from_event as farm_metadata_from_event, + farm_from_event, parsed_from_event as farm_index_from_event, + data_from_event as farm_metadata_from_event, }; use radroots_events_codec::plot::decode::{ - index_from_event as plot_index_from_event, metadata_from_event as plot_metadata_from_event, + parsed_from_event as plot_index_from_event, data_from_event as plot_metadata_from_event, plot_from_event, }; use radroots_events_codec::resource_area::decode::{ - index_from_event as resource_area_index_from_event, - metadata_from_event as resource_area_metadata_from_event, resource_area_from_event, + parsed_from_event as resource_area_index_from_event, + data_from_event as resource_area_metadata_from_event, resource_area_from_event, }; use radroots_events_codec::resource_cap::decode::{ - index_from_event as resource_cap_index_from_event, - metadata_from_event as resource_cap_metadata_from_event, resource_harvest_cap_from_event, + parsed_from_event as resource_cap_index_from_event, + data_from_event as resource_cap_metadata_from_event, resource_harvest_cap_from_event, }; const TEST_NPUB: &str = "npub1tr33s4tj2le2kk9yzhfphdtss26gyn8kv7savnnjhj794nqp333q8e7grr";