diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2026-02-23 11:17:10 +0000 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2026-02-23 12:05:29 +0000 |
| commit | 70749ea9df1f6061c332112c617b615f91d79d48 (patch) | |
| tree | 6f4ace061681d8356ea79eb782fddb36c1f31d23 /src/purgatory/sync/context.rs | |
| parent | 9f15929b10825c2f55434a98794fc551794cad2b (diff) | |
fix: re-process hot-cache maintainer announcements after git push promotion
When an owner announcement is promoted from purgatory via a git push,
any maintainer announcements sitting in the rejected_events_index hot
cache were never re-processed. The invalidate_and_get call only existed
in SyncManager::process_event_static (the nostr sync path); the git push
promotion path (http -> handlers -> git::sync) had no access to the
rejected_events_index at all.
Thread rejected_events_index and write_policy through the git push path:
- process_purgatory_announcements: after saving the promoted announcement,
parse its maintainers tag and call invalidate_and_get() for each, then
re-process any returned hot-cache events via admit_event + save
- process_newly_available_git_data: accept optional write_policy and
rejected_events_index, pass them through to process_purgatory_announcements
- handle_receive_pack: accept Arc<Nip34WritePolicy> and
Arc<RejectedEventsIndex>, pass them to process_newly_available_git_data
- HttpService / run_server: carry the two new fields, clone into each
handle_receive_pack call
- main.rs: obtain rejected_events_index from sync_manager before moving
it into its task; wrap write_policy in Arc for the HTTP server
- RealSyncContext::process_newly_available_git_data: pass None for both
new params (purgatory sync path already handles this via
SyncManager::process_event_static)
Also rewrite the maintainer_reprocessing integration tests to correctly
exercise the hot-cache path now that announcements require git data
before being released from purgatory:
- Start relay_b with relay_a as bootstrap so its SyncManager syncs
maintainer announcements via negentropy before the owner git push
- Use push_unique_git_data_to_relay (new helper) to give each maintainer
a distinct commit hash, preventing git from skipping pack transfer
- Make wait_for_event_on_relay poll in a retry loop so transient timing
gaps between DB write and query do not cause false negatives
Diffstat (limited to 'src/purgatory/sync/context.rs')
| -rw-r--r-- | src/purgatory/sync/context.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/purgatory/sync/context.rs b/src/purgatory/sync/context.rs index 3568e89..ece8cd6 100644 --- a/src/purgatory/sync/context.rs +++ b/src/purgatory/sync/context.rs | |||
| @@ -474,7 +474,9 @@ impl SyncContext for RealSyncContext { | |||
| 474 | source_repo_path: &Path, | 474 | source_repo_path: &Path, |
| 475 | new_oids: &HashSet<String>, | 475 | new_oids: &HashSet<String>, |
| 476 | ) -> Result<ProcessResult> { | 476 | ) -> Result<ProcessResult> { |
| 477 | // Delegate to the unified function from git::sync | 477 | // Delegate to the unified function from git::sync. |
| 478 | // Pass None for write_policy and rejected_events_index: the purgatory sync path | ||
| 479 | // already handles hot-cache re-processing via SyncManager::process_event_static. | ||
| 478 | let result = crate::git::sync::process_newly_available_git_data( | 480 | let result = crate::git::sync::process_newly_available_git_data( |
| 479 | source_repo_path, | 481 | source_repo_path, |
| 480 | new_oids, | 482 | new_oids, |
| @@ -482,6 +484,8 @@ impl SyncContext for RealSyncContext { | |||
| 482 | self.local_relay.as_ref(), | 484 | self.local_relay.as_ref(), |
| 483 | &self.purgatory, | 485 | &self.purgatory, |
| 484 | &self.git_data_path, | 486 | &self.git_data_path, |
| 487 | None, | ||
| 488 | None, | ||
| 485 | ) | 489 | ) |
| 486 | .await?; | 490 | .await?; |
| 487 | 491 | ||