diff options
Diffstat (limited to 'src/testing/testing_api_cmd_insert_deposit.c')
-rw-r--r-- | src/testing/testing_api_cmd_insert_deposit.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/testing/testing_api_cmd_insert_deposit.c b/src/testing/testing_api_cmd_insert_deposit.c index b614702a3..0d57ab6c4 100644 --- a/src/testing/testing_api_cmd_insert_deposit.c +++ b/src/testing/testing_api_cmd_insert_deposit.c | |||
@@ -149,16 +149,13 @@ insert_deposit_run (void *cls, | |||
149 | 149 | ||
150 | if ( (GNUNET_OK != | 150 | if ( (GNUNET_OK != |
151 | ids->dbc->plugin->start (ids->dbc->plugin->cls, | 151 | ids->dbc->plugin->start (ids->dbc->plugin->cls, |
152 | ids->dbc->session, | ||
153 | "talertestinglib: denomination insertion")) || | 152 | "talertestinglib: denomination insertion")) || |
154 | (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != | 153 | (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != |
155 | ids->dbc->plugin->insert_denomination_info (ids->dbc->plugin->cls, | 154 | ids->dbc->plugin->insert_denomination_info (ids->dbc->plugin->cls, |
156 | ids->dbc->session, | ||
157 | &dpk, | 155 | &dpk, |
158 | &issue)) || | 156 | &issue)) || |
159 | (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS != | 157 | (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS != |
160 | ids->dbc->plugin->commit (ids->dbc->plugin->cls, | 158 | ids->dbc->plugin->commit (ids->dbc->plugin->cls)) ) |
161 | ids->dbc->session)) ) | ||
162 | { | 159 | { |
163 | TALER_TESTING_interpreter_fail (is); | 160 | TALER_TESTING_interpreter_fail (is); |
164 | return; | 161 | return; |
@@ -228,24 +225,19 @@ insert_deposit_run (void *cls, | |||
228 | /* finally, actually perform the DB operation */ | 225 | /* finally, actually perform the DB operation */ |
229 | if ( (GNUNET_OK != | 226 | if ( (GNUNET_OK != |
230 | ids->dbc->plugin->start (ids->dbc->plugin->cls, | 227 | ids->dbc->plugin->start (ids->dbc->plugin->cls, |
231 | ids->dbc->session, | ||
232 | "libtalertesting: insert deposit")) || | 228 | "libtalertesting: insert deposit")) || |
233 | (0 > | 229 | (0 > |
234 | ids->dbc->plugin->ensure_coin_known (ids->dbc->plugin->cls, | 230 | ids->dbc->plugin->ensure_coin_known (ids->dbc->plugin->cls, |
235 | ids->dbc->session, | ||
236 | &deposit.coin)) || | 231 | &deposit.coin)) || |
237 | (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != | 232 | (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != |
238 | ids->dbc->plugin->insert_deposit (ids->dbc->plugin->cls, | 233 | ids->dbc->plugin->insert_deposit (ids->dbc->plugin->cls, |
239 | ids->dbc->session, | ||
240 | ids->exchange_timestamp, | 234 | ids->exchange_timestamp, |
241 | &deposit)) || | 235 | &deposit)) || |
242 | (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS != | 236 | (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS != |
243 | ids->dbc->plugin->commit (ids->dbc->plugin->cls, | 237 | ids->dbc->plugin->commit (ids->dbc->plugin->cls)) ) |
244 | ids->dbc->session)) ) | ||
245 | { | 238 | { |
246 | GNUNET_break (0); | 239 | GNUNET_break (0); |
247 | ids->dbc->plugin->rollback (ids->dbc->plugin->cls, | 240 | ids->dbc->plugin->rollback (ids->dbc->plugin->cls); |
248 | ids->dbc->session); | ||
249 | TALER_TESTING_interpreter_fail (is); | 241 | TALER_TESTING_interpreter_fail (is); |
250 | } | 242 | } |
251 | 243 | ||
@@ -302,7 +294,7 @@ insert_deposit_traits (void *cls, | |||
302 | * Make the "insert-deposit" CMD. | 294 | * Make the "insert-deposit" CMD. |
303 | * | 295 | * |
304 | * @param label command label. | 296 | * @param label command label. |
305 | * @param dbc collects database plugin and session handles. | 297 | * @param dbc collects database plugin |
306 | * @param merchant_name Human-readable name of the merchant. | 298 | * @param merchant_name Human-readable name of the merchant. |
307 | * @param merchant_account merchant's account name (NOT a payto:// URI) | 299 | * @param merchant_account merchant's account name (NOT a payto:// URI) |
308 | * @param exchange_timestamp when did the exchange receive the deposit | 300 | * @param exchange_timestamp when did the exchange receive the deposit |