From 855425732927a87d538587a12a446a9039ac23f2 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 12 Nov 2025 08:29:05 -0500 Subject: [PATCH] Change reqResultsInOrderAsFlow to reqAsFlow --- .../client/reqs/NostrClientStaticReqAsStateFlow.kt | 14 +++++++------- .../relay/NostrClientSubscriptionAsFlowTest.kt | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/NostrClientStaticReqAsStateFlow.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/NostrClientStaticReqAsStateFlow.kt index 94be9ef79..7b7e6cdc2 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/NostrClientStaticReqAsStateFlow.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/NostrClientStaticReqAsStateFlow.kt @@ -42,22 +42,22 @@ import kotlinx.coroutines.flow.callbackFlow * - They will be ignored if they are already in the list. * - They will be added to the beginning of the list if they are new. */ -fun INostrClient.reqResultsInOrderAsFlow( +fun INostrClient.reqAsFlow( relay: String, filters: List, -) = reqResultsInOrderAsFlow(RelayUrlNormalizer.normalize(relay), filters) +) = reqAsFlow(RelayUrlNormalizer.normalize(relay), filters) -fun INostrClient.reqResultsInOrderAsFlow( +fun INostrClient.reqAsFlow( relay: String, filter: Filter, -) = reqResultsInOrderAsFlow(RelayUrlNormalizer.normalize(relay), listOf(filter)) +) = reqAsFlow(RelayUrlNormalizer.normalize(relay), listOf(filter)) -fun INostrClient.reqResultsInOrderAsFlow( +fun INostrClient.reqAsFlow( relay: NormalizedRelayUrl, filter: Filter, -) = reqResultsInOrderAsFlow(relay, listOf(filter)) +) = reqAsFlow(relay, listOf(filter)) -fun INostrClient.reqResultsInOrderAsFlow( +fun INostrClient.reqAsFlow( relay: NormalizedRelayUrl, filters: List, ): Flow> = 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 958a09742..0910410d6 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 @@ -23,7 +23,7 @@ package com.vitorpamplona.quartz.nip01Core.relay 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.reqResultsInOrderAsFlow +import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.reqAsFlow import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.utils.Log import kotlinx.coroutines.CoroutineScope @@ -50,7 +50,7 @@ class NostrClientSubscriptionAsFlowTest : BaseNostrClientTest() { val client = NostrClient(socketBuilder, appScope) val flow = - client.reqResultsInOrderAsFlow( + client.reqAsFlow( relay = "wss://relay.damus.io", filter = Filter( @@ -88,7 +88,7 @@ class NostrClientSubscriptionAsFlowTest : BaseNostrClientTest() { val client = NostrClient(socketBuilder, appScope) val flow = - client.reqResultsInOrderAsFlow( + client.reqAsFlow( relay = "wss://relay.damus.io", filter = Filter(