[libeufin] branch master updated (3ade91b -> b4b71a4)

[gnunet]

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

ms pushed a change to branch master
in repository libeufin.

    from 3ade91b  resolving #6770
     new be29b5b  Taler tests gone (moved into TypeScript harness)
     new b4b71a4  Delaying scheduled tasks detection.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 integration-tests/tests.py                         | 139 ---------------------
 nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt  |   3 +
 .../tech/libeufin/nexus/server/NexusServer.kt      |  11 +-
 3 files changed, 8 insertions(+), 145 deletions(-)

diff --git a/integration-tests/tests.py b/integration-tests/tests.py
index ce47800..ab7720b 100755
--- a/integration-tests/tests.py
+++ b/integration-tests/tests.py
@@ -365,25 +365,6 @@ def test_deduplication(make_crdt_payment):
     assert len(resp.json().get("transactions")) == 1
 
 
-@pytest.fixture
-def make_taler_facade():
-    assertResponse(
-        post(
-            f"{user0.nexus.base_url}/facades",
-            json=dict(
-                name=user0.nexus.taler_facade_name,
-                type="taler-wire-gateway",
-                config=dict(
-                    currency="EUR",
-                    bankAccount=user0.nexus.bank_label,
-                    bankConnection=user0.nexus.bank_connection,
-                    reserveTransferLevel="UNUSED",
-                )
-            ),
-            auth=user0.nexus.auth
-        )
-    )
-
 def test_facade_name_collision():
     assertResponse(
         post(
@@ -419,126 +400,6 @@ def test_facade_name_collision():
         acceptedResponses=[400]
     )
 
-def test_taler_facade_config(make_taler_facade):
-    resp = assertResponse(
-        get(
-            
f"{user0.nexus.base_url}/facades/{user0.nexus.taler_facade_name}/taler-wire-gateway/config",
-            auth=user0.nexus.auth
-        )
-    )
-    assertJsonEqual(
-        resp.json(),
-        dict(currency="EUR", version="0.0.0", 
name=user0.nexus.taler_facade_name)
-    )
-
-
-def test_taler_facade_incoming(make_taler_facade):
-    resp = assertResponse(post(
-        
f"{user0.nexus.base_url}/facades/{user0.nexus.taler_facade_name}/taler-wire-gateway/admin/add-incoming",
-        json=dict(
-            amount="EUR:1",
-            reserve_pub="1BCZ7KA333E3YJBFWT4J173M3E713YGFFGD856KPSGZN1N8ZKZR0",
-            
debit_account="payto://iban/BUKBGB22/DE00000000000000000000?sender-name=TheName"
-        ),
-        auth=user0.nexus.auth
-    ))
-
-    assertResponse(post(
-        
f"{user0.nexus.base_url}/bank-accounts/{user0.nexus.bank_label}/fetch-transactions",
-        auth=user0.nexus.auth
-    ))
-
-    resp = assertResponse(get(
-        "/".join([
-            user0.nexus.base_url,
-            "facades",
-            user0.nexus.taler_facade_name,
-            "taler-wire-gateway/history/incoming?delta=5"]),
-        auth=user0.nexus.auth
-    ))
-    assert len(resp.json().get("incoming_transactions")) == 1
-
-
-def test_taler_facade_refund(make_taler_facade):
-    resp = assertResponse(post(
-        
f"{user0.nexus.base_url}/facades/{user0.nexus.taler_facade_name}/taler-wire-gateway/admin/add-incoming",
-        json=dict(
-            amount="EUR:1",
-            reserve_pub="invalid reserve public key",
-            
debit_account="payto://iban/BUKBGB22/DE00000000000000000000?sender-name=TheName"
-        ),
-        auth=user0.nexus.auth
-    ))
-
-    assertResponse(post(
-        
f"{user0.nexus.base_url}/bank-accounts/{user0.nexus.bank_label}/fetch-transactions",
-        auth=user0.nexus.auth
-    ))
-
-    assertResponse(post(
-        
f"{user0.nexus.base_url}/bank-accounts/{user0.nexus.bank_label}/submit-all-payment-initiations",
-        auth=user0.nexus.auth
-    ))
-
-    # Fetch again the history, so as to find the freshly made refund.
-    assertResponse(post(
-        
f"{user0.nexus.base_url}/bank-accounts/{user0.nexus.bank_label}/fetch-transactions",
-        auth=user0.nexus.auth
-    ))
-
-    resp = assertResponse(
-        get(
-            
f"{user0.nexus.base_url}/bank-accounts/{user0.nexus.bank_label}/transactions",
-            auth=user0.nexus.auth
-        )
-    )
-
-    transactionsList = resp.json().get("transactions") 
-    assert len(transactionsList) == 2
-    for transaction in transactionsList:
-        movement = transaction.get("batches")[0].get("batchTransactions")[0]
-        subject = 
movement.get("details").get("unstructuredRemittanceInformation")
-        if subject.find("Taler refund") == 0 and movement.get("amount") == 
"EUR:1":
-            return
-    assert False, "Refund transaction not found"
-
-
-def test_taler_facade_outgoing(make_taler_facade):
-    assertResponse(
-        post(
-            
f"{user0.nexus.base_url}/facades/{user0.nexus.taler_facade_name}/taler-wire-gateway/transfer",
-            json=dict(
-                request_uid="0",
-                amount="EUR:1",
-                exchange_base_url="http//url",
-                wtid="nice",
-                
credit_account="payto://iban/AGRIFRPP/FR7630006000011234567890189?receiver-name=theName"
-            ),
-            auth=user0.nexus.auth
-        )
-    )
-    assertResponse(
-        post(
-            
f"{user0.nexus.base_url}/bank-accounts/{user0.nexus.bank_label}/payment-initiations/1/submit",
-            json=dict(),
-            auth=user0.nexus.auth
-        )
-    )
-    assertResponse(
-        post(
-            
f"{user0.nexus.base_url}/bank-accounts/{user0.nexus.bank_label}/fetch-transactions",
-            auth=user0.nexus.auth
-        )
-    )
-
-    resp = assertResponse(
-        get(
-            
f"{user0.nexus.base_url}/facades/{user0.nexus.taler_facade_name}/taler-wire-gateway/history/outgoing?delta=5",
-            auth=user0.nexus.auth
-        )
-    )
-    assert len(resp.json().get("outgoing_transactions")) == 1
-
 def test_double_connection_name():
     assertResponse(
         post(
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt 
b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
index 81ed787..4927b10 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
@@ -34,7 +34,9 @@ import com.github.ajalt.clikt.parameters.types.int
 import execThrowableOrTerminate
 import com.github.ajalt.clikt.core.*
 import com.github.ajalt.clikt.parameters.options.versionOption
+import io.ktor.client.*
 import tech.libeufin.nexus.iso20022.parseCamtMessage
+import tech.libeufin.nexus.server.client
 import tech.libeufin.util.*
 import java.io.File
 
@@ -60,6 +62,7 @@ class Serve : CliktCommand("Run nexus HTTP server") {
     override fun run() {
         setLogLevel(logLevel)
         serverMain(getDbConnFromEnv(NEXUS_DB_ENV_VAR_NAME), host, port)
+        startOperationScheduler(client)
     }
 }
 
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt 
b/nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt
index 90c6f81..737912d 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt
@@ -183,13 +183,14 @@ fun requireBankConnection(call: ApplicationCall, 
parameterKey: String): NexusBan
     return requireBankConnectionInternal(name)
 }
 
+val client = HttpClient {
+    expectSuccess = false // this way, it does not throw exceptions on != 200 
responses.
+}
+
 fun serverMain(dbName: String, host: String, port: Int) {
     execThrowableOrTerminate {
         dbCreateTables(dbName)
     }
-    val client = HttpClient {
-        expectSuccess = false // this way, it does not throw exceptions on != 
200 responses.
-    }
     val server = embeddedServer(Netty, port = port, host = host) {
         install(CallLogging) {
             this.level = Level.DEBUG
@@ -251,8 +252,6 @@ fun serverMain(dbName: String, host: String, port: Int) {
                 return@intercept finish()
             }
         }
-
-        startOperationScheduler(client)
         routing {
             get("/config") {
                 call.respond(
@@ -1065,4 +1064,4 @@ fun serverMain(dbName: String, host: String, port: Int) {
         logger.error(e.message)
         exitProcess(1)
     }
-}
+}
\ No newline at end of file

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