diff options
Diffstat (limited to 'src/testing/testing_api_cmd_deposits_get.c')
-rw-r--r-- | src/testing/testing_api_cmd_deposits_get.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/src/testing/testing_api_cmd_deposits_get.c b/src/testing/testing_api_cmd_deposits_get.c index fd02e75bb..6f0140116 100644 --- a/src/testing/testing_api_cmd_deposits_get.c +++ b/src/testing/testing_api_cmd_deposits_get.c | |||
@@ -81,29 +81,17 @@ struct TrackTransactionState | |||
81 | * | 81 | * |
82 | * @param cls closure. | 82 | * @param cls closure. |
83 | * @param hr HTTP response details | 83 | * @param hr HTTP response details |
84 | * @param exchange_pub public key of the exchange | 84 | * @param dd data about the wire transfer associated with the deposit |
85 | * @param wtid wire transfer identifier, NULL if exchange did not | ||
86 | * execute the transaction yet. | ||
87 | * @param execution_time actual or planned execution time for the | ||
88 | * wire transfer. | ||
89 | * @param coin_contribution contribution to the total amount of | ||
90 | * the deposited coin (can be NULL). | ||
91 | */ | 85 | */ |
92 | static void | 86 | static void |
93 | deposit_wtid_cb (void *cls, | 87 | deposit_wtid_cb (void *cls, |
94 | const struct TALER_EXCHANGE_HttpResponse *hr, | 88 | const struct TALER_EXCHANGE_HttpResponse *hr, |
95 | const struct TALER_ExchangePublicKeyP *exchange_pub, | 89 | const struct TALER_EXCHANGE_DepositData *dd) |
96 | const struct TALER_WireTransferIdentifierRawP *wtid, | ||
97 | struct GNUNET_TIME_Absolute execution_time, | ||
98 | const struct TALER_Amount *coin_contribution) | ||
99 | { | 90 | { |
100 | struct TrackTransactionState *tts = cls; | 91 | struct TrackTransactionState *tts = cls; |
101 | struct TALER_TESTING_Interpreter *is = tts->is; | 92 | struct TALER_TESTING_Interpreter *is = tts->is; |
102 | struct TALER_TESTING_Command *cmd = &is->commands[is->ip]; | 93 | struct TALER_TESTING_Command *cmd = &is->commands[is->ip]; |
103 | 94 | ||
104 | (void) coin_contribution; | ||
105 | (void) exchange_pub; | ||
106 | (void) execution_time; | ||
107 | tts->tth = NULL; | 95 | tts->tth = NULL; |
108 | if (tts->expected_response_code != hr->http_status) | 96 | if (tts->expected_response_code != hr->http_status) |
109 | { | 97 | { |
@@ -123,7 +111,8 @@ deposit_wtid_cb (void *cls, | |||
123 | switch (hr->http_status) | 111 | switch (hr->http_status) |
124 | { | 112 | { |
125 | case MHD_HTTP_OK: | 113 | case MHD_HTTP_OK: |
126 | tts->wtid = *wtid; | 114 | GNUNET_assert (NULL != dd->wtid); |
115 | tts->wtid = *dd->wtid; | ||
127 | if (NULL != tts->bank_transfer_reference) | 116 | if (NULL != tts->bank_transfer_reference) |
128 | { | 117 | { |
129 | const struct TALER_TESTING_Command *bank_transfer_cmd; | 118 | const struct TALER_TESTING_Command *bank_transfer_cmd; |
@@ -151,7 +140,7 @@ deposit_wtid_cb (void *cls, | |||
151 | } | 140 | } |
152 | 141 | ||
153 | /* Compare that expected and gotten subjects match. */ | 142 | /* Compare that expected and gotten subjects match. */ |
154 | if (0 != GNUNET_memcmp (wtid, | 143 | if (0 != GNUNET_memcmp (dd->wtid, |
155 | wtid_want)) | 144 | wtid_want)) |
156 | { | 145 | { |
157 | GNUNET_break (0); | 146 | GNUNET_break (0); |