[libeufin] branch master updated: syntax / debug

[gnunet]

This is an automated email from the git hooks/post-receive script.

ms pushed a commit to branch master
in repository libeufin.

The following commit(s) were added to refs/heads/master by this push:
     new 2274e40  syntax / debug
2274e40 is described below

commit 2274e4019f2715213037f508bbcf0c84e2582ab9
Author: MS <ms@taler.net>
AuthorDate: Fri Feb 5 17:05:37 2021 +0100

    syntax / debug
---
 nexus/src/main/kotlin/tech/libeufin/nexus/Taler.kt            |  2 +-
 .../src/main/kotlin/tech/libeufin/nexus/iso20022/Iso20022.kt  | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/Taler.kt 
b/nexus/src/main/kotlin/tech/libeufin/nexus/Taler.kt
index ec50424..e5e13e4 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/Taler.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/Taler.kt
@@ -325,7 +325,7 @@ private suspend fun talerAddIncoming(call: ApplicationCall, 
httpClient: HttpClie
                 "currency": "${parsedAmount.currency}",
                 "direction": "CRDT",
                 "subject": "${addIncomingData.reserve_pub}",
-                "uid": ${getRandomString(8)}
+                "uid": "${getRandomString(8)}"
             }""".trimIndent()
             contentType(ContentType.Application.Json)
         }
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/iso20022/Iso20022.kt 
b/nexus/src/main/kotlin/tech/libeufin/nexus/iso20022/Iso20022.kt
index 182738c..70bd620 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/iso20022/Iso20022.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/iso20022/Iso20022.kt
@@ -657,12 +657,15 @@ private fun 
XmlElementDestructor.extractMaybeCurrencyExchange(): CurrencyExchang
 
 private fun XmlElementDestructor.extractBatches(
     inheritableAmount: CurrencyAmount,
-    outerCreditDebitIndicator: CreditDebitIndicator
+    outerCreditDebitIndicator: CreditDebitIndicator,
+    acctSvcrRef: String
 ): List<Batch> {
-    if (mapEachChildNamed("NtryDtls") {}.size != 1) throw 
CamtParsingError("This money movement is not a singleton #0")
+    if (mapEachChildNamed("NtryDtls") {}.size != 1) throw CamtParsingError(
+        "This money movement (AcctSvcrRef: $acctSvcrRef) is not a singleton #0"
+    )
     var txs = requireUniqueChildNamed("NtryDtls") {
         if (mapEachChildNamed("TxDtls") {}.size != 1) {
-            throw CamtParsingError("This money movement is not a singleton #1")
+            throw CamtParsingError("This money movement (AcctSvcrRef: 
$acctSvcrRef) is not a singleton #1")
         }
          requireUniqueChildNamed("TxDtls") {
             val details = extractTransactionDetails(outerCreditDebitIndicator)
@@ -854,7 +857,7 @@ private fun 
XmlElementDestructor.extractInnerTransactions(): CamtReport {
             instructedAmount = instructedAmount,
             creditDebitIndicator = creditDebitIndicator,
             bankTransactionCode = btc,
-            batches = extractBatches(amount, creditDebitIndicator),
+            batches = extractBatches(amount, creditDebitIndicator, acctSvcrRef 
?: "AcctSvcrRef not given/found"),
             bookingDate = maybeUniqueChildNamed("BookgDt") { 
extractDateOrDateTime() },
             valueDate = maybeUniqueChildNamed("ValDt") { 
extractDateOrDateTime() },
             accountServicerRef = acctSvcrRef,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.