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

small corrections after manual merge conflict resolutions

Browse Source
This commit is contained in:
Özgür Kesim 2022-02-16 01:08:07 +01:00
parent 4f1bd04fc2
commit d687446a13
Signed by: oec
GPG Key ID: 3D76A56D79EDD9D7
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/exchange/taler-exchange-httpd_keys.c
View File

@ -804,6 +804,8 @@ load_age_mask (const char*section_name)
TEH_cfg,
section_name,
"AGE_RESTRICTED")))
return null_mask;
{
enum GNUNET_GenericReturnValue ret;

1
src/lib/exchange_api_link.c
View File

@ -144,6 +144,7 @@ parse_link_coin (const struct TALER_EXCHANGE_LinkHandle *lh,
&alg_values,
&bks,
&lci->coin_priv,
NULL, /* FIXME-oec. struct TALER_AgeCommitmentHash */
&c_hash,
&pd))
{

3
src/lib/exchange_api_refresh_common.c
View File

@ -62,7 +62,6 @@ TALER_EXCHANGE_get_melt_data_ (
struct MeltData *md)
{
struct TALER_Amount total;
struct TALER_AgeCommitmentHash ach = {0};
struct TALER_CoinSpendPublicKeyP coin_pub;
struct TALER_CsNonce nonces[rd->fresh_pks_len];
@ -176,7 +175,7 @@ TALER_EXCHANGE_get_melt_data_ (
&alg_values[j],
bks,
coin_priv,
ach,
NULL, /* FIXME-oec: This needs to be setup !*/
&c_hash,
&pd))
{

4
src/lib/exchange_api_refreshes_reveal.c
View File

@ -162,9 +162,9 @@ refresh_reveal_ok (struct TALER_EXCHANGE_RefreshesRevealHandle *rrh,
GNUNET_assert (NULL != jsonai);
if (! TALER_AgeCommitmentHash_isNullOrZero (
&rrh->md->melted_coin.h_age_commitment))
&rrh->md.melted_coin.h_age_commitment))
{
ach = &rrh->md->fresh_ach[rrh->noreveal_index][i];
/* FIXME-oec: need to pull fresh_ach from somewhere */
}
if (GNUNET_OK !=

4
src/lib/exchange_api_withdraw.c
View File

@ -228,6 +228,7 @@ withdraw_cs_stage_two_callback (void *cls,
&wh->alg_values,
&wh->bks,
&wh->priv,
wh->ach,
&wh->c_hash,
&wh->pd))
{
@ -260,7 +261,6 @@ TALER_EXCHANGE_withdraw (
void *res_cb_cls)
{
struct TALER_EXCHANGE_WithdrawHandle *wh;
bool age_restricted = (0 != pk->key.age_mask.mask);
wh = GNUNET_new (struct TALER_EXCHANGE_WithdrawHandle);
wh->exchange = exchange;
@ -289,7 +289,7 @@ TALER_EXCHANGE_withdraw (
&wh->alg_values,
&wh->bks,
&wh->priv,
&wh->ach,
wh->ach,
&wh->c_hash,
&wh->pd))
{

2
src/testing/test_exchange_api.c
View File

@ -1048,7 +1048,7 @@ run (void *cls,
MHD_HTTP_NO_CONTENT,
false),
TALER_TESTING_cmd_exec_offline_sign_extensions ("offline-sign-extensions",
CONFIG_FILE),
config_file),
TALER_TESTING_cmd_wire_add ("add-wire-account",
"payto://x-taler-bank/localhost/2",
MHD_HTTP_NO_CONTENT,