lightsparkdev · jklein24 · Oct 10, 2023 · Oct 10, 2023
diff --git a/lightspark-sdk/src/commonJvmAndroidMain/kotlin/com/lightspark/sdk/LightsparkFuturesClient.kt b/lightspark-sdk/src/commonJvmAndroidMain/kotlin/com/lightspark/sdk/LightsparkFuturesClient.kt
@@ -14,6 +14,7 @@ import com.lightspark.sdk.model.ComplianceProvider
 import com.lightspark.sdk.model.CreateApiTokenOutput
 import com.lightspark.sdk.model.CurrencyAmount
 import com.lightspark.sdk.model.FeeEstimate
+import com.lightspark.sdk.model.IncomingPayment
 import com.lightspark.sdk.model.Invoice
 import com.lightspark.sdk.model.InvoiceData
 import com.lightspark.sdk.model.InvoiceType
@@ -395,7 +396,7 @@ class LightsparkFuturesClient(config: ClientConfig) {
         localNodeId: String,
         encodedInvoice: String,
         amountMsats: Long? = null,
-    ): CompletableFuture<OutgoingPayment> = coroutineScope.future {
+    ): CompletableFuture<IncomingPayment> = coroutineScope.future {
         coroutinesClient.createTestModePayment(
             localNodeId,
             encodedInvoice,

diff --git a/lightspark-sdk/src/commonMain/kotlin/com/lightspark/sdk/LightsparkCoroutinesClient.kt b/lightspark-sdk/src/commonMain/kotlin/com/lightspark/sdk/LightsparkCoroutinesClient.kt
@@ -794,7 +794,7 @@ class LightsparkCoroutinesClient private constructor(
         localNodeId: String,
         encodedInvoice: String,
         amountMsats: Long? = null,
-    ): OutgoingPayment {
+    ): IncomingPayment {
         requireValidAuth()
         return executeQuery(
             Query(
@@ -808,7 +808,7 @@ class LightsparkCoroutinesClient private constructor(
                 val outputJson =
                     requireNotNull(it["create_test_mode_payment"]) { "No payment output found in response" }
                 val paymentJson =
-                    requireNotNull(outputJson.jsonObject["payment"]) { "No payment found in response" }
+                    requireNotNull(outputJson.jsonObject["incoming_payment"]) { "No payment found in response" }
                 serializerFormat.decodeFromJsonElement(paymentJson)
             },
         )

diff --git a/lightspark-sdk/src/commonMain/kotlin/com/lightspark/sdk/LightsparkSyncClient.kt b/lightspark-sdk/src/commonMain/kotlin/com/lightspark/sdk/LightsparkSyncClient.kt
@@ -391,7 +391,7 @@ class LightsparkSyncClient constructor(config: ClientConfig) {
         localNodeId: String,
         encodedInvoice: String,
         amountMsats: Long? = null,
-    ): OutgoingPayment = runBlocking {
+    ): IncomingPayment = runBlocking {
         asyncClient.createTestModePayment(
             localNodeId,
             encodedInvoice,

diff --git a/lightspark-sdk/src/commonMain/kotlin/com/lightspark/sdk/graphql/CreateTestModePayment.kt b/lightspark-sdk/src/commonMain/kotlin/com/lightspark/sdk/graphql/CreateTestModePayment.kt
@@ -1,6 +1,6 @@
 package com.lightspark.sdk.graphql
 
-import com.lightspark.sdk.model.OutgoingPayment
+import com.lightspark.sdk.model.IncomingPayment
 
 const val CreateTestModePayment = """
 mutation CreateTestModePayment(
@@ -13,11 +13,11 @@ mutation CreateTestModePayment(
         encoded_invoice: ${'$'}encoded_invoice
         amount_msats: ${'$'}amount_msats
     }) {
-        payment {
-            ...OutgoingPaymentFragment
+        incoming_payment {
+            ...IncomingPaymentFragment
         }
     }
 }
 
-${OutgoingPayment.FRAGMENT}
+${IncomingPayment.FRAGMENT}
 """
diff --git a/lightspark-sdk/src/commonTest/kotlin/com/lightspark/sdk/ClientIntegrationTests.kt b/lightspark-sdk/src/commonTest/kotlin/com/lightspark/sdk/ClientIntegrationTests.kt
@@ -6,11 +6,11 @@ import com.lightspark.sdk.core.util.getPlatform
 import com.lightspark.sdk.crypto.PasswordRecoverySigningKeyLoader
 import com.lightspark.sdk.model.Account
 import com.lightspark.sdk.model.BitcoinNetwork
+import com.lightspark.sdk.model.IncomingPayment
 import com.lightspark.sdk.model.LightsparkNode
 import com.lightspark.sdk.model.OutgoingPayment
 import com.lightspark.sdk.model.Transaction
 import com.lightspark.sdk.model.TransactionStatus
-import io.kotest.matchers.collections.shouldBeIn
 import io.kotest.matchers.collections.shouldHaveSize
 import io.kotest.matchers.collections.shouldNotBeEmpty
 import io.kotest.matchers.nulls.shouldNotBeNull
@@ -227,9 +227,14 @@ class ClientIntegrationTests {
     fun `test creating a test mode payment`() = runTest {
         val node = getFirstNode()
         val invoice = client.createInvoice(node.id, 100_000, "test invoice")
-        val payment = client.createTestModePayment(node.id, invoice.data.encodedPaymentRequest)
+        var payment: IncomingPayment? = client.createTestModePayment(node.id, invoice.data.encodedPaymentRequest)
         payment.shouldNotBeNull()
-        payment.status.shouldBeIn(TransactionStatus.PENDING, TransactionStatus.SUCCESS)
+        while (payment?.status == TransactionStatus.PENDING) {
+            delay(500)
+            payment = IncomingPayment.getIncomingPaymentQuery(payment.id).execute(client)
+            println("Payment status: ${payment?.status}")
+        }
+        payment?.status.shouldBe(TransactionStatus.SUCCESS)
     }
 
     // TODO: Add tests for withdrawals and deposits.

diff --git a/lightspark-sdk/src/commonTest/kotlin/com/lightspark/sdk/uma/UmaTests.kt b/lightspark-sdk/src/commonTest/kotlin/com/lightspark/sdk/uma/UmaTests.kt
diff --git a/...rc/commonJvmAndroidMain/kotlin/com/lightspark/sdk/wallet/LightsparkFuturesWalletClient.kt b/...rc/commonJvmAndroidMain/kotlin/com/lightspark/sdk/wallet/LightsparkFuturesWalletClient.kt
@@ -381,7 +381,7 @@ class LightsparkFuturesWalletClient constructor(config: ClientConfig) {
     fun createTestModePayment(
         encodedInvoice: String,
         amountMsats: Long? = null,
-    ): CompletableFuture<OutgoingPayment> = coroutineScope.future {
+    ): CompletableFuture<IncomingPayment> = coroutineScope.future {
         coroutinesClient.createTestModePayment(
             encodedInvoice,
             amountMsats,

diff --git a/...t-sdk/src/commonMain/kotlin/com/lightspark/sdk/wallet/LightsparkCoroutinesWalletClient.kt b/...t-sdk/src/commonMain/kotlin/com/lightspark/sdk/wallet/LightsparkCoroutinesWalletClient.kt
@@ -742,7 +742,7 @@ class LightsparkCoroutinesWalletClient private constructor(
     suspend fun createTestModePayment(
         encodedInvoice: String,
         amountMsats: Long? = null,
-    ): OutgoingPayment {
+    ): IncomingPayment {
         requireValidAuth()
         return executeQuery(
             Query(
@@ -755,7 +755,7 @@ class LightsparkCoroutinesWalletClient private constructor(
                 val outputJson =
                     requireNotNull(it["create_test_mode_payment"]) { "No payment output found in response" }
                 val paymentJson =
-                    requireNotNull(outputJson.jsonObject["payment"]) { "No payment found in response" }
+                    requireNotNull(outputJson.jsonObject["incoming_payment"]) { "No payment found in response" }
                 serializerFormat.decodeFromJsonElement(paymentJson)
             },
         )

diff --git a/wallet-sdk/src/commonMain/kotlin/com/lightspark/sdk/wallet/LightsparkSyncWalletClient.kt b/wallet-sdk/src/commonMain/kotlin/com/lightspark/sdk/wallet/LightsparkSyncWalletClient.kt
@@ -378,7 +378,7 @@ class LightsparkSyncWalletClient constructor(config: ClientConfig) {
     fun createTestModePayment(
         encodedInvoice: String,
         amountMsats: Long? = null,
-    ): OutgoingPayment = runBlocking {
+    ): IncomingPayment = runBlocking {
         asyncClient.createTestModePayment(
             encodedInvoice,
             amountMsats,

diff --git a/wallet-sdk/src/commonMain/kotlin/com/lightspark/sdk/wallet/graphql/CreateTestModePayment.kt b/wallet-sdk/src/commonMain/kotlin/com/lightspark/sdk/wallet/graphql/CreateTestModePayment.kt
@@ -1,6 +1,6 @@
 package com.lightspark.sdk.wallet.graphql
 
-import com.lightspark.sdk.wallet.model.OutgoingPayment
+import com.lightspark.sdk.wallet.model.IncomingPayment
 
 const val CreateTestModePayment = """
 mutation CreateTestModePayment(
@@ -11,11 +11,11 @@ mutation CreateTestModePayment(
         encoded_invoice: ${'$'}encoded_invoice
         amount_msats: ${'$'}amount_msats
     }) {
-        payment {
-            ...OutgoingPaymentFragment
+        incoming_payment {
+            ...IncomingPaymentFragment
         }
     }
 }
 
-${OutgoingPayment.FRAGMENT}
+${IncomingPayment.FRAGMENT}
 """