diff options
| author | Florian Dold <florian.dold@gmail.com> | 2020-07-22 20:14:26 +0530 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2020-07-22 20:14:26 +0530 |
| commit | 536f91572e268e34b0b007aca3a047c445e06a7c (patch) | |
| tree | dafe3d89042e67bc573cacad25b022b2c31ea05d /src/backenddb | |
| parent | dbc78e917cb1cfd8eb5d0f5b1749fcdb2f8006ad (diff) | |
| download | merchant-536f91572e268e34b0b007aca3a047c445e06a7c.tar.gz merchant-536f91572e268e34b0b007aca3a047c445e06a7c.tar.bz2 merchant-536f91572e268e34b0b007aca3a047c445e06a7c.zip | |
adapt to exchange refund response message changes
Diffstat (limited to 'src/backenddb')
| -rw-r--r-- | src/backenddb/merchant-0001.sql | 4 | ||||
| -rw-r--r-- | src/backenddb/plugin_merchantdb_postgres.c | 9 | ||||
| -rw-r--r-- | src/backenddb/test_merchantdb.c | 4 |
3 files changed, 2 insertions, 15 deletions
diff --git a/src/backenddb/merchant-0001.sql b/src/backenddb/merchant-0001.sql index f6f91f34..e55ea022 100644 --- a/src/backenddb/merchant-0001.sql +++ b/src/backenddb/merchant-0001.sql @@ -334,15 +334,11 @@ CREATE TABLE IF NOT EXISTS merchant_refund_proofs (refund_serial BIGINT PRIMARY KEY REFERENCES merchant_refunds (refund_serial) ON DELETE CASCADE ,exchange_sig BYTEA NOT NULL CHECK (LENGTH(exchange_sig)=64) - ,refund_fee_val INT8 NOT NULL - ,refund_fee_frac INT4 NOT NULL ,signkey_serial BIGINT NOT NULL REFERENCES merchant_exchange_signing_keys (signkey_serial) ON DELETE CASCADE ); COMMENT ON TABLE merchant_refund_proofs IS 'Refunds confirmed by the exchange (not all approved refunds are grabbed by the wallet)'; -COMMENT ON COLUMN merchant_refund_proofs.refund_fee_val - IS 'Refund fee exchange charged'; -------------------- Wire transfers --------------------------- diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c index 06c2a170..3c3eb7a6 100644 --- a/src/backenddb/plugin_merchantdb_postgres.c +++ b/src/backenddb/plugin_merchantdb_postgres.c @@ -3133,7 +3133,6 @@ postgres_lookup_refunds_detailed ( * * @param cls closure * @param refund_serial serial number of the refund - * @param refund_fee refund fee the exchange said it charged * @param exchange_sig signature from exchange that coin was refunded * @param exchange_pub signing key that was used for @a exchange_sig * @return transaction status @@ -3142,7 +3141,6 @@ static enum GNUNET_DB_QueryStatus postgres_insert_refund_proof ( void *cls, uint64_t refund_serial, - const struct TALER_Amount *refund_fee, const struct TALER_ExchangeSignatureP *exchange_sig, const struct TALER_ExchangePublicKeyP *exchange_pub) { @@ -3150,7 +3148,6 @@ postgres_insert_refund_proof ( struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_uint64 (&refund_serial), GNUNET_PQ_query_param_auto_from_type (exchange_sig), - TALER_PQ_query_param_amount (refund_fee), GNUNET_PQ_query_param_auto_from_type (exchange_pub), GNUNET_PQ_query_param_end }; @@ -7472,12 +7469,10 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) "INSERT INTO merchant_refund_proofs" "(refund_serial" ",exchange_sig" - ",refund_fee_val" - ",refund_fee_frac" ",signkey_serial)" - "SELECT $1, $2, $3, $4, signkey_serial" + "SELECT $1, $2, signkey_serial" " FROM merchant_exchange_signing_keys" - " WHERE exchange_pub=$5" + " WHERE exchange_pub=$3" " ORDER BY start_date DESC" " LIMIT 1", 5), diff --git a/src/backenddb/test_merchantdb.c b/src/backenddb/test_merchantdb.c index 9a5cec54..8206f421 100644 --- a/src/backenddb/test_merchantdb.c +++ b/src/backenddb/test_merchantdb.c @@ -6162,8 +6162,6 @@ run_test_refunds (struct TestRefunds_Closure *cls) plugin->insert_refund_proof (plugin->cls, refund_serial, &cls->refund_proof. - refund_fee, - &cls->refund_proof. exchange_sig, &cls->signkey.exchange_pub), "Insert refund proof failed\n"); @@ -6171,8 +6169,6 @@ run_test_refunds (struct TestRefunds_Closure *cls) plugin->insert_refund_proof (plugin->cls, refund_serial, &cls->refund_proof. - refund_fee, - &cls->refund_proof. exchange_sig, &cls->signkey.exchange_pub), "Insert refund proof failed\n"); |