diff options
| author | Özgür Kesim <oec-taler@kesim.org> | 2022-02-22 14:27:15 +0100 |
|---|---|---|
| committer | Özgür Kesim <oec-taler@kesim.org> | 2022-02-22 14:34:47 +0100 |
| commit | 26158fc72505be6323282dc39509fd531c10a290 (patch) | |
| tree | 117e5b7a580c056717a0303fc9f82c391207ff67 /src/lib/exchange_api_refreshes_reveal.c | |
| parent | 0141a8216162a33b4656f95a2d5305843ca4aeba (diff) | |
| download | exchange-26158fc72505be6323282dc39509fd531c10a290.tar.gz exchange-26158fc72505be6323282dc39509fd531c10a290.tar.bz2 exchange-26158fc72505be6323282dc39509fd531c10a290.zip | |
[age restriction] progress 16/n - refresh/reveal/link tests
Age restriction works now with withdraw, melt/refresh/reveal and link,
including tests.
However, there is still a problem with the tests: The melting operation
"refresh-melt-failing-age" that should fail (because of conflict), but
currently fails for other reasons. I decided to disable that particular
test (and the next) and submit the patch I have so far.
Diffstat (limited to 'src/lib/exchange_api_refreshes_reveal.c')
| -rw-r--r-- | src/lib/exchange_api_refreshes_reveal.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/lib/exchange_api_refreshes_reveal.c b/src/lib/exchange_api_refreshes_reveal.c index 461432db7..881c7e731 100644 --- a/src/lib/exchange_api_refreshes_reveal.c +++ b/src/lib/exchange_api_refreshes_reveal.c @@ -336,6 +336,7 @@ TALER_EXCHANGE_refreshes_reveal ( json_t *coin_evs; json_t *reveal_obj; json_t *link_sigs; + json_t *old_age_commitment = NULL; CURL *eh; struct GNUNET_CURL_Context *ctx; struct MeltData md; @@ -427,6 +428,22 @@ TALER_EXCHANGE_refreshes_reveal ( &md.transfer_priv[j]))); } + /* build array of old age commitment, if applicable */ + GNUNET_assert ((NULL == rd->melt_age_commitment) == + (NULL == rd->melt_h_age_commitment)); + if (NULL != rd->melt_age_commitment) + { + GNUNET_assert (NULL != (old_age_commitment = json_array ())); + + for (size_t i = 0; i < rd->melt_age_commitment->num_pub; i++) + { + GNUNET_assert (0 == + json_array_append_new (old_age_commitment, + GNUNET_JSON_from_data_auto ( + &rd->melt_age_commitment->pub[i]))); + } + } + /* build main JSON request */ reveal_obj = GNUNET_JSON_PACK ( GNUNET_JSON_pack_data_auto ("transfer_pub", @@ -437,6 +454,9 @@ TALER_EXCHANGE_refreshes_reveal ( rms) : GNUNET_JSON_pack_string ("rms", NULL)), + GNUNET_JSON_pack_allow_null ( + GNUNET_JSON_pack_array_steal ("old_age_commitment", + old_age_commitment)), GNUNET_JSON_pack_array_steal ("transfer_privs", transfer_privs), GNUNET_JSON_pack_array_steal ("link_sigs", @@ -480,6 +500,7 @@ TALER_EXCHANGE_refreshes_reveal ( GNUNET_free (rrh); return NULL; } + eh = TALER_EXCHANGE_curl_easy_get_ (rrh->url); if ( (NULL == eh) || (GNUNET_OK != |