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.
25 lines
1.2 KiB
Diff
25 lines
1.2 KiB
Diff
--- a/src/whitenoise/relays.rs
|
|
+++ b/src/whitenoise/relays.rs
|
|
@@ -98,6 +98,21 @@
|
|
}
|
|
|
|
pub(crate) fn defaults() -> Vec<Relay> {
|
|
+ // marmot-interop-headless patch: honour $WHITENOISE_DISCOVERY_RELAYS
|
|
+ // (comma-separated list) when present so newly created accounts only
|
|
+ // ever get our loopback relay baked into their NIP-65 / inbox /
|
|
+ // key-package lists. Without this override, `create-identity` stamps
|
|
+ // the hard-coded public set into the account's relay lists, and every
|
|
+ // later activate / publish burns connection budget on unreachable
|
|
+ // sockets — enough to break inbox-plane activation and drop kind:1059.
|
|
+ if let Ok(from_env) = std::env::var("WHITENOISE_DISCOVERY_RELAYS") {
|
|
+ let parsed: Vec<Relay> = from_env
|
|
+ .split(',').map(str::trim).filter(|s| !s.is_empty())
|
|
+ .filter_map(|u| RelayUrl::parse(u).ok())
|
|
+ .map(|url| Relay::new(&url))
|
|
+ .collect();
|
|
+ if !parsed.is_empty() { return parsed; }
|
|
+ }
|
|
let urls: &[&str] = if cfg!(debug_assertions) {
|
|
&["ws://localhost:8080", "ws://localhost:7777"]
|
|
} else {
|