Claude
b0698e0a66
`tools/` is for libraries (arti-build); shell-based interop harnesses
that drive the `amy` binary belong with the CLI module. New layout:
cli/tests/
├── lib.sh # shared logging + result tracking
├── headless/helpers.sh # shared amy_a / amy_json / assertions
├── marmot/ # MLS group-messaging interop (vs whitenoise-rs)
│ ├── marmot-interop.sh
│ ├── marmot-interop-headless.sh
│ ├── setup.sh
│ ├── tests-create.sh
│ ├── tests-manage.sh
│ ├── tests-extras.sh
│ └── patches/
└── dm/ # NIP-17 DM interop (amy ↔ amy)
├── dm-interop-headless.sh
├── setup.sh
└── tests-dm.sh
Per-suite changes:
- Each suite owns its own setup.sh; previously the Marmot setup was at
headless/setup.sh and the DM setup at headless/setup-dm.sh, which
implied shared infra they don't actually share.
- `cli/tests/lib.sh` and `cli/tests/headless/helpers.sh` are the only
shared bits across suites.
- The DM harness still reuses Marmot's `start_local_relay` /
`stop_local_relay` (sourced via `../marmot/setup.sh`) — same relay
binary, no duplication.
- All sourcing paths updated; REPO_ROOT now climbs three levels (was
two when the harness lived under `tools/`); patches/ is now a sibling
of marmot/setup.sh rather than under marmot/headless/.
- `.gitignore` updated to cover both suites' state dirs.
cli/ROADMAP.md and cli/tests/README.md updated to point at the new paths.
No behavioural change — every test runs the same code; only the file
layout and source paths moved.
27 lines
1.4 KiB
Diff
27 lines
1.4 KiB
Diff
--- a/src/whitenoise/event_processor/account_event_processor.rs
|
|
+++ b/src/whitenoise/event_processor/account_event_processor.rs
|
|
@@ -178,7 +178,22 @@
|
|
}
|
|
Err(e) => {
|
|
// Handle retry logic for actual processing errors
|
|
- if retry_info.should_retry() {
|
|
+ // marmot-interop-headless patch: MLS errors that come from
|
|
+ // mdk are ALREADY terminal — mdk doesn't retry internally, so
|
|
+ // any Err it returns (Unprocessable, PreviouslyFailed, decrypt
|
|
+ // failure, group-not-found, etc.) is provably permanent.
|
|
+ // Retrying those 10 times with exponential backoff (total
|
|
+ // ~17 min) just blocks later decryptable commits behind a
|
|
+ // queue of doomed retries, so every later join / rename /
|
|
+ // leave propagation races the test timeout. Treat them all
|
|
+ // as one-shot: log once, move on.
|
|
+ let is_terminal = matches!(
|
|
+ e,
|
|
+ WhitenoiseError::MlsMessageUnprocessable(_)
|
|
+ | WhitenoiseError::MlsMessagePreviouslyFailed
|
|
+ | WhitenoiseError::MdkCoreError(_),
|
|
+ );
|
|
+ if !is_terminal && retry_info.should_retry() {
|
|
self.schedule_retry(event, source, retry_info, e);
|
|
} else {
|
|
tracing::error!(
|