From c2f24a5213c3918273ef03c8c8d7d7c86846c880 Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 7 May 2026 13:12:34 +0000 Subject: [PATCH] refactor: rename quartz-relay module to geode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The relay implementation now stands as its own module. Fitting brand for a Nostr relay shipped alongside the Quartz library — a geode is a rock that holds quartz inside. - Rename module directory quartz-relay/ -> geode/. - Rename Gradle module path :quartz-relay -> :geode (settings.gradle). - Rename Kotlin package com.vitorpamplona.quartz.relay -> com.vitorpamplona.geode. - Rename application name + main class binding to match. - Update the relay's NIP-11 advertised name to "geode" and the software URL to /tree/main/geode. Test asserting the doc updated. - Refresh comments / Main.kt usage line / config.example.toml header. - Update consumers: quartz/build.gradle.kts dependency path, and quartz NostrClient tests that import the in-process RelayHub. --- {quartz-relay => geode}/build.gradle.kts | 4 ++-- {quartz-relay => geode}/config.example.toml | 12 ++++++------ .../com/vitorpamplona/geode}/LocalRelayServer.kt | 6 +++--- .../src/main/kotlin/com/vitorpamplona/geode}/Main.kt | 10 +++++----- .../main/kotlin/com/vitorpamplona/geode}/Relay.kt | 8 ++++---- .../main/kotlin/com/vitorpamplona/geode}/RelayHub.kt | 2 +- .../kotlin/com/vitorpamplona/geode}/RelayInfo.kt | 8 ++++---- .../com/vitorpamplona/geode}/config/RelayConfig.kt | 8 ++++---- .../vitorpamplona/geode}/fixtures/RelayFixtures.kt | 2 +- .../vitorpamplona/geode}/fixtures/SyntheticEvents.kt | 2 +- .../geode}/persistence/RelayStateStore.kt | 2 +- .../vitorpamplona/geode}/server/Nip86HttpRoute.kt | 2 +- .../geode}/server/WebSocketSessionPump.kt | 2 +- .../com/vitorpamplona/geode}/GracefulShutdownTest.kt | 2 +- .../com/vitorpamplona/geode}/LocalRelayServerTest.kt | 6 +++--- .../com/vitorpamplona/geode}/Nip01ComplianceTest.kt | 4 ++-- .../com/vitorpamplona/geode}/Nip09DeletionTest.kt | 2 +- .../com/vitorpamplona/geode}/Nip40ExpirationTest.kt | 2 +- .../com/vitorpamplona/geode}/Nip62VanishTest.kt | 2 +- .../com/vitorpamplona/geode}/Nip77NegentropyTest.kt | 2 +- .../vitorpamplona/geode}/admin/Nip86EndToEndTest.kt | 6 +++--- .../vitorpamplona/geode}/config/RelayConfigTest.kt | 4 ++-- .../com/vitorpamplona/geode}/perf/LoadBenchmark.kt | 6 +++--- .../geode}/persistence/PersistenceTest.kt | 4 ++-- .../geode}/policies/PoliciesIntegrationTest.kt | 6 +++--- .../vitorpamplona/geode}/policies/PoliciesTest.kt | 4 ++-- quartz/build.gradle.kts | 10 +++++----- .../quartz/nip01Core/relay/BaseNostrClientTest.kt | 2 +- .../nip01Core/relay/NostrClientManualSubTest.kt | 2 +- .../nip01Core/relay/NostrClientQueryCountTest.kt | 2 +- .../nip01Core/relay/NostrClientRepeatSubTest.kt | 2 +- .../relay/NostrClientReqBypassingRelayLimitsTest.kt | 2 +- .../relay/NostrClientSubscriptionAsFlowTest.kt | 2 +- .../nip01Core/relay/NostrClientSubscriptionTest.kt | 2 +- .../NostrClientSubscriptionUntilEoseAsFlowTest.kt | 2 +- settings.gradle | 2 +- 36 files changed, 73 insertions(+), 73 deletions(-) rename {quartz-relay => geode}/build.gradle.kts (95%) rename {quartz-relay => geode}/config.example.toml (90%) rename {quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay => geode/src/main/kotlin/com/vitorpamplona/geode}/LocalRelayServer.kt (98%) rename {quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay => geode/src/main/kotlin/com/vitorpamplona/geode}/Main.kt (96%) rename {quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay => geode/src/main/kotlin/com/vitorpamplona/geode}/Relay.kt (97%) rename {quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay => geode/src/main/kotlin/com/vitorpamplona/geode}/RelayHub.kt (98%) rename {quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay => geode/src/main/kotlin/com/vitorpamplona/geode}/RelayInfo.kt (94%) rename {quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay => geode/src/main/kotlin/com/vitorpamplona/geode}/config/RelayConfig.kt (96%) rename {quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay => geode/src/main/kotlin/com/vitorpamplona/geode}/fixtures/RelayFixtures.kt (98%) rename {quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay => geode/src/main/kotlin/com/vitorpamplona/geode}/fixtures/SyntheticEvents.kt (98%) rename {quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay => geode/src/main/kotlin/com/vitorpamplona/geode}/persistence/RelayStateStore.kt (98%) rename {quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay => geode/src/main/kotlin/com/vitorpamplona/geode}/server/Nip86HttpRoute.kt (99%) rename {quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay => geode/src/main/kotlin/com/vitorpamplona/geode}/server/WebSocketSessionPump.kt (99%) rename {quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay => geode/src/test/kotlin/com/vitorpamplona/geode}/GracefulShutdownTest.kt (99%) rename {quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay => geode/src/test/kotlin/com/vitorpamplona/geode}/LocalRelayServerTest.kt (99%) rename {quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay => geode/src/test/kotlin/com/vitorpamplona/geode}/Nip01ComplianceTest.kt (99%) rename {quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay => geode/src/test/kotlin/com/vitorpamplona/geode}/Nip09DeletionTest.kt (99%) rename {quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay => geode/src/test/kotlin/com/vitorpamplona/geode}/Nip40ExpirationTest.kt (99%) rename {quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay => geode/src/test/kotlin/com/vitorpamplona/geode}/Nip62VanishTest.kt (99%) rename {quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay => geode/src/test/kotlin/com/vitorpamplona/geode}/Nip77NegentropyTest.kt (99%) rename {quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay => geode/src/test/kotlin/com/vitorpamplona/geode}/admin/Nip86EndToEndTest.kt (98%) rename {quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay => geode/src/test/kotlin/com/vitorpamplona/geode}/config/RelayConfigTest.kt (98%) rename {quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay => geode/src/test/kotlin/com/vitorpamplona/geode}/perf/LoadBenchmark.kt (99%) rename {quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay => geode/src/test/kotlin/com/vitorpamplona/geode}/persistence/PersistenceTest.kt (98%) rename {quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay => geode/src/test/kotlin/com/vitorpamplona/geode}/policies/PoliciesIntegrationTest.kt (97%) rename {quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay => geode/src/test/kotlin/com/vitorpamplona/geode}/policies/PoliciesTest.kt (98%) diff --git a/quartz-relay/build.gradle.kts b/geode/build.gradle.kts similarity index 95% rename from quartz-relay/build.gradle.kts rename to geode/build.gradle.kts index 8b7dd95b6..8d2f2dc89 100644 --- a/quartz-relay/build.gradle.kts +++ b/geode/build.gradle.kts @@ -7,8 +7,8 @@ plugins { } application { - mainClass.set("com.vitorpamplona.quartz.relay.MainKt") - applicationName = "quartz-relay" + mainClass.set("com.vitorpamplona.geode.MainKt") + applicationName = "geode" } kotlin { diff --git a/quartz-relay/config.example.toml b/geode/config.example.toml similarity index 90% rename from quartz-relay/config.example.toml rename to geode/config.example.toml index 0729446c7..5835a5527 100644 --- a/quartz-relay/config.example.toml +++ b/geode/config.example.toml @@ -1,8 +1,8 @@ -# Example config for quartz-relay. Section layout mirrors +# Example config for geode. Section layout mirrors # nostr-rs-relay's config.toml so existing operators can port across. # # Run with: -# ./gradlew :quartz-relay:run --args="--config /etc/quartz-relay.toml" +# ./gradlew :geode:run --args="--config /etc/geode.toml" # # CLI flags override individual values: e.g. `--port 8888` wins over # `[network].port`. @@ -12,8 +12,8 @@ # AUTH challenges). If not set, the relay synthesises one from the # [network] section. relay_url = "wss://relay.example.com/" -name = "Example Quartz Relay" -description = "A quartz-relay deployment." +name = "Example Geode" +description = "A geode deployment." contact = "admin@example.com" # Operator pubkey (NIP-11). Optional. # pubkey = "..." @@ -30,7 +30,7 @@ path = "/" # True keeps an in-memory SQLite db (events vanish on restart). Useful # for tests; set false + `file = "..."` for persistent storage. in_memory = false -file = "/var/lib/quartz-relay/events.db" +file = "/var/lib/geode/events.db" [options] # Drop events whose Schnorr signature does not verify. Strongly @@ -79,4 +79,4 @@ require_auth = false # lists + the live NIP-11 doc) across restarts. When unset, admin # state is in-memory only and forgotten on every restart. Convention # is to place this next to the SQLite event-store file. -# state_file = "/var/lib/quartz-relay/events.db.admin.json" +# state_file = "/var/lib/geode/events.db.admin.json" diff --git a/quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/LocalRelayServer.kt b/geode/src/main/kotlin/com/vitorpamplona/geode/LocalRelayServer.kt similarity index 98% rename from quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/LocalRelayServer.kt rename to geode/src/main/kotlin/com/vitorpamplona/geode/LocalRelayServer.kt index 06262048e..3840bf482 100644 --- a/quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/LocalRelayServer.kt +++ b/geode/src/main/kotlin/com/vitorpamplona/geode/LocalRelayServer.kt @@ -18,16 +18,16 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay +package com.vitorpamplona.geode +import com.vitorpamplona.geode.server.Nip86HttpRoute +import com.vitorpamplona.geode.server.WebSocketSessionPump import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.relay.commands.toClient.NoticeMessage import com.vitorpamplona.quartz.nip01Core.relay.server.RelaySession import com.vitorpamplona.quartz.nip11RelayInfo.Nip11RelayInformation import com.vitorpamplona.quartz.nip86RelayManagement.server.Nip86Server import com.vitorpamplona.quartz.nip98HttpAuth.Nip98AuthVerifier -import com.vitorpamplona.quartz.relay.server.Nip86HttpRoute -import com.vitorpamplona.quartz.relay.server.WebSocketSessionPump import io.ktor.http.ContentType import io.ktor.http.HttpHeaders import io.ktor.http.HttpStatusCode diff --git a/quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/Main.kt b/geode/src/main/kotlin/com/vitorpamplona/geode/Main.kt similarity index 96% rename from quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/Main.kt rename to geode/src/main/kotlin/com/vitorpamplona/geode/Main.kt index 74203f4f3..228c40709 100644 --- a/quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/Main.kt +++ b/geode/src/main/kotlin/com/vitorpamplona/geode/Main.kt @@ -18,8 +18,9 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay +package com.vitorpamplona.geode +import com.vitorpamplona.geode.config.RelayConfig import com.vitorpamplona.quartz.nip01Core.relay.normalizer.normalizeRelayUrl import com.vitorpamplona.quartz.nip01Core.relay.server.IRelayPolicy import com.vitorpamplona.quartz.nip01Core.relay.server.policies.EmptyPolicy @@ -30,16 +31,15 @@ import com.vitorpamplona.quartz.nip01Core.relay.server.policies.RejectFutureEven import com.vitorpamplona.quartz.nip01Core.relay.server.policies.VerifyPolicy import com.vitorpamplona.quartz.nip01Core.store.IEventStore import com.vitorpamplona.quartz.nip01Core.store.sqlite.EventStore -import com.vitorpamplona.quartz.relay.config.RelayConfig import java.io.File /** * Standalone entry point. * * Run with: - * ./gradlew :quartz-relay:run --args="--config /etc/quartz-relay.toml" + * ./gradlew :geode:run --args="--config /etc/geode.toml" * or - * java -cp ... com.vitorpamplona.quartz.relay.MainKt --port 7447 --verify + * java -cp ... com.vitorpamplona.geode.MainKt --port 7447 --verify * * Configuration precedence (highest to lowest): * 1. CLI flags (`--host`, `--port`, …) @@ -128,7 +128,7 @@ fun main(args: Array) { }, ) - println("quartz-relay listening on ${server.url}") + println("geode listening on ${server.url}") println("NIP-11 info doc: curl -H 'Accept: application/nostr+json' http://$advertisedHost:$port$path") // Park the main thread; shutdown hook handles teardown. diff --git a/quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/Relay.kt b/geode/src/main/kotlin/com/vitorpamplona/geode/Relay.kt similarity index 97% rename from quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/Relay.kt rename to geode/src/main/kotlin/com/vitorpamplona/geode/Relay.kt index 2c17cfaf9..48c339f4e 100644 --- a/quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/Relay.kt +++ b/geode/src/main/kotlin/com/vitorpamplona/geode/Relay.kt @@ -18,8 +18,11 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay +package com.vitorpamplona.geode +import com.vitorpamplona.geode.persistence.BannedEntry +import com.vitorpamplona.geode.persistence.RelayPersistedState +import com.vitorpamplona.geode.persistence.RelayStateStore import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.OptimizedJsonMapper import com.vitorpamplona.quartz.nip01Core.relay.commands.toRelay.EventCmd @@ -32,9 +35,6 @@ import com.vitorpamplona.quartz.nip01Core.store.sqlite.EventStore import com.vitorpamplona.quartz.nip11RelayInfo.Nip11RelayInformation import com.vitorpamplona.quartz.nip86RelayManagement.server.BanListPolicy import com.vitorpamplona.quartz.nip86RelayManagement.server.BanStore -import com.vitorpamplona.quartz.relay.persistence.BannedEntry -import com.vitorpamplona.quartz.relay.persistence.RelayPersistedState -import com.vitorpamplona.quartz.relay.persistence.RelayStateStore import kotlinx.coroutines.SupervisorJob import java.io.File import kotlin.coroutines.CoroutineContext diff --git a/quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/RelayHub.kt b/geode/src/main/kotlin/com/vitorpamplona/geode/RelayHub.kt similarity index 98% rename from quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/RelayHub.kt rename to geode/src/main/kotlin/com/vitorpamplona/geode/RelayHub.kt index 0f67e82a0..a5cdccd00 100644 --- a/quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/RelayHub.kt +++ b/geode/src/main/kotlin/com/vitorpamplona/geode/RelayHub.kt @@ -18,7 +18,7 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay +package com.vitorpamplona.geode import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer diff --git a/quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/RelayInfo.kt b/geode/src/main/kotlin/com/vitorpamplona/geode/RelayInfo.kt similarity index 94% rename from quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/RelayInfo.kt rename to geode/src/main/kotlin/com/vitorpamplona/geode/RelayInfo.kt index 34943a7b1..bd2d9c55e 100644 --- a/quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/RelayInfo.kt +++ b/geode/src/main/kotlin/com/vitorpamplona/geode/RelayInfo.kt @@ -18,7 +18,7 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay +package com.vitorpamplona.geode import com.vitorpamplona.quartz.nip01Core.core.JsonMapper import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl @@ -38,14 +38,14 @@ data class RelayInfo( val json: String by lazy { JsonMapper.toJson(document) } companion object { - const val NAME = "quartz-relay" + const val NAME = "geode" const val DESCRIPTION = "Embedded Nostr relay from the Amethyst quartz library." - const val SOFTWARE = "https://github.com/vitorpamplona/amethyst/tree/main/quartz-relay" + const val SOFTWARE = "https://github.com/vitorpamplona/amethyst/tree/main/geode" const val VERSION = "1.08.0" /** * NIPs this relay implements out of the box. Single source of - * truth — both [default] and [com.vitorpamplona.quartz.relay.config.RelayConfig.resolveInfo] + * truth — both [default] and [com.vitorpamplona.geode.config.RelayConfig.resolveInfo] * consult this list. Add a NIP here when its handler is wired * into [com.vitorpamplona.quartz.nip01Core.relay.server.RelaySession] * (or in this module's policy stack). diff --git a/quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/config/RelayConfig.kt b/geode/src/main/kotlin/com/vitorpamplona/geode/config/RelayConfig.kt similarity index 96% rename from quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/config/RelayConfig.kt rename to geode/src/main/kotlin/com/vitorpamplona/geode/config/RelayConfig.kt index e1f6d83b3..b1b99634d 100644 --- a/quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/config/RelayConfig.kt +++ b/geode/src/main/kotlin/com/vitorpamplona/geode/config/RelayConfig.kt @@ -18,14 +18,14 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay.config +package com.vitorpamplona.geode.config import cc.ekblad.toml.decode import cc.ekblad.toml.tomlMapper +import com.vitorpamplona.geode.RelayInfo import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.relay.normalizer.normalizeRelayUrl import com.vitorpamplona.quartz.nip11RelayInfo.Nip11RelayInformation -import com.vitorpamplona.quartz.relay.RelayInfo import java.io.File /** @@ -154,8 +154,8 @@ data class RelayConfig( * unset, admin state is in-memory only. * * Convention: place next to the SQLite event-store file — - * e.g. `[database].file = "/var/lib/quartz-relay/events.db"` - * pairs with `[admin].state_file = "/var/lib/quartz-relay/events.db.admin.json"`. + * e.g. `[database].file = "/var/lib/geode/events.db"` + * pairs with `[admin].state_file = "/var/lib/geode/events.db.admin.json"`. */ val state_file: String? = null, ) diff --git a/quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/fixtures/RelayFixtures.kt b/geode/src/main/kotlin/com/vitorpamplona/geode/fixtures/RelayFixtures.kt similarity index 98% rename from quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/fixtures/RelayFixtures.kt rename to geode/src/main/kotlin/com/vitorpamplona/geode/fixtures/RelayFixtures.kt index 2ff341ea1..7384be0c4 100644 --- a/quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/fixtures/RelayFixtures.kt +++ b/geode/src/main/kotlin/com/vitorpamplona/geode/fixtures/RelayFixtures.kt @@ -18,7 +18,7 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay.fixtures +package com.vitorpamplona.geode.fixtures import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.OptimizedJsonMapper diff --git a/quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/fixtures/SyntheticEvents.kt b/geode/src/main/kotlin/com/vitorpamplona/geode/fixtures/SyntheticEvents.kt similarity index 98% rename from quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/fixtures/SyntheticEvents.kt rename to geode/src/main/kotlin/com/vitorpamplona/geode/fixtures/SyntheticEvents.kt index 831c73c3e..9e7365358 100644 --- a/quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/fixtures/SyntheticEvents.kt +++ b/geode/src/main/kotlin/com/vitorpamplona/geode/fixtures/SyntheticEvents.kt @@ -18,7 +18,7 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay.fixtures +package com.vitorpamplona.geode.fixtures import com.vitorpamplona.quartz.nip01Core.core.Event diff --git a/quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/persistence/RelayStateStore.kt b/geode/src/main/kotlin/com/vitorpamplona/geode/persistence/RelayStateStore.kt similarity index 98% rename from quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/persistence/RelayStateStore.kt rename to geode/src/main/kotlin/com/vitorpamplona/geode/persistence/RelayStateStore.kt index bb18dd806..7bb7f0d49 100644 --- a/quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/persistence/RelayStateStore.kt +++ b/geode/src/main/kotlin/com/vitorpamplona/geode/persistence/RelayStateStore.kt @@ -18,7 +18,7 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay.persistence +package com.vitorpamplona.geode.persistence import com.vitorpamplona.quartz.nip11RelayInfo.Nip11RelayInformation import kotlinx.serialization.Serializable diff --git a/quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/server/Nip86HttpRoute.kt b/geode/src/main/kotlin/com/vitorpamplona/geode/server/Nip86HttpRoute.kt similarity index 99% rename from quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/server/Nip86HttpRoute.kt rename to geode/src/main/kotlin/com/vitorpamplona/geode/server/Nip86HttpRoute.kt index 43f89e837..3e1e3534e 100644 --- a/quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/server/Nip86HttpRoute.kt +++ b/geode/src/main/kotlin/com/vitorpamplona/geode/server/Nip86HttpRoute.kt @@ -18,7 +18,7 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay.server +package com.vitorpamplona.geode.server import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.JsonMapper diff --git a/quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/server/WebSocketSessionPump.kt b/geode/src/main/kotlin/com/vitorpamplona/geode/server/WebSocketSessionPump.kt similarity index 99% rename from quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/server/WebSocketSessionPump.kt rename to geode/src/main/kotlin/com/vitorpamplona/geode/server/WebSocketSessionPump.kt index 952e6131f..7cd700a33 100644 --- a/quartz-relay/src/main/kotlin/com/vitorpamplona/quartz/relay/server/WebSocketSessionPump.kt +++ b/geode/src/main/kotlin/com/vitorpamplona/geode/server/WebSocketSessionPump.kt @@ -18,7 +18,7 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay.server +package com.vitorpamplona.geode.server import com.vitorpamplona.quartz.nip01Core.relay.server.NostrServer import com.vitorpamplona.quartz.nip01Core.relay.server.RelaySession diff --git a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/GracefulShutdownTest.kt b/geode/src/test/kotlin/com/vitorpamplona/geode/GracefulShutdownTest.kt similarity index 99% rename from quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/GracefulShutdownTest.kt rename to geode/src/test/kotlin/com/vitorpamplona/geode/GracefulShutdownTest.kt index 5a3021cbb..04d55a660 100644 --- a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/GracefulShutdownTest.kt +++ b/geode/src/test/kotlin/com/vitorpamplona/geode/GracefulShutdownTest.kt @@ -18,7 +18,7 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay +package com.vitorpamplona.geode import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient import com.vitorpamplona.quartz.nip01Core.relay.client.listeners.RelayConnectionListener diff --git a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/LocalRelayServerTest.kt b/geode/src/test/kotlin/com/vitorpamplona/geode/LocalRelayServerTest.kt similarity index 99% rename from quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/LocalRelayServerTest.kt rename to geode/src/test/kotlin/com/vitorpamplona/geode/LocalRelayServerTest.kt index 5a96efe46..6489e794f 100644 --- a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/LocalRelayServerTest.kt +++ b/geode/src/test/kotlin/com/vitorpamplona/geode/LocalRelayServerTest.kt @@ -18,8 +18,9 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay +package com.vitorpamplona.geode +import com.vitorpamplona.geode.fixtures.SyntheticEvents import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient @@ -32,7 +33,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.server.policies.FullAuthPolicy import com.vitorpamplona.quartz.nip01Core.relay.sockets.okhttp.BasicOkHttpWebSocket import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent import com.vitorpamplona.quartz.nip11RelayInfo.Nip11RelayInformation -import com.vitorpamplona.quartz.relay.fixtures.SyntheticEvents import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob @@ -132,7 +132,7 @@ class LocalRelayServerTest { assertEquals(200, it.code) val body = it.body.string() val info = Nip11RelayInformation.fromJson(body) - assertEquals("quartz-relay", info.name) + assertEquals("geode", info.name) assertTrue(info.supported_nips!!.contains("11"), "NIP-11 must be advertised") assertTrue(info.supported_nips!!.contains("1"), "NIP-01 must be advertised") } diff --git a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/Nip01ComplianceTest.kt b/geode/src/test/kotlin/com/vitorpamplona/geode/Nip01ComplianceTest.kt similarity index 99% rename from quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/Nip01ComplianceTest.kt rename to geode/src/test/kotlin/com/vitorpamplona/geode/Nip01ComplianceTest.kt index b6e1398b2..5f69577ea 100644 --- a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/Nip01ComplianceTest.kt +++ b/geode/src/test/kotlin/com/vitorpamplona/geode/Nip01ComplianceTest.kt @@ -18,8 +18,9 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay +package com.vitorpamplona.geode +import com.vitorpamplona.geode.fixtures.SyntheticEvents import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient @@ -29,7 +30,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import com.vitorpamplona.quartz.nip23LongContent.LongTextNoteEvent -import com.vitorpamplona.quartz.relay.fixtures.SyntheticEvents import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/Nip09DeletionTest.kt b/geode/src/test/kotlin/com/vitorpamplona/geode/Nip09DeletionTest.kt similarity index 99% rename from quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/Nip09DeletionTest.kt rename to geode/src/test/kotlin/com/vitorpamplona/geode/Nip09DeletionTest.kt index 5bd0a1c77..d721d6686 100644 --- a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/Nip09DeletionTest.kt +++ b/geode/src/test/kotlin/com/vitorpamplona/geode/Nip09DeletionTest.kt @@ -18,7 +18,7 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay +package com.vitorpamplona.geode import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair diff --git a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/Nip40ExpirationTest.kt b/geode/src/test/kotlin/com/vitorpamplona/geode/Nip40ExpirationTest.kt similarity index 99% rename from quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/Nip40ExpirationTest.kt rename to geode/src/test/kotlin/com/vitorpamplona/geode/Nip40ExpirationTest.kt index 6c538241a..a4dc6c3ef 100644 --- a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/Nip40ExpirationTest.kt +++ b/geode/src/test/kotlin/com/vitorpamplona/geode/Nip40ExpirationTest.kt @@ -18,7 +18,7 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay +package com.vitorpamplona.geode import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient diff --git a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/Nip62VanishTest.kt b/geode/src/test/kotlin/com/vitorpamplona/geode/Nip62VanishTest.kt similarity index 99% rename from quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/Nip62VanishTest.kt rename to geode/src/test/kotlin/com/vitorpamplona/geode/Nip62VanishTest.kt index 201f312c9..620c88a91 100644 --- a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/Nip62VanishTest.kt +++ b/geode/src/test/kotlin/com/vitorpamplona/geode/Nip62VanishTest.kt @@ -18,7 +18,7 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay +package com.vitorpamplona.geode import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient diff --git a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/Nip77NegentropyTest.kt b/geode/src/test/kotlin/com/vitorpamplona/geode/Nip77NegentropyTest.kt similarity index 99% rename from quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/Nip77NegentropyTest.kt rename to geode/src/test/kotlin/com/vitorpamplona/geode/Nip77NegentropyTest.kt index a66a30000..d399457b0 100644 --- a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/Nip77NegentropyTest.kt +++ b/geode/src/test/kotlin/com/vitorpamplona/geode/Nip77NegentropyTest.kt @@ -18,7 +18,7 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay +package com.vitorpamplona.geode import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.OptimizedJsonMapper diff --git a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/admin/Nip86EndToEndTest.kt b/geode/src/test/kotlin/com/vitorpamplona/geode/admin/Nip86EndToEndTest.kt similarity index 98% rename from quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/admin/Nip86EndToEndTest.kt rename to geode/src/test/kotlin/com/vitorpamplona/geode/admin/Nip86EndToEndTest.kt index 965964677..f83ab0d85 100644 --- a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/admin/Nip86EndToEndTest.kt +++ b/geode/src/test/kotlin/com/vitorpamplona/geode/admin/Nip86EndToEndTest.kt @@ -18,8 +18,10 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay.admin +package com.vitorpamplona.geode.admin +import com.vitorpamplona.geode.LocalRelayServer +import com.vitorpamplona.geode.Relay import com.vitorpamplona.quartz.nip01Core.core.JsonMapper import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient @@ -31,8 +33,6 @@ import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent import com.vitorpamplona.quartz.nip11RelayInfo.Nip11RelayInformation import com.vitorpamplona.quartz.nip86RelayManagement.rpc.Nip86Request import com.vitorpamplona.quartz.nip98HttpAuth.HTTPAuthorizationEvent -import com.vitorpamplona.quartz.relay.LocalRelayServer -import com.vitorpamplona.quartz.relay.Relay import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/config/RelayConfigTest.kt b/geode/src/test/kotlin/com/vitorpamplona/geode/config/RelayConfigTest.kt similarity index 98% rename from quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/config/RelayConfigTest.kt rename to geode/src/test/kotlin/com/vitorpamplona/geode/config/RelayConfigTest.kt index 77b52c098..166a38050 100644 --- a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/config/RelayConfigTest.kt +++ b/geode/src/test/kotlin/com/vitorpamplona/geode/config/RelayConfigTest.kt @@ -18,7 +18,7 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay.config +package com.vitorpamplona.geode.config import java.io.File import kotlin.test.Test @@ -129,7 +129,7 @@ class RelayConfigTest { val candidates = listOf( File("config.example.toml"), - File("quartz-relay/config.example.toml"), + File("geode/config.example.toml"), ) val example = candidates.firstOrNull { it.exists() } diff --git a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/perf/LoadBenchmark.kt b/geode/src/test/kotlin/com/vitorpamplona/geode/perf/LoadBenchmark.kt similarity index 99% rename from quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/perf/LoadBenchmark.kt rename to geode/src/test/kotlin/com/vitorpamplona/geode/perf/LoadBenchmark.kt index 4b658bfd0..a083dd812 100644 --- a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/perf/LoadBenchmark.kt +++ b/geode/src/test/kotlin/com/vitorpamplona/geode/perf/LoadBenchmark.kt @@ -18,8 +18,10 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay.perf +package com.vitorpamplona.geode.perf +import com.vitorpamplona.geode.LocalRelayServer +import com.vitorpamplona.geode.Relay import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.publishAndConfirm @@ -30,8 +32,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.normalizer.normalizeRelayUrl import com.vitorpamplona.quartz.nip01Core.relay.sockets.okhttp.BasicOkHttpWebSocket import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent -import com.vitorpamplona.quartz.relay.LocalRelayServer -import com.vitorpamplona.quartz.relay.Relay import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/persistence/PersistenceTest.kt b/geode/src/test/kotlin/com/vitorpamplona/geode/persistence/PersistenceTest.kt similarity index 98% rename from quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/persistence/PersistenceTest.kt rename to geode/src/test/kotlin/com/vitorpamplona/geode/persistence/PersistenceTest.kt index 700c1145e..cf6eacdaa 100644 --- a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/persistence/PersistenceTest.kt +++ b/geode/src/test/kotlin/com/vitorpamplona/geode/persistence/PersistenceTest.kt @@ -18,11 +18,11 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay.persistence +package com.vitorpamplona.geode.persistence +import com.vitorpamplona.geode.Relay import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer import com.vitorpamplona.quartz.nip11RelayInfo.Nip11RelayInformation -import com.vitorpamplona.quartz.relay.Relay import java.io.File import java.nio.file.Files import kotlin.test.AfterTest diff --git a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/policies/PoliciesIntegrationTest.kt b/geode/src/test/kotlin/com/vitorpamplona/geode/policies/PoliciesIntegrationTest.kt similarity index 97% rename from quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/policies/PoliciesIntegrationTest.kt rename to geode/src/test/kotlin/com/vitorpamplona/geode/policies/PoliciesIntegrationTest.kt index 2bb4c4815..0236e2a21 100644 --- a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/policies/PoliciesIntegrationTest.kt +++ b/geode/src/test/kotlin/com/vitorpamplona/geode/policies/PoliciesIntegrationTest.kt @@ -18,8 +18,10 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay.policies +package com.vitorpamplona.geode.policies +import com.vitorpamplona.geode.RelayHub +import com.vitorpamplona.geode.fixtures.SyntheticEvents import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.publishAndConfirm @@ -31,8 +33,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.server.policies.PubkeyAllowDenyP import com.vitorpamplona.quartz.nip01Core.relay.server.policies.RejectFutureEventsPolicy import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent -import com.vitorpamplona.quartz.relay.RelayHub -import com.vitorpamplona.quartz.relay.fixtures.SyntheticEvents import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/policies/PoliciesTest.kt b/geode/src/test/kotlin/com/vitorpamplona/geode/policies/PoliciesTest.kt similarity index 98% rename from quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/policies/PoliciesTest.kt rename to geode/src/test/kotlin/com/vitorpamplona/geode/policies/PoliciesTest.kt index 5636e837a..5e0721b9f 100644 --- a/quartz-relay/src/test/kotlin/com/vitorpamplona/quartz/relay/policies/PoliciesTest.kt +++ b/geode/src/test/kotlin/com/vitorpamplona/geode/policies/PoliciesTest.kt @@ -18,14 +18,14 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.vitorpamplona.quartz.relay.policies +package com.vitorpamplona.geode.policies +import com.vitorpamplona.geode.fixtures.SyntheticEvents import com.vitorpamplona.quartz.nip01Core.relay.commands.toRelay.EventCmd import com.vitorpamplona.quartz.nip01Core.relay.server.PolicyResult import com.vitorpamplona.quartz.nip01Core.relay.server.policies.KindAllowDenyPolicy import com.vitorpamplona.quartz.nip01Core.relay.server.policies.PubkeyAllowDenyPolicy import com.vitorpamplona.quartz.nip01Core.relay.server.policies.RejectFutureEventsPolicy -import com.vitorpamplona.quartz.relay.fixtures.SyntheticEvents import kotlin.test.Test import kotlin.test.assertTrue import kotlin.test.fail diff --git a/quartz/build.gradle.kts b/quartz/build.gradle.kts index 723a757f6..93df4636b 100644 --- a/quartz/build.gradle.kts +++ b/quartz/build.gradle.kts @@ -181,11 +181,11 @@ kotlin { implementation(libs.kotlin.test) implementation(libs.kotlinx.coroutines.test) - // In-process Nostr relay so JVM/Android host tests don't - // need network access or a Rust toolchain. The - // `relay.fixtures` package carries the test-only event - // generators and corpus loader. - implementation(project(":quartz-relay")) + // In-process Nostr relay (geode) so JVM/Android host + // tests don't need network access or a Rust toolchain. + // The `geode.fixtures` package carries the test-only + // event generators and corpus loader. + implementation(project(":geode")) } } diff --git a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/BaseNostrClientTest.kt b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/BaseNostrClientTest.kt index e8133fe08..242539bda 100644 --- a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/BaseNostrClientTest.kt +++ b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/BaseNostrClientTest.kt @@ -20,7 +20,7 @@ */ package com.vitorpamplona.quartz.nip01Core.relay -import com.vitorpamplona.quartz.relay.RelayHub +import com.vitorpamplona.geode.RelayHub /** * Base for tests that drive a real `NostrClient` against an in-process Nostr diff --git a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientManualSubTest.kt b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientManualSubTest.kt index b5e0cfcce..58fc091e8 100644 --- a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientManualSubTest.kt +++ b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientManualSubTest.kt @@ -19,6 +19,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ package com.vitorpamplona.quartz.nip01Core.relay +import com.vitorpamplona.geode.fixtures.SyntheticEvents import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient @@ -26,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.SubscriptionListener import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer -import com.vitorpamplona.quartz.relay.fixtures.SyntheticEvents import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientQueryCountTest.kt b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientQueryCountTest.kt index 0b42a6066..0459238ed 100644 --- a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientQueryCountTest.kt +++ b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientQueryCountTest.kt @@ -20,11 +20,11 @@ */ package com.vitorpamplona.quartz.nip01Core.relay +import com.vitorpamplona.geode.fixtures.SyntheticEvents import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.count import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.normalizeRelayUrl -import com.vitorpamplona.quartz.relay.fixtures.SyntheticEvents import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientRepeatSubTest.kt b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientRepeatSubTest.kt index a63a3e512..20d25ec24 100644 --- a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientRepeatSubTest.kt +++ b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientRepeatSubTest.kt @@ -19,6 +19,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ package com.vitorpamplona.quartz.nip01Core.relay +import com.vitorpamplona.geode.fixtures.SyntheticEvents import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient import com.vitorpamplona.quartz.nip01Core.relay.client.listeners.RelayConnectionListener @@ -29,7 +30,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.commands.toClient.Message import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent -import com.vitorpamplona.quartz.relay.fixtures.SyntheticEvents import com.vitorpamplona.quartz.utils.Log import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientReqBypassingRelayLimitsTest.kt b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientReqBypassingRelayLimitsTest.kt index 6f413e5b6..f6383421c 100644 --- a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientReqBypassingRelayLimitsTest.kt +++ b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientReqBypassingRelayLimitsTest.kt @@ -20,13 +20,13 @@ */ package com.vitorpamplona.quartz.nip01Core.relay +import com.vitorpamplona.geode.fixtures.SyntheticEvents import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.fetchAllPages import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent -import com.vitorpamplona.quartz.relay.fixtures.SyntheticEvents import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientSubscriptionAsFlowTest.kt b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientSubscriptionAsFlowTest.kt index 90538ddf8..99e243d8c 100644 --- a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientSubscriptionAsFlowTest.kt +++ b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientSubscriptionAsFlowTest.kt @@ -19,12 +19,12 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ package com.vitorpamplona.quartz.nip01Core.relay +import com.vitorpamplona.geode.fixtures.SyntheticEvents import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.subscribeAsFlow import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter -import com.vitorpamplona.quartz.relay.fixtures.SyntheticEvents import com.vitorpamplona.quartz.utils.Log import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientSubscriptionTest.kt b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientSubscriptionTest.kt index 3c8c10bff..a4dad911d 100644 --- a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientSubscriptionTest.kt +++ b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientSubscriptionTest.kt @@ -19,13 +19,13 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ package com.vitorpamplona.quartz.nip01Core.relay +import com.vitorpamplona.geode.fixtures.SyntheticEvents import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.StaticSubscription import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer -import com.vitorpamplona.quartz.relay.fixtures.SyntheticEvents import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientSubscriptionUntilEoseAsFlowTest.kt b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientSubscriptionUntilEoseAsFlowTest.kt index 752d8d21a..7ab1e1e27 100644 --- a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientSubscriptionUntilEoseAsFlowTest.kt +++ b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientSubscriptionUntilEoseAsFlowTest.kt @@ -19,12 +19,12 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ package com.vitorpamplona.quartz.nip01Core.relay +import com.vitorpamplona.geode.fixtures.SyntheticEvents import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.fetchAsFlow import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter -import com.vitorpamplona.quartz.relay.fixtures.SyntheticEvents import com.vitorpamplona.quartz.utils.Log import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/settings.gradle b/settings.gradle index 74317ce69..6d88537ff 100644 --- a/settings.gradle +++ b/settings.gradle @@ -34,7 +34,7 @@ rootProject.name = "Amethyst" include ':amethyst' include ':benchmark' include ':quartz' -include ':quartz-relay' +include ':geode' include ':commons' include ':ammolite' include ':quic'