commit db68055b7f6a8f178e36da09d8649c69b20841eb
parent 57f4362384530ed8b7a5fb1e65e787c84ba91492
Author: MS <ms@taler.net>
Date: Fri, 22 Jan 2021 01:41:03 +0100
remove (some) unused variables
Diffstat:
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/sandbox/src/main/kotlin/tech/libeufin/sandbox/EbicsProtocolBackend.kt b/sandbox/src/main/kotlin/tech/libeufin/sandbox/EbicsProtocolBackend.kt
@@ -432,17 +432,20 @@ fun buildCamtString(type: Int, subscriberIban: String, history: List<RawPayment>
*
* @param type 52 or 53.
*/
-private fun constructCamtResponse(type: Int, header: EbicsRequest.Header, subscriber: EbicsSubscriberEntity): String {
- val dateRange = (header.static.orderDetails?.orderParams as EbicsRequest.StandardOrderParams).dateRange
+private fun constructCamtResponse(type: Int, subscriber: EbicsSubscriberEntity): String {
+
/**
* Currently unused: see #6243.
*
+
+ val dateRange = (header.static.orderDetails?.orderParams as EbicsRequest.StandardOrderParams).dateRange
val (start: LocalDateTime, end: LocalDateTime) = if (dateRange != null) {
Pair(
importDateFromMillis(dateRange.start.toGregorianCalendar().timeInMillis),
importDateFromMillis(dateRange.end.toGregorianCalendar().timeInMillis)
)
} else Pair(parseDashedDate("1970-01-01"), LocalDateTime.now())
+
*/
val bankAccount = getBankAccountFromSubscriber(subscriber)
logger.info("getting history for account with iban ${bankAccount.iban}")
@@ -547,7 +550,7 @@ private fun parsePain001(paymentRequest: String): PainParseResult {
/**
* Process a payment request in the pain.001 format.
*/
-private fun handleCct(paymentRequest: String, initiatorName: String) {
+private fun handleCct(paymentRequest: String) {
logger.debug("Handling CCT")
logger.debug("Pain.001: $paymentRequest")
val parseResult = parsePain001(paymentRequest)
@@ -583,7 +586,6 @@ private fun handleEbicsC53(requestContext: RequestContext): ByteArray {
logger.debug("Handling C53 request")
val camt = constructCamtResponse(
53,
- requestContext.requestObject.header,
requestContext.subscriber
)
if (!XMLUtil.validateFromString(camt)) throw SandboxError(
@@ -1060,8 +1062,7 @@ private fun handleEbicsUploadTransactionTransmission(requestContext: RequestCont
}
if (getOrderTypeFromTransactionId(requestTransactionID) == "CCT") {
logger.debug("Attempting a payment.")
- val involvedBankAccout = getBankAccountFromSubscriber(requestContext.subscriber)
- handleCct(unzippedData.toString(Charsets.UTF_8), involvedBankAccout.name)
+ handleCct(unzippedData.toString(Charsets.UTF_8))
}
return EbicsResponse.createForUploadTransferPhase(
requestTransactionID,
diff --git a/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt b/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt
@@ -334,7 +334,6 @@ fun serverMain(dbName: String, port: Int) {
post("/admin/bank-accounts/{label}/simulate-incoming-transaction") {
val body = call.receive<IncomingPaymentInfo>()
// FIXME: generate nicer UUID!
- val random = Random.nextLong(0, Long.MAX_VALUE)
val accountLabel = ensureNonNull(call.parameters["label"])
transaction {
val account = getBankAccountFromLabel(accountLabel)