diff options
Diffstat (limited to 'sandbox/src/main/kotlin')
| -rw-r--r-- | sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt | 4 | ||||
| -rw-r--r-- | sandbox/src/main/kotlin/tech/libeufin/sandbox/bankAccount.kt | 13 |
2 files changed, 14 insertions, 3 deletions
diff --git a/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt b/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt index b7a65ed1..bc826211 100644 --- a/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt +++ b/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt @@ -434,7 +434,7 @@ fun serverMain(dbName: String, port: Int) { ) } exception<SandboxError> { cause -> - logger.error("Exception while handling '${call.request.uri}'", cause) + logger.error("Exception while handling '${call.request.uri}', ${cause.reason}") call.respond( cause.statusCode, SandboxErrorJson( @@ -1026,7 +1026,7 @@ fun serverMain(dbName: String, port: Int) { val ret = TalerWithdrawalStatus( selection_done = wo.selectionDone, transfer_done = wo.transferDone, - amount = "${currencyEnv}:1", + amount = "${currencyEnv}:5", suggested_exchange = "https://exchange.${envName}.taler.net/" ) call.respond(ret) diff --git a/sandbox/src/main/kotlin/tech/libeufin/sandbox/bankAccount.kt b/sandbox/src/main/kotlin/tech/libeufin/sandbox/bankAccount.kt index e42cc251..0a432451 100644 --- a/sandbox/src/main/kotlin/tech/libeufin/sandbox/bankAccount.kt +++ b/sandbox/src/main/kotlin/tech/libeufin/sandbox/bankAccount.kt @@ -1,6 +1,7 @@ package tech.libeufin.sandbox import io.ktor.http.* +import org.apache.http.HttpStatus import org.jetbrains.exposed.sql.and import org.jetbrains.exposed.sql.transactions.transaction import org.slf4j.Logger @@ -143,8 +144,18 @@ fun wireTransfer( } catch (e: Exception) { throw SandboxError(HttpStatusCode.BadRequest, "Amount given not valid: $amount") } + // Extra check on the currency's consistency + if (credit.currency != debit.currency) throw SandboxError( + HttpStatusCode.InternalServerError, + "Credit and debit account have different currency (${credit.currency} vs ${debit.currency})!", + LibeufinErrorCode.LIBEUFIN_EC_CURRENCY_INCONSISTENT + ) if (amountObj.currency != credit.currency || amountObj.currency != debit.currency) { - throw SandboxError(HttpStatusCode.BadRequest, "currency (${amountObj.currency}) can't be accepted") + throw SandboxError( + HttpStatusCode.BadRequest, + "Currency (${amountObj.currency}) is not supported", + LibeufinErrorCode.LIBEUFIN_EC_BAD_CURRENCY + ) } val randId = getRandomString(16) BankAccountTransactionEntity.new { |