jerry/buzz
1
0
Fork 0
mirror of https://github.com/block/buzz.git synced 2026-11-02 23:41:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(archive): apply rustfmt

Browse Source 
Co-authored-by: Will Pfleger <pfleger.will@gmail.com>
Signed-off-by: Will Pfleger <pfleger.will@gmail.com>
This commit is contained in:
npub1mn7jgtj4w2pd0g0zeuhxsa6jy6p0rewxz4kujt98my82ahfmp72sxjexk7
2026-07-06 17:39:09 -04:00
parent 5f96c738d8
commit 617137a7d5
2 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
desktop/src-tauri/src/archive/mod.rs
View File

@@ -398,10 +398,7 @@ async fn probe_event_readable(state: &AppState, event_id: &str) -> Result<(), St
/// `useAgentMetricArchiveSeed` (kind 44200) instead of the former
/// list → merge-in-TS → create pattern.
#[tauri::command]
pub fn merge_save_subscription_kinds(
state: State<'_, AppState>,
kind: u32,
) -> Result<(), String> {
pub fn merge_save_subscription_kinds(state: State<'_, AppState>, kind: u32) -> Result<(), String> {
if kind > u32::from(u16::MAX) {
return Err(format!("kind {kind} is out of the valid range 0..=65535"));
}
@@ -1177,8 +1174,7 @@ mod tests {
let ev = make_turn_metric_event(&owner_keys, &agent_keys);
let cand = candidate(&ev, ScopeType::OwnerP, &owner_pk);
let plan =
plan_archive(vec![cand], &owner_pk, relay_url, &conn).unwrap();
let plan = plan_archive(vec![cand], &owner_pk, relay_url, &conn).unwrap();
// Must be in persistent buckets, NOT ephemeral list.
assert_eq!(plan.buckets.len(), 1, "kind-44200 must land in a bucket");
@@ -1206,11 +1202,18 @@ mod tests {
let ev = make_observer_frame(&owner_keys, &agent_keys, OBSERVER_FRAME_TELEMETRY);
let cand = candidate(&ev, ScopeType::OwnerP, &owner_pk);
let plan =
plan_archive(vec![cand], &owner_pk, relay_url, &conn).unwrap();
let plan = plan_archive(vec![cand], &owner_pk, relay_url, &conn).unwrap();
assert_eq!(plan.buckets.len(), 0, "kind-24200 must NOT land in a bucket");
assert_eq!(plan.ephemeral.len(), 1, "kind-24200 must be on the ephemeral path");
assert_eq!(
plan.buckets.len(),
0,
"kind-24200 must NOT land in a bucket"
);
assert_eq!(
plan.ephemeral.len(),
1,
"kind-24200 must be on the ephemeral path"
);
}
/// Decrypt success: plaintext payload JSON is stored, not raw ciphertext.
@@ -1242,16 +1245,15 @@ mod tests {
.query_row("SELECT raw_json FROM archived_events", [], |r| r.get(0))
.unwrap();
// Plaintext JSON should be a valid object with "harness" key.
let parsed: serde_json::Value = serde_json::from_str(&raw_json)
.expect("stored raw_json must be valid JSON");
let parsed: serde_json::Value =
serde_json::from_str(&raw_json).expect("stored raw_json must be valid JSON");
assert_eq!(
parsed["harness"], "test-harness",
"stored plaintext must decode to AgentTurnMetricPayload"
);
// Sanity: must NOT be the original NIP-44 ciphertext (which is not JSON).
assert_ne!(
raw_json,
ev.content,
raw_json, ev.content,
"stored content must differ from original ciphertext"
);
}
@@ -1280,7 +1282,10 @@ mod tests {
&wrong_keys, // wrong key → decrypt fails
);
assert_eq!(result.persisted, 0, "decrypt failure must not persist the event");
assert_eq!(
result.persisted, 0,
"decrypt failure must not persist the event"
);
assert_eq!(result.dropped, 1, "decrypt failure must count as dropped");
let event_count: i64 = conn

32
desktop/src-tauri/src/archive/pipeline.rs
View File

@@ -315,28 +315,26 @@ pub(super) fn commit_archive(
// the archive without needing the owner key. Fail-closed: if
// decrypt fails for any reason, drop the event — never store
// ciphertext or partial output.
let stored_json = if p.event.kind.as_u16() as u64
== super::KIND_AGENT_TURN_METRIC as u64
{
match buzz_core_pkg::agent_turn_metric::decrypt_agent_turn_metric(
owner_keys,
&p.event,
) {
Ok(payload) => match serde_json::to_string(&payload) {
Ok(json) => json,
let stored_json =
if p.event.kind.as_u16() as u64 == super::KIND_AGENT_TURN_METRIC as u64 {
match buzz_core_pkg::agent_turn_metric::decrypt_agent_turn_metric(
owner_keys, &p.event,
) {
Ok(payload) => match serde_json::to_string(&payload) {
Ok(json) => json,
Err(_) => {
dropped += 1;
continue;
}
},
Err(_) => {
dropped += 1;
continue;
}
},
Err(_) => {
dropped += 1;
continue;
}
}
} else {
p.raw_json.clone()
};
} else {
p.raw_json.clone()
};
// The relay returning this event for {ids, #h/#e/#p, kinds} IS the
// proof of scope membership. Use scope_value directly; no local