taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix init before use in new refund logic

Browse Source
This commit is contained in:
Christian Grothoff 2016-05-20 15:52:40 +02:00
parent 35509528bc
commit e39beff272
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/exchange/taler-exchange-httpd_responses.c
View File

@ -512,6 +512,7 @@ compile_transaction_history (const struct TALER_EXCHANGEDB_TransactionList *tl)
TALER_amount_hton (&rr.refund_fee, TALER_amount_hton (&rr.refund_fee,
&refund->refund_fee); &refund->refund_fee);
/* internal sanity check before we hand out a bogus sig... */ /* internal sanity check before we hand out a bogus sig... */
sig = &refund->merchant_sig.eddsa_sig;
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_MERCHANT_REFUND, GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_MERCHANT_REFUND,
&rr.purpose, &rr.purpose,
@ -522,7 +523,6 @@ compile_transaction_history (const struct TALER_EXCHANGEDB_TransactionList *tl)
json_decref (history); json_decref (history);
return NULL; return NULL;
} }
sig = &refund->merchant_sig.eddsa_sig;
details = GNUNET_JSON_from_data (&rr.purpose, details = GNUNET_JSON_from_data (&rr.purpose,
sizeof (struct TALER_RefundRequestPS)); sizeof (struct TALER_RefundRequestPS));
} }

3
src/exchangedb/plugin_exchangedb_postgres.c
View File

@ -983,7 +983,8 @@ postgres_prepare (PGconn *db_conn)
" WHERE" " WHERE"
" tiny=false AND" " tiny=false AND"
" done=false AND" " done=false AND"
" wire_deadline<$1" " wire_deadline<=$1 AND"
" refund_deadline<$1"
" ORDER BY wire_deadline ASC" " ORDER BY wire_deadline ASC"
" LIMIT 1", " LIMIT 1",
1, NULL); 1, NULL);

2
src/include/taler_exchangedb_plugin.h
View File

@ -1017,7 +1017,7 @@ struct TALER_EXCHANGEDB_Plugin
/** /**
* Obtain information about deposits that are ready to be executed. * Obtain information about deposits that are ready to be executed.
* Such deposits must not be marked as "tiny" or "done", and the * Such deposits must not be marked as "tiny" or "done", and the
* execution time must be in the past. * execution time and refund deadlines must both be in the past.
* *
* @param cls the @e cls of this struct with the plugin-specific state * @param cls the @e cls of this struct with the plugin-specific state
* @param session connection to the database * @param session connection to the database