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

fix #3935 by removing error message: the test provokes this intentionally

Browse Source
This commit is contained in:
Christian Grothoff 2015-08-09 18:03:42 +02:00
parent e982139186
commit e6ff049c20
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/include/taler_mintdb_plugin.h
View File

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

12
src/mintdb/plugin_mintdb_postgres.c
View File

@ -1751,11 +1751,8 @@ postgres_get_reserve_history (void *cls,
* @param session database connection * @param session database connection
* @param deposit deposit to search for * @param deposit deposit to search for
* @return #GNUNET_YES if we know this operation, * @return #GNUNET_YES if we know this operation,
* #GNUNET_NO if this deposit is unknown to us * #GNUNET_NO if this exact deposit is unknown to us
* #GNUNET_SYSERR on DB error or if same coin(pub), merchant(pub) and * #GNUNET_SYSERR on DB error
* transaction ID are already in DB, but for different
* other transaction details (contract, wiring details,
* amount, etc.)
*/ */
static int static int
postgres_have_deposit (void *cls, postgres_have_deposit (void *cls,
@ -1823,13 +1820,12 @@ postgres_have_deposit (void *cls,
&deposit2.h_wire, &deposit2.h_wire,
sizeof (struct GNUNET_HashCode))) ) sizeof (struct GNUNET_HashCode))) )
{ {
/* Inconsistencies detected! Bug in merchant! (We might want to /* Inconsistencies detected! Does not match! (We might want to
expand the API with a 'get_deposit' function to return the expand the API with a 'get_deposit' function to return the
original transaction details to be used for an error message original transaction details to be used for an error message
in the future!) #3838 */ in the future!) #3838 */
GNUNET_break_op (0);
PQclear (result); PQclear (result);
return GNUNET_SYSERR; return GNUNET_NO;
} }
} }
PQclear (result); PQclear (result);