libeufin

commit aec39ac06ca56a1684651f92c3b3f8be12c1599d
parent 04a78be85e901b6974434f94b1963472196ec7fc
Author: MS <ms@taler.net>
Date:   Tue, 14 Feb 2023 15:17:06 +0100

cash-out info type

using the same format that /config uses
to show ratios and fees.

Diffstat:
M
nexus/src/test/kotlin/SandboxCircuitApiTest.kt
 | 
8
++++----
M
sandbox/src/main/kotlin/tech/libeufin/sandbox/CircuitApi.kt
 | 
16
+++++++---------

2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/nexus/src/test/kotlin/SandboxCircuitApiTest.kt b/nexus/src/test/kotlin/SandboxCircuitApiTest.kt
@@ -119,10 +119,10 @@ class SandboxCircuitApiTest {
                         account = "foo"
                         status = CashoutOperationStatus.PENDING
                         cashoutAddress = "not used"
-                        buyAtRatio = "not used"
-                        buyInFee = "not used"
-                        sellAtRatio = "not used"
-                        sellOutFee = "not used"
+                        buyAtRatio = "1"
+                        buyInFee = "1"
+                        sellAtRatio = "1"
+                        sellOutFee = "1"
                     }
                 }
                 R = client.get("/demobanks/default/circuit-api/cashouts") {
diff --git a/sandbox/src/main/kotlin/tech/libeufin/sandbox/CircuitApi.kt b/sandbox/src/main/kotlin/tech/libeufin/sandbox/CircuitApi.kt
@@ -98,10 +98,7 @@ data class CashoutOperationInfo(
     val tan_channel: SupportedTanChannels,
     val account: String,
     val cashout_address: String,
-    val buy_in_fee: String,
-    val buy_at_ratio: String,
-    val sell_out_fee: String,
-    val sell_at_ratio: String
+    val ratios_and_fees: RatioAndFees
 )
 
 data class CashoutConfirmation(val tan: String)
@@ -301,11 +298,12 @@ fun circuitApi(circuitRoute: Route) {
             tan_channel = maybeOperation.tanChannel,
             account = maybeOperation.account,
             cashout_address = maybeOperation.cashoutAddress,
-            buy_at_ratio = maybeOperation.buyAtRatio,
-            buy_in_fee = maybeOperation.buyInFee,
-            sell_at_ratio = maybeOperation.sellAtRatio,
-            sell_out_fee = maybeOperation.sellOutFee
-
+            ratios_and_fees = RatioAndFees(
+                buy_in_fee = maybeOperation.buyInFee.toFloat(),
+                buy_at_ratio = maybeOperation.buyAtRatio.toFloat(),
+                sell_out_fee = maybeOperation.sellOutFee.toFloat(),
+                sell_at_ratio = maybeOperation.sellAtRatio.toFloat()
+            )
         )
         call.respond(ret)
         return@get