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.
24 lines
956 B
Diff
24 lines
956 B
Diff
--- a/src/relay_control/discovery.rs
|
|
+++ b/src/relay_control/discovery.rs
|
|
@@ -87,6 +87,20 @@
|
|
|
|
/// Initial curated relay set from the planning doc.
|
|
pub(crate) fn curated_default_relays() -> Vec<RelayUrl> {
|
|
+ // marmot-interop-headless patch: honour $WHITENOISE_DISCOVERY_RELAYS
|
|
+ // (comma-separated list) when present, so the harness can force wnd
|
|
+ // to use a loopback relay instead of the baked-in public set.
|
|
+ if let Ok(from_env) = std::env::var("WHITENOISE_DISCOVERY_RELAYS") {
|
|
+ let parsed: Vec<RelayUrl> = from_env
|
|
+ .split(',')
|
|
+ .map(str::trim)
|
|
+ .filter(|s| !s.is_empty())
|
|
+ .filter_map(|u| RelayUrl::parse(u).ok())
|
|
+ .collect();
|
|
+ if !parsed.is_empty() {
|
|
+ return parsed;
|
|
+ }
|
|
+ }
|
|
[
|
|
"wss://index.hzrd149.com",
|
|
"wss://indexer.coracle.social",
|