diff options
Diffstat (limited to 'src/exchange/taler-exchange-httpd_recoup.c')
-rw-r--r-- | src/exchange/taler-exchange-httpd_recoup.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/exchange/taler-exchange-httpd_recoup.c b/src/exchange/taler-exchange-httpd_recoup.c index 521b75627..137034a42 100644 --- a/src/exchange/taler-exchange-httpd_recoup.c +++ b/src/exchange/taler-exchange-httpd_recoup.c | |||
@@ -114,7 +114,6 @@ struct RecoupContext | |||
114 | * | 114 | * |
115 | * @param cls the `struct RecoupContext *` | 115 | * @param cls the `struct RecoupContext *` |
116 | * @param connection MHD request which triggered the transaction | 116 | * @param connection MHD request which triggered the transaction |
117 | * @param session database session to use | ||
118 | * @param[out] mhd_ret set to MHD response status for @a connection, | 117 | * @param[out] mhd_ret set to MHD response status for @a connection, |
119 | * if transaction failed (!) | 118 | * if transaction failed (!) |
120 | * @return transaction status code | 119 | * @return transaction status code |
@@ -122,7 +121,6 @@ struct RecoupContext | |||
122 | static enum GNUNET_DB_QueryStatus | 121 | static enum GNUNET_DB_QueryStatus |
123 | recoup_transaction (void *cls, | 122 | recoup_transaction (void *cls, |
124 | struct MHD_Connection *connection, | 123 | struct MHD_Connection *connection, |
125 | struct TALER_EXCHANGEDB_Session *session, | ||
126 | MHD_RESULT *mhd_ret) | 124 | MHD_RESULT *mhd_ret) |
127 | { | 125 | { |
128 | struct RecoupContext *pc = cls; | 126 | struct RecoupContext *pc = cls; |
@@ -135,7 +133,6 @@ recoup_transaction (void *cls, | |||
135 | /* make sure coin is 'known' in database */ | 133 | /* make sure coin is 'known' in database */ |
136 | qs = TEH_make_coin_known (pc->coin, | 134 | qs = TEH_make_coin_known (pc->coin, |
137 | connection, | 135 | connection, |
138 | session, | ||
139 | mhd_ret); | 136 | mhd_ret); |
140 | if (qs < 0) | 137 | if (qs < 0) |
141 | return qs; | 138 | return qs; |
@@ -145,7 +142,6 @@ recoup_transaction (void *cls, | |||
145 | if (pc->refreshed) | 142 | if (pc->refreshed) |
146 | { | 143 | { |
147 | qs = TEH_plugin->get_old_coin_by_h_blind (TEH_plugin->cls, | 144 | qs = TEH_plugin->get_old_coin_by_h_blind (TEH_plugin->cls, |
148 | session, | ||
149 | &pc->h_blind, | 145 | &pc->h_blind, |
150 | &pc->target.old_coin_pub); | 146 | &pc->target.old_coin_pub); |
151 | if (0 > qs) | 147 | if (0 > qs) |
@@ -164,7 +160,6 @@ recoup_transaction (void *cls, | |||
164 | else | 160 | else |
165 | { | 161 | { |
166 | qs = TEH_plugin->get_reserve_by_h_blind (TEH_plugin->cls, | 162 | qs = TEH_plugin->get_reserve_by_h_blind (TEH_plugin->cls, |
167 | session, | ||
168 | &pc->h_blind, | 163 | &pc->h_blind, |
169 | &pc->target.reserve_pub); | 164 | &pc->target.reserve_pub); |
170 | if (0 > qs) | 165 | if (0 > qs) |
@@ -194,7 +189,6 @@ recoup_transaction (void *cls, | |||
194 | 189 | ||
195 | /* Calculate remaining balance, including recoups already applied. */ | 190 | /* Calculate remaining balance, including recoups already applied. */ |
196 | qs = TEH_plugin->get_coin_transactions (TEH_plugin->cls, | 191 | qs = TEH_plugin->get_coin_transactions (TEH_plugin->cls, |
197 | session, | ||
198 | &pc->coin->coin_pub, | 192 | &pc->coin->coin_pub, |
199 | GNUNET_YES, | 193 | GNUNET_YES, |
200 | &tl); | 194 | &tl); |
@@ -270,8 +264,7 @@ recoup_transaction (void *cls, | |||
270 | /* Recoup has no effect: coin fully spent! */ | 264 | /* Recoup has no effect: coin fully spent! */ |
271 | enum GNUNET_DB_QueryStatus ret; | 265 | enum GNUNET_DB_QueryStatus ret; |
272 | 266 | ||
273 | TEH_plugin->rollback (TEH_plugin->cls, | 267 | TEH_plugin->rollback (TEH_plugin->cls); |
274 | session); | ||
275 | if (GNUNET_NO == existing_recoup_found) | 268 | if (GNUNET_NO == existing_recoup_found) |
276 | { | 269 | { |
277 | /* Refuse: insufficient funds for recoup */ | 270 | /* Refuse: insufficient funds for recoup */ |
@@ -300,7 +293,6 @@ recoup_transaction (void *cls, | |||
300 | if (pc->refreshed) | 293 | if (pc->refreshed) |
301 | { | 294 | { |
302 | qs = TEH_plugin->insert_recoup_refresh_request (TEH_plugin->cls, | 295 | qs = TEH_plugin->insert_recoup_refresh_request (TEH_plugin->cls, |
303 | session, | ||
304 | pc->coin, | 296 | pc->coin, |
305 | pc->coin_sig, | 297 | pc->coin_sig, |
306 | pc->coin_bks, | 298 | pc->coin_bks, |
@@ -311,7 +303,6 @@ recoup_transaction (void *cls, | |||
311 | else | 303 | else |
312 | { | 304 | { |
313 | qs = TEH_plugin->insert_recoup_request (TEH_plugin->cls, | 305 | qs = TEH_plugin->insert_recoup_request (TEH_plugin->cls, |
314 | session, | ||
315 | &pc->target.reserve_pub, | 306 | &pc->target.reserve_pub, |
316 | pc->coin, | 307 | pc->coin, |
317 | pc->coin_sig, | 308 | pc->coin_sig, |