[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libeufin] branch master updated (628c658 -> 57f4362)
|
From: |
gnunet |
|
Subject: |
[libeufin] branch master updated (628c658 -> 57f4362) |
|
Date: |
Fri, 22 Jan 2021 01:18:25 +0100 |
This is an automated email from the git hooks/post-receive script.
ms pushed a change to branch master
in repository libeufin.
from 628c658 remove trailing slash form URL (fix test)
new 637b322 submod
new 57f4362 Integration tests.
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:
build-system/taler-build-scripts | 2 +-
integration-tests/camt53-gls-style-0.json | 119 -----------
integration-tests/camt53-gls-style-0.xml | 335 ------------------------------
integration-tests/camt53-gls-style-1.json | 3 -
integration-tests/camt53-gls-style-1.xml | 114 ----------
integration-tests/tests.py | 8 +-
parsing-tests/samples | 2 +-
7 files changed, 6 insertions(+), 577 deletions(-)
delete mode 100644 integration-tests/camt53-gls-style-0.json
delete mode 100644 integration-tests/camt53-gls-style-0.xml
delete mode 100644 integration-tests/camt53-gls-style-1.json
delete mode 100644 integration-tests/camt53-gls-style-1.xml
diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
index 47f14fc..e08ea37 160000
--- a/build-system/taler-build-scripts
+++ b/build-system/taler-build-scripts
@@ -1 +1 @@
-Subproject commit 47f14fcf1d03d9dad1bae59987488ea05ecd307b
+Subproject commit e08ea37979dcc17ac8e0987251771d771503cb56
diff --git a/integration-tests/camt53-gls-style-0.json
b/integration-tests/camt53-gls-style-0.json
deleted file mode 100644
index 3b42ff9..0000000
--- a/integration-tests/camt53-gls-style-0.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
- "transactions" : [ {
- "amount" : "EUR:2.35",
- "creditDebitIndicator" : "DBIT",
- "status" : "BOOK",
- "bankTransactionCode" : "PMNT-RRCT-ESCT",
- "valueDate" : "2020-05-29",
- "bookingDate" : "2020-05-29",
- "accountServicerRef" : "2020052912023838000",
- "batches" : [ {
- "batchTransactions" : [ {
- "amount" : "EUR:2.35",
- "creditDebitIndicator" : "DBIT",
- "details" : {
- "debtor" : {
- "name" : "TALER WALLET USER"
- },
- "debtorAccount" : {
- "iban" : "GB33BUKB20201555555555"
- },
- "debtorAgent" : {
- "bic" : "BYLADEM1WOR"
- },
- "creditor" : {
- "name" : "Taler Exchange"
- },
- "creditorAccount" : {
- "iban" : "DE00000000000000000000"
- },
- "endToEndId" : "NOTPROVIDED",
- "unstructuredRemittanceInformation" : "Überweisung Test Nr. 1
Referenz-Nummer 0FMRBH8FZYYMSQ2RHTYYGK2BV33JVSW6MTYCV7Y833GVNXFDYK10"
- }
- } ]
- } ]
- }, {
- "amount" : "EUR:3.15",
- "creditDebitIndicator" : "CRDT",
- "status" : "BOOK",
- "bankTransactionCode" : "PMNT-RRCT-ESCT",
- "valueDate" : "2020-05-29",
- "bookingDate" : "2020-05-29",
- "accountServicerRef" : "2020052913163282000",
- "batches" : [ {
- "batchTransactions" : [ {
- "amount" : "EUR:3.15",
- "creditDebitIndicator" : "CRDT",
- "details" : {
- "debtor" : {
- "name" : "TALER WALLET USER"
- },
- "debtorAccount" : {
- "iban" : "DE00000000000000000000"
- },
- "debtorAgent" : {
- "bic" : "BYLADEM1WOR"
- },
- "creditor" : {
- "name" : "Taler Exchange"
- },
- "creditorAccount" : {
- "iban" : "DE00000000000000000000"
- },
- "endToEndId" : "NOTPROVIDED",
- "unstructuredRemittanceInformation" : "Überweisung Mai, Test Nr. 2"
- }
- } ]
- } ]
- }, {
- "amount" : "EUR:1.79",
- "creditDebitIndicator" : "CRDT",
- "status" : "BOOK",
- "bankTransactionCode" : "PMNT-RRCT-ESCT",
- "valueDate" : "2020-05-29",
- "bookingDate" : "2020-05-29",
- "accountServicerRef" : "2020052913183564000",
- "batches" : [ {
- "batchTransactions" : [ {
- "amount" : "EUR:1.79",
- "creditDebitIndicator" : "CRDT",
- "details" : {
- "debtor" : {
- "name" : "TALER EXCHANGE"
- },
- "debtorAccount" : {
- "iban" : "DE00000000000000000000"
- },
- "debtorAgent" : {
- "bic" : "BYLADEM1WOR"
- },
- "creditor" : {
- "name" : "Taler Merchant"
- },
- "creditorAccount" : {
- "iban" : "DE00000000000000000000"
- },
- "endToEndId" : "NOTPROVIDED",
- "unstructuredRemittanceInformation" : "Überweisung Mai, Test Nr. 3"
- }
- } ]
- } ]
- }, {
- "amount" : "EUR:9.96",
- "creditDebitIndicator" : "DBIT",
- "status" : "BOOK",
- "bankTransactionCode" : "ACMT-OPCL-ACCC",
- "valueDate" : "2020-05-31",
- "bookingDate" : "2020-05-29",
- "accountServicerRef" : "2020052921190458000",
- "batches" : [ {
- "batchTransactions" : [ {
- "amount" : "EUR:9.96",
- "creditDebitIndicator" : "DBIT",
- "details" : {
- "unstructuredRemittanceInformation" : "ABSCHLUSS PER 31.05.2020"
- }
- } ]
- } ]
- } ]
-}
diff --git a/integration-tests/camt53-gls-style-0.xml
b/integration-tests/camt53-gls-style-0.xml
deleted file mode 100644
index 58f878f..0000000
--- a/integration-tests/camt53-gls-style-0.xml
+++ /dev/null
@@ -1,335 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?><Document
xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02
camt.053.001.02.xsd">
- <BkToCstmrStmt>
- <GrpHdr>
- <MsgId>053D2020-05-29T23:41:27.0N200000011</MsgId>
- <CreDtTm>2020-05-29T23:41:21.0+02:00</CreDtTm>
- <MsgPgntn>
- <PgNb>001</PgNb>
- <LastPgInd>true</LastPgInd>
- </MsgPgntn>
- </GrpHdr>
- <Stmt>
- <Id>4967C532020052923412775014049078800</Id>
- <ElctrncSeqNb>200000011</ElctrncSeqNb>
- <LglSeqNb>005</LglSeqNb>
- <CreDtTm>2020-05-29T23:41:21.0+02:00</CreDtTm>
- <Acct>
- <Id>
- <IBAN>GB33BUKB20201555555555</IBAN>
- </Id>
- <Ccy>EUR</Ccy>
- <Ownr>
- <Nm>Taler Exchange</Nm>
- </Ownr>
- <Svcr>
- <FinInstnId>
- <BIC>GENODEM1GLS</BIC>
- <Nm>GLS Gemeinschaftsbank eG</Nm>
- <Othr>
- <Id>DE 124090847</Id>
- <Issr>UmsStId</Issr>
- </Othr>
- </FinInstnId>
- </Svcr>
- </Acct>
- <Bal>
- <Tp>
- <CdOrPrtry>
- <Cd>PRCD</Cd>
- </CdOrPrtry>
- </Tp>
- <Amt Ccy="EUR">202.01</Amt>
- <CdtDbtInd>CRDT</CdtDbtInd>
- <Dt>
- <Dt>2020-05-29</Dt>
- </Dt>
- </Bal>
- <Bal>
- <Tp>
- <CdOrPrtry>
- <Cd>CLBD</Cd>
- </CdOrPrtry>
- </Tp>
- <Amt Ccy="EUR">199.34</Amt>
- <CdtDbtInd>CRDT</CdtDbtInd>
- <Dt>
- <Dt>2020-05-29</Dt>
- </Dt>
- </Bal>
- <Ntry>
- <Amt Ccy="EUR">2.35</Amt>
- <CdtDbtInd>DBIT</CdtDbtInd>
- <Sts>BOOK</Sts>
- <BookgDt>
- <Dt>2020-05-29</Dt>
- </BookgDt>
- <ValDt>
- <Dt>2020-05-29</Dt>
- </ValDt>
- <AcctSvcrRef>2020052912023838000</AcctSvcrRef>
- <BkTxCd>
- <Domn>
- <Cd>PMNT</Cd>
- <Fmly>
- <Cd>RRCT</Cd>
- <SubFmlyCd>ESCT</SubFmlyCd>
- </Fmly>
- </Domn>
- <Prtry>
- <Cd>NTRF+168+00931</Cd>
- <Issr>DK</Issr>
- </Prtry>
- </BkTxCd>
- <NtryDtls>
- <TxDtls>
- <Refs>
- <EndToEndId>NOTPROVIDED</EndToEndId>
- </Refs>
- <AmtDtls>
- <TxAmt>
- <Amt Ccy="EUR">2.35</Amt>
- </TxAmt>
- </AmtDtls>
- <BkTxCd>
- <Domn>
- <Cd>PMNT</Cd>
- <Fmly>
- <Cd>RRCT</Cd>
- <SubFmlyCd>ESCT</SubFmlyCd>
- </Fmly>
- </Domn>
- <Prtry>
- <Cd>NTRF+168+00931</Cd>
- <Issr>DK</Issr>
- </Prtry>
- </BkTxCd>
- <RltdPties>
- <Dbtr>
- <Nm>TALER WALLET USER</Nm>
- </Dbtr>
- <DbtrAcct>
- <Id>
- <IBAN>GB33BUKB20201555555555</IBAN>
- </Id>
- </DbtrAcct>
- <Cdtr>
- <Nm>Taler Exchange</Nm>
- </Cdtr>
- <CdtrAcct>
- <Id>
- <IBAN>DE00000000000000000000</IBAN>
- </Id>
- </CdtrAcct>
- </RltdPties>
- <RltdAgts>
- <DbtrAgt>
- <FinInstnId>
- <BIC>BYLADEM1WOR</BIC>
- </FinInstnId>
- </DbtrAgt>
- </RltdAgts>
- <RmtInf>
- <Ustrd>Überweisung Test Nr. 1 Referenz-Nummer
0FMRBH8FZYYMSQ2RHTYYGK2BV33JVSW6MTYCV7Y833GVNXFDYK10</Ustrd>
- </RmtInf>
- </TxDtls>
- </NtryDtls>
- <AddtlNtryInf>Überweisungsgutschr.</AddtlNtryInf>
- </Ntry>
- <Ntry>
- <Amt Ccy="EUR">3.15</Amt>
- <CdtDbtInd>CRDT</CdtDbtInd>
- <Sts>BOOK</Sts>
- <BookgDt>
- <Dt>2020-05-29</Dt>
- </BookgDt>
- <ValDt>
- <Dt>2020-05-29</Dt>
- </ValDt>
- <AcctSvcrRef>2020052913163282000</AcctSvcrRef>
- <BkTxCd>
- <Domn>
- <Cd>PMNT</Cd>
- <Fmly>
- <Cd>RRCT</Cd>
- <SubFmlyCd>ESCT</SubFmlyCd>
- </Fmly>
- </Domn>
- <Prtry>
- <Cd>NTRF+168+00931</Cd>
- <Issr>DK</Issr>
- </Prtry>
- </BkTxCd>
- <NtryDtls>
- <TxDtls>
- <Refs>
- <EndToEndId>NOTPROVIDED</EndToEndId>
- </Refs>
- <AmtDtls>
- <TxAmt>
- <Amt Ccy="EUR">3.15</Amt>
- </TxAmt>
- </AmtDtls>
- <BkTxCd>
- <Domn>
- <Cd>PMNT</Cd>
- <Fmly>
- <Cd>RRCT</Cd>
- <SubFmlyCd>ESCT</SubFmlyCd>
- </Fmly>
- </Domn>
- <Prtry>
- <Cd>NTRF+168+00931</Cd>
- <Issr>DK</Issr>
- </Prtry>
- </BkTxCd>
- <RltdPties>
- <Dbtr>
- <Nm>TALER WALLET USER</Nm>
- </Dbtr>
- <DbtrAcct>
- <Id>
- <IBAN>DE00000000000000000000</IBAN>
- </Id>
- </DbtrAcct>
- <Cdtr>
- <Nm>Taler Exchange</Nm>
- </Cdtr>
- <CdtrAcct>
- <Id>
- <IBAN>DE00000000000000000000</IBAN>
- </Id>
- </CdtrAcct>
- </RltdPties>
- <RltdAgts>
- <DbtrAgt>
- <FinInstnId>
- <BIC>BYLADEM1WOR</BIC>
- </FinInstnId>
- </DbtrAgt>
- </RltdAgts>
- <RmtInf>
- <Ustrd>Überweisung Mai, Test Nr. 2</Ustrd>
- </RmtInf>
- </TxDtls>
- </NtryDtls>
- <AddtlNtryInf>Überweisungsgutschr.</AddtlNtryInf>
- </Ntry>
- <Ntry>
- <Amt Ccy="EUR">1.79</Amt>
- <CdtDbtInd>CRDT</CdtDbtInd>
- <Sts>BOOK</Sts>
- <BookgDt>
- <Dt>2020-05-29</Dt>
- </BookgDt>
- <ValDt>
- <Dt>2020-05-29</Dt>
- </ValDt>
- <AcctSvcrRef>2020052913183564000</AcctSvcrRef>
- <BkTxCd>
- <Domn>
- <Cd>PMNT</Cd>
- <Fmly>
- <Cd>RRCT</Cd>
- <SubFmlyCd>ESCT</SubFmlyCd>
- </Fmly>
- </Domn>
- <Prtry>
- <Cd>NTRF+168+00931</Cd>
- <Issr>DK</Issr>
- </Prtry>
- </BkTxCd>
- <NtryDtls>
- <TxDtls>
- <Refs>
- <EndToEndId>NOTPROVIDED</EndToEndId>
- </Refs>
- <AmtDtls>
- <TxAmt>
- <Amt Ccy="EUR">1.79</Amt>
- </TxAmt>
- </AmtDtls>
- <BkTxCd>
- <Domn>
- <Cd>PMNT</Cd>
- <Fmly>
- <Cd>RRCT</Cd>
- <SubFmlyCd>ESCT</SubFmlyCd>
- </Fmly>
- </Domn>
- <Prtry>
- <Cd>NTRF+168+00931</Cd>
- <Issr>DK</Issr>
- </Prtry>
- </BkTxCd>
- <RltdPties>
- <Dbtr>
- <Nm>TALER EXCHANGE</Nm>
- </Dbtr>
- <DbtrAcct>
- <Id>
- <IBAN>DE00000000000000000000</IBAN>
- </Id>
- </DbtrAcct>
- <Cdtr>
- <Nm>Taler Merchant</Nm>
- </Cdtr>
- <CdtrAcct>
- <Id>
- <IBAN>DE00000000000000000000</IBAN>
- </Id>
- </CdtrAcct>
- </RltdPties>
- <RltdAgts>
- <DbtrAgt>
- <FinInstnId>
- <BIC>BYLADEM1WOR</BIC>
- </FinInstnId>
- </DbtrAgt>
- </RltdAgts>
- <RmtInf>
- <Ustrd>Überweisung Mai, Test Nr. 3</Ustrd>
- </RmtInf>
- </TxDtls>
- </NtryDtls>
- <AddtlNtryInf>Überweisungsgutschr.</AddtlNtryInf>
- </Ntry>
- <Ntry>
- <Amt Ccy="EUR">9.96</Amt>
- <CdtDbtInd>DBIT</CdtDbtInd>
- <Sts>BOOK</Sts>
- <BookgDt>
- <Dt>2020-05-29</Dt>
- </BookgDt>
- <ValDt>
- <Dt>2020-05-31</Dt>
- </ValDt>
- <AcctSvcrRef>2020052921190458000</AcctSvcrRef>
- <BkTxCd>
- <Prtry>
- <Cd>NMSC+805+00905</Cd>
- <Issr>DK</Issr>
- </Prtry>
- </BkTxCd>
- <NtryDtls>
- <TxDtls>
- <AmtDtls>
- <TxAmt>
- <Amt Ccy="EUR">9.96</Amt>
- </TxAmt>
- </AmtDtls>
- <BkTxCd>
- <Prtry>
- <Cd>NMSC+805+00905</Cd>
- <Issr>DK</Issr>
- </Prtry>
- </BkTxCd>
- <RmtInf>
- <Ustrd>ABSCHLUSS PER 31.05.2020</Ustrd>
- </RmtInf>
- </TxDtls>
- </NtryDtls>
- <AddtlNtryInf>Abschluss</AddtlNtryInf>
- </Ntry>
- </Stmt>
- </BkToCstmrStmt>
-</Document>
diff --git a/integration-tests/camt53-gls-style-1.json
b/integration-tests/camt53-gls-style-1.json
deleted file mode 100644
index 1825322..0000000
--- a/integration-tests/camt53-gls-style-1.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "transactions" : []
-}
diff --git a/integration-tests/camt53-gls-style-1.xml
b/integration-tests/camt53-gls-style-1.xml
deleted file mode 100644
index 9d6e8f8..0000000
--- a/integration-tests/camt53-gls-style-1.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?><Document
xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02
camt.053.001.02.xsd">
- <BkToCstmrStmt>
- <GrpHdr>
- <MsgId>053D2020-05-29T23:41:27.0N200000011</MsgId>
- <CreDtTm>2020-05-29T23:41:21.0+02:00</CreDtTm>
- <MsgPgntn>
- <PgNb>001</PgNb>
- <LastPgInd>true</LastPgInd>
- </MsgPgntn>
- </GrpHdr>
- <Stmt>
- <Id>4967C532020052923412775014049078800</Id>
- <ElctrncSeqNb>200000011</ElctrncSeqNb>
- <LglSeqNb>005</LglSeqNb>
- <CreDtTm>2020-05-29T23:41:21.0+02:00</CreDtTm>
- <Acct>
- <Id>
- <IBAN>GB33BUKB20201555555555</IBAN>
- </Id>
- <Ccy>EUR</Ccy>
- <Ownr>
- <Nm>Taler Exchange</Nm>
- </Ownr>
- <Svcr>
- <FinInstnId>
- <BIC>GENODEM1GLS</BIC>
- <Nm>GLS Gemeinschaftsbank eG</Nm>
- <Othr>
- <Id>DE 124090847</Id>
- <Issr>UmsStId</Issr>
- </Othr>
- </FinInstnId>
- </Svcr>
- </Acct>
- <Bal>
- <Tp>
- <CdOrPrtry>
- <Cd>PRCD</Cd>
- </CdOrPrtry>
- </Tp>
- <Amt Ccy="EUR">202.01</Amt>
- <CdtDbtInd>CRDT</CdtDbtInd>
- <Dt>
- <Dt>2020-05-29</Dt>
- </Dt>
- </Bal>
- <Bal>
- <Tp>
- <CdOrPrtry>
- <Cd>CLBD</Cd>
- </CdOrPrtry>
- </Tp>
- <Amt Ccy="EUR">199.34</Amt>
- <CdtDbtInd>CRDT</CdtDbtInd>
- <Dt>
- <Dt>2020-05-29</Dt>
- </Dt>
- </Bal>
- <Ntry>
- <Amt Ccy="EUR">9.96</Amt>
- <CdtDbtInd>DBIT</CdtDbtInd>
- <Sts>BOOK</Sts>
- <BookgDt>
- <Dt>2020-05-29</Dt>
- </BookgDt>
- <ValDt>
- <Dt>2020-05-31</Dt>
- </ValDt>
- <AcctSvcrRef>2020052921190458000</AcctSvcrRef>
- <BkTxCd>
- <Prtry>
- <Cd>NMSC+805+00905</Cd>
- <Issr>DK</Issr>
- </Prtry>
- </BkTxCd>
- <NtryDtls>
- <TxDtls>
- <AmtDtls>
- <TxAmt>
- <Amt Ccy="EUR">9.96</Amt>
- </TxAmt>
- </AmtDtls>
- <BkTxCd>
- <Prtry>
- <Cd>NMSC+805+00905</Cd>
- <Issr>DK</Issr>
- </Prtry>
- </BkTxCd>
- <RmtInf>
- <Ustrd>Makes the report unacceptable</Ustrd>
- </RmtInf>
- </TxDtls>
- <TxDtls>
- <AmtDtls>
- <TxAmt>
- <Amt Ccy="EUR">9.96</Amt>
- </TxAmt>
- </AmtDtls>
- <BkTxCd>
- <Prtry>
- <Cd>NMSC+805+00905</Cd>
- <Issr>DK</Issr>
- </Prtry>
- </BkTxCd>
- <RmtInf>
- <Ustrd>ABSCHLUSS PER 31.05.2020</Ustrd>
- </RmtInf>
- </TxDtls>
- </NtryDtls>
- <AddtlNtryInf>Abschluss</AddtlNtryInf>
- </Ntry>
- </Stmt>
- </BkToCstmrStmt>
-</Document>
diff --git a/integration-tests/tests.py b/integration-tests/tests.py
index 777701d..d0e8e5b 100755
--- a/integration-tests/tests.py
+++ b/integration-tests/tests.py
@@ -410,7 +410,7 @@ def test_double_connection_name():
)
def test_ingestion_camt53_non_singleton():
- with open("camt53-gls-style-1.xml") as f:
+ with open("../parsing-tests/samples/camt53-gls-style-1.xml") as f:
camt = f.read()
assertResponse(
post(
@@ -425,13 +425,13 @@ def test_ingestion_camt53_non_singleton():
auth=PERSONA.nexus.auth
)
)
- with open("camt53-gls-style-1.json") as f:
+ with open("../parsing-tests/samples/camt53-gls-style-1.json") as f:
expected_txs = f.read()
assert not dd(resp.json(), json.loads(expected_txs), ignore_order=True)
def test_ingestion_camt53():
- with open("camt53-gls-style-0.xml") as f:
+ with open("../parsing-tests/samples/camt53-gls-style-0.xml") as f:
camt = f.read()
assertResponse(
post(
@@ -446,7 +446,7 @@ def test_ingestion_camt53():
auth=PERSONA.nexus.auth
)
)
- with open("camt53-gls-style-0.json") as f:
+ with open("../parsing-tests/samples/camt53-gls-style-0.json") as f:
expected_txs = f.read()
assert not dd(resp.json(), json.loads(expected_txs), ignore_order=True)
diff --git a/parsing-tests/samples b/parsing-tests/samples
index 6ab75e6..63f075c 160000
--- a/parsing-tests/samples
+++ b/parsing-tests/samples
@@ -1 +1 @@
-Subproject commit 6ab75e63f095f3cfdf1080fa01e73909d7d5f5c2
+Subproject commit 63f075c6f61173f4ee68c39b30d860fd20a299dc
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [libeufin] branch master updated (628c658 -> 57f4362),
gnunet <=