mirror of
https://github.com/block/buzz.git
synced 2026-08-18 06:50:31 +02:00
fix: complete sprout→buzz rename in persona event files
Missed during rebase: sprout_core→buzz_core_pkg imports in persona_events.rs and migration.rs, sprout-desktop→buzz-desktop in log messages, and cargo fmt on e2e_persona.rs.
This commit is contained in:
@@ -15,8 +15,8 @@
|
||||
|
||||
use std::time::Duration;
|
||||
|
||||
use nostr::{Alphabet, EventBuilder, Filter, Keys, Kind, SingleLetterTag, Tag, Timestamp};
|
||||
use buzz_test_client::BuzzTestClient;
|
||||
use nostr::{Alphabet, EventBuilder, Filter, Keys, Kind, SingleLetterTag, Tag, Timestamp};
|
||||
|
||||
const PERSONA_KIND: u16 = 30175;
|
||||
|
||||
@@ -61,9 +61,7 @@ async fn test_persona_publish_and_query() {
|
||||
})
|
||||
.to_string();
|
||||
|
||||
let mut client = BuzzTestClient::connect(&url, &keys)
|
||||
.await
|
||||
.expect("connect");
|
||||
let mut client = BuzzTestClient::connect(&url, &keys).await.expect("connect");
|
||||
|
||||
// Publish persona event
|
||||
let event = persona_event(&keys, &d_tag, &content);
|
||||
@@ -108,9 +106,7 @@ async fn test_persona_nip33_replacement_newer_wins() {
|
||||
let keys = Keys::generate();
|
||||
let d_tag = format!("replace-{}", &uuid::Uuid::new_v4().to_string()[..8]);
|
||||
|
||||
let mut client = BuzzTestClient::connect(&url, &keys)
|
||||
.await
|
||||
.expect("connect");
|
||||
let mut client = BuzzTestClient::connect(&url, &keys).await.expect("connect");
|
||||
|
||||
// Publish older version
|
||||
let old_content = r#"{"name":"old","display_name":"Old","description":"Old version"}"#;
|
||||
@@ -155,9 +151,7 @@ async fn test_persona_nip33_older_does_not_replace_newer() {
|
||||
let keys = Keys::generate();
|
||||
let d_tag = format!("no-replace-{}", &uuid::Uuid::new_v4().to_string()[..8]);
|
||||
|
||||
let mut client = BuzzTestClient::connect(&url, &keys)
|
||||
.await
|
||||
.expect("connect");
|
||||
let mut client = BuzzTestClient::connect(&url, &keys).await.expect("connect");
|
||||
|
||||
// Publish newer version first
|
||||
let new_content = r#"{"name":"new","display_name":"New","description":"Newer"}"#;
|
||||
@@ -204,9 +198,7 @@ async fn test_persona_rejects_empty_d_tag() {
|
||||
let url = relay_url();
|
||||
let keys = Keys::generate();
|
||||
|
||||
let mut client = BuzzTestClient::connect(&url, &keys)
|
||||
.await
|
||||
.expect("connect");
|
||||
let mut client = BuzzTestClient::connect(&url, &keys).await.expect("connect");
|
||||
|
||||
let event = EventBuilder::new(
|
||||
Kind::Custom(PERSONA_KIND),
|
||||
@@ -233,9 +225,7 @@ async fn test_persona_rejects_missing_d_tag() {
|
||||
let url = relay_url();
|
||||
let keys = Keys::generate();
|
||||
|
||||
let mut client = BuzzTestClient::connect(&url, &keys)
|
||||
.await
|
||||
.expect("connect");
|
||||
let mut client = BuzzTestClient::connect(&url, &keys).await.expect("connect");
|
||||
|
||||
// No d-tag at all
|
||||
let event = EventBuilder::new(
|
||||
@@ -257,9 +247,7 @@ async fn test_persona_rejects_d_tag_too_long() {
|
||||
let url = relay_url();
|
||||
let keys = Keys::generate();
|
||||
|
||||
let mut client = BuzzTestClient::connect(&url, &keys)
|
||||
.await
|
||||
.expect("connect");
|
||||
let mut client = BuzzTestClient::connect(&url, &keys).await.expect("connect");
|
||||
|
||||
// 65 characters — exceeds the 64-char limit
|
||||
let long_slug = "a".repeat(65);
|
||||
@@ -288,9 +276,7 @@ async fn test_persona_rejects_d_tag_uppercase() {
|
||||
let url = relay_url();
|
||||
let keys = Keys::generate();
|
||||
|
||||
let mut client = BuzzTestClient::connect(&url, &keys)
|
||||
.await
|
||||
.expect("connect");
|
||||
let mut client = BuzzTestClient::connect(&url, &keys).await.expect("connect");
|
||||
|
||||
let event = persona_event(
|
||||
&keys,
|
||||
@@ -312,9 +298,7 @@ async fn test_persona_rejects_d_tag_special_chars() {
|
||||
let url = relay_url();
|
||||
let keys = Keys::generate();
|
||||
|
||||
let mut client = BuzzTestClient::connect(&url, &keys)
|
||||
.await
|
||||
.expect("connect");
|
||||
let mut client = BuzzTestClient::connect(&url, &keys).await.expect("connect");
|
||||
|
||||
let event = persona_event(
|
||||
&keys,
|
||||
@@ -336,9 +320,7 @@ async fn test_persona_rejects_d_tag_starting_with_underscore() {
|
||||
let url = relay_url();
|
||||
let keys = Keys::generate();
|
||||
|
||||
let mut client = BuzzTestClient::connect(&url, &keys)
|
||||
.await
|
||||
.expect("connect");
|
||||
let mut client = BuzzTestClient::connect(&url, &keys).await.expect("connect");
|
||||
|
||||
// Slug must start with [a-z0-9], not underscore
|
||||
let event = persona_event(
|
||||
@@ -361,9 +343,7 @@ async fn test_persona_accepts_valid_slugs() {
|
||||
let url = relay_url();
|
||||
let keys = Keys::generate();
|
||||
|
||||
let mut client = BuzzTestClient::connect(&url, &keys)
|
||||
.await
|
||||
.expect("connect");
|
||||
let mut client = BuzzTestClient::connect(&url, &keys).await.expect("connect");
|
||||
|
||||
// Various valid slug patterns
|
||||
let valid_slugs = [
|
||||
@@ -400,9 +380,7 @@ async fn test_persona_multiple_per_author() {
|
||||
let url = relay_url();
|
||||
let keys = Keys::generate();
|
||||
|
||||
let mut client = BuzzTestClient::connect(&url, &keys)
|
||||
.await
|
||||
.expect("connect");
|
||||
let mut client = BuzzTestClient::connect(&url, &keys).await.expect("connect");
|
||||
|
||||
// Publish two different personas (different d-tags)
|
||||
let slug_a = format!("persona-a-{}", &uuid::Uuid::new_v4().to_string()[..8]);
|
||||
|
||||
@@ -7,7 +7,7 @@ use std::collections::BTreeMap;
|
||||
|
||||
use nostr::{EventBuilder, Kind, Tag};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use sprout_core::kind::KIND_PERSONA;
|
||||
use buzz_core_pkg::kind::KIND_PERSONA;
|
||||
|
||||
use super::PersonaRecord;
|
||||
use crate::app_state::AppState;
|
||||
|
||||
@@ -366,7 +366,7 @@ fn load_from_retention(
|
||||
Ok(record) => records.push(record),
|
||||
Err(e) => {
|
||||
eprintln!(
|
||||
"sprout-desktop: retention: skipping malformed persona event (d_tag={}): {e}",
|
||||
"buzz-desktop: retention: skipping malformed persona event (d_tag={}): {e}",
|
||||
row.d_tag
|
||||
);
|
||||
}
|
||||
|
||||
@@ -944,11 +944,11 @@ pub fn migrate_personas_to_events(app: &tauri::AppHandle, keys: &nostr::Keys) {
|
||||
Ok(0) => {}
|
||||
Ok(migrated) => {
|
||||
eprintln!(
|
||||
"sprout-desktop: persona-event-migration: {migrated} personas migrated to retention"
|
||||
"buzz-desktop: persona-event-migration: {migrated} personas migrated to retention"
|
||||
);
|
||||
}
|
||||
Err(e) => {
|
||||
eprintln!("sprout-desktop: persona-event-migration: {e}");
|
||||
eprintln!("buzz-desktop: persona-event-migration: {e}");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -965,7 +965,7 @@ fn migrate_personas_in_dir(base_dir: &Path, keys: &nostr::Keys) -> Result<u32, S
|
||||
PersonaRecord,
|
||||
};
|
||||
use nostr::JsonUtil;
|
||||
use sprout_core::kind::KIND_PERSONA;
|
||||
use buzz_core_pkg::kind::KIND_PERSONA;
|
||||
|
||||
let pubkey = keys.public_key().to_hex();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user