Files
buzz/desktop/src-tauri
Taylor Ho 8487e9fa5d Merge origin/main into tho/nip49-ux-review
Conflict resolutions:
- desktop/src-tauri/src/relay.rs: take main's refactor that removes
  submit_signed_event in favor of the exported
  submit_signed_event_at_with_keys (relay/submit.rs); the auto-merge of
  submit.rs already carried this branch's NIP-49 egress guard into that
  function, so the guard coverage is preserved at the new choke point
- desktop/src/testing/e2eBridge.ts: keep both sides' additions (this
  branch's MOCK_NCRYPTSEC/MOCK_BACKUP_PASSPHRASE fixtures and main's
  personaSharePublicationCallCount counter)

Follow-up adjustments for main's refactor:
- egress_guard_tests.rs: retarget boundary 3 injection test from the
  removed relay::submit_signed_event to submit_signed_event_at_with_keys;
  update EVENTS_INVENTORY (relay.rs 3→2 sites, submit.rs shared funnel)
  and add a test-fixture row for the mock relay route main added in
  commands/personas/sharing.rs tests
- egress_guard.rs: update the boundary table for the moved funnel
- relay_admission.rs: update doc comment for the renamed entry point

Signed-off-by: Taylor Ho <taylorkmho@gmail.com>
2026-07-28 15:42:23 -07:00
..