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

Merge branch 'master' of taler.net:/var/git/mint

Browse Source
This commit is contained in:
Fournier Nicolas 2015-06-12 12:12:44 +02:00
commit b1e0dd8b7e
3 changed files with 73 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/include/taler_mintdb_plugin.h
View File

@ -813,7 +813,10 @@ struct TALER_MINTDB_Plugin
* @param deposit deposit to search for
* @return #GNUNET_YES if we know this operation,
* #GNUNET_NO if this deposit is unknown to us,
* #GNUNET_SYSERR on internal error
* #GNUNET_SYSERR on DB error or if same coin(pub), merchant(pub) and
* transaction ID are already in DB, but for different
* other transaction details (contract, wiring details,
* amount, etc.)
*/
int
(*have_deposit) (void *cls,

88
src/mintdb/plugin_mintdb_postgres.c
View File

@ -797,18 +797,13 @@ postgres_prepare (PGconn *db_conn)
during /deposit processing. Used in #postgres_have_deposit(). */
PREPARE ("get_deposit",
"SELECT"
" denom_pub" /* Note: not actually used (yet), #3819 */
",amount_with_fee_val" /* Note: not actually used (yet), #3819 */
",amount_with_fee_frac" /* Note: not actually used (yet), #3819 */
",amount_with_fee_curr" /* Note: not actually used (yet), #3819 */
",deposit_fee_val" /* Note: not actually used (yet), #3819 */
",deposit_fee_frac" /* Note: not actually used (yet), #3819 */
",deposit_fee_curr" /* Note: not actually used (yet), #3819 */
",timestamp" /* Note: not actually used (yet), #3819 */
",refund_deadline" /* Note: not actually used (yet), #3819 */
",h_contract" /* Note: not actually used (yet), #3819 */
",h_wire" /* Note: not actually used (yet), #3819 */
",coin_sig" /* Note: not actually used (yet), #3819 */
" amount_with_fee_val"
",amount_with_fee_frac"
",amount_with_fee_curr"
",timestamp"
",refund_deadline"
",h_contract"
",h_wire"
" FROM deposits"
" WHERE ("
" (coin_pub=$1) AND"
@ -1759,6 +1754,10 @@ postgres_get_reserve_history (void *cls,
* @param deposit deposit to search for
* @return #GNUNET_YES if we know this operation,
* #GNUNET_NO if this deposit is unknown to us
* #GNUNET_SYSERR on DB error or if same coin(pub), merchant(pub) and
* transaction ID are already in DB, but for different
* other transaction details (contract, wiring details,
* amount, etc.)
*/
static int
postgres_have_deposit (void *cls,
@ -1772,9 +1771,7 @@ postgres_have_deposit (void *cls,
TALER_PQ_query_param_end
};
PGresult *result;
int ret;
ret = GNUNET_SYSERR;
result = TALER_PQ_exec_prepared (session->conn,
"get_deposit",
params);
@ -1782,16 +1779,63 @@ postgres_have_deposit (void *cls,
PQresultStatus (result))
{
BREAK_DB_ERR (result);
goto cleanup;
PQclear (result);
return GNUNET_SYSERR;
}
if (0 == PQntuples (result))
{
PQclear (result);
return GNUNET_NO;
}
/* Now we check that the other information in @a deposit
also matches, and if not report inconsistencies. */
{
struct TALER_MINTDB_Deposit deposit2;
struct TALER_PQ_ResultSpec rs[] = {
TALER_PQ_result_spec_amount ("amount_with_fee",
&deposit2.amount_with_fee),
TALER_PQ_result_spec_absolute_time ("timestamp",
&deposit2.timestamp),
TALER_PQ_result_spec_absolute_time ("refund_deadline",
&deposit2.refund_deadline),
TALER_PQ_result_spec_auto_from_type ("h_contract",
&deposit2.h_contract),
TALER_PQ_result_spec_auto_from_type ("h_wire",
&deposit2.h_wire),
TALER_PQ_result_spec_end
};
if (GNUNET_OK !=
TALER_PQ_extract_result (result, rs, 0))
{
GNUNET_break (0);
PQclear (result);
return GNUNET_SYSERR;
}
if ( (0 != TALER_amount_cmp (&deposit->amount_with_fee,
&deposit2.amount_with_fee)) ||
(deposit->timestamp.abs_value_us !=
deposit2.timestamp.abs_value_us) ||
(deposit->refund_deadline.abs_value_us !=
deposit2.refund_deadline.abs_value_us) ||
(0 != memcmp (&deposit->h_contract,
&deposit2.h_contract,
sizeof (struct GNUNET_HashCode))) ||
(0 != memcmp (&deposit->h_wire,
&deposit2.h_wire,
sizeof (struct GNUNET_HashCode))) )
{
/* Inconsistencies detected! Bug in merchant! (We might want to
expand the API with a 'get_deposit' function to return the
original transaction details to be used for an error message
in the future!) #3838 */
GNUNET_break_op (0);
PQclear (result);
return GNUNET_SYSERR;
}
}
ret = (0 == PQntuples (result)) ? GNUNET_NO : GNUNET_YES;
/* NOTE: maybe check that the other information in @a deposit
also matches, and if not report inconsistencies? Right now,
if the merchant re-uses a transaction ID, the mint silently
ignores the second request (not ideal..., #3819) */
cleanup:
PQclear (result);
return ret;
return GNUNET_YES;
}

6
src/mintdb/test_mintdb.c
View File

@ -239,9 +239,9 @@ run (void *cls,
goto drop;
}
RND_BLK (&reserve_pub);
amount.value = 1;
amount.fraction = 1;
strcpy (amount.currency, CURRENCY);
GNUNET_assert (GNUNET_OK ==
TALER_string_to_amount (CURRENCY ":1.000001",
&amount));
result = 4;
just = json_loads ("{ \"justification\":\"1\" }", 0, NULL);
FAILIF (GNUNET_OK !=