diff options
author | Özgür Kesim <oec-taler@kesim.org> | 2022-02-18 00:44:55 +0100 |
---|---|---|
committer | Özgür Kesim <oec-taler@kesim.org> | 2022-02-18 00:50:31 +0100 |
commit | f4f502d037a84a38db4bc21a1db06324a05d26aa (patch) | |
tree | abd1d813c9e1a9303d60edd3600a9e39f9d3d91a /src/lib/exchange_api_common.c | |
parent | a78b3345fbf017b1cddfd09afb4b2c29287b0bba (diff) | |
parent | 22fe5da700df7328de183470c1c7f59b21c9f4f9 (diff) | |
download | exchange-f4f502d037a84a38db4bc21a1db06324a05d26aa.tar.xz |
-minor merge conflict resolves
Diffstat (limited to 'src/lib/exchange_api_common.c')
-rw-r--r-- | src/lib/exchange_api_common.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/lib/exchange_api_common.c b/src/lib/exchange_api_common.c index d03409244..4f3e878d4 100644 --- a/src/lib/exchange_api_common.c +++ b/src/lib/exchange_api_common.c @@ -171,10 +171,10 @@ TALER_EXCHANGE_parse_reserve_history ( &h_denom_pub); if ( (GNUNET_YES != TALER_amount_cmp_currency (&withdraw_fee, - &dki->fee_withdraw)) || + &dki->fees.withdraw)) || (0 != TALER_amount_cmp (&withdraw_fee, - &dki->fee_withdraw)) ) + &dki->fees.withdraw)) ) { GNUNET_break_op (0); GNUNET_JSON_parse_free (withdraw_spec); @@ -529,10 +529,10 @@ TALER_EXCHANGE_verify_coin_history ( /* check that deposit fee matches our expectations from /keys! */ if ( (GNUNET_YES != TALER_amount_cmp_currency (&fee, - &dk->fee_deposit)) || + &dk->fees.deposit)) || (0 != TALER_amount_cmp (&fee, - &dk->fee_deposit)) ) + &dk->fees.deposit)) ) { GNUNET_break_op (0); return GNUNET_SYSERR; @@ -575,10 +575,10 @@ TALER_EXCHANGE_verify_coin_history ( /* check that melt fee matches our expectations from /keys! */ if ( (GNUNET_YES != TALER_amount_cmp_currency (&fee, - &dk->fee_refresh)) || + &dk->fees.refresh)) || (0 != TALER_amount_cmp (&fee, - &dk->fee_refresh)) ) + &dk->fees.refresh)) ) { GNUNET_break_op (0); return GNUNET_SYSERR; @@ -669,10 +669,10 @@ TALER_EXCHANGE_verify_coin_history ( { if ( (GNUNET_YES != TALER_amount_cmp_currency (&refund_fee, - &dk->fee_refund)) || + &dk->fees.refund)) || (0 != TALER_amount_cmp (&refund_fee, - &dk->fee_refund)) ) + &dk->fees.refund)) ) { GNUNET_break_op (0); return GNUNET_SYSERR; @@ -863,6 +863,11 @@ TALER_EXCHANGE_verify_coin_history ( } add = GNUNET_NO; } + else if (0 == strcasecmp (type, + "LOCK_NONCE")) + { + GNUNET_break (0); // FIXME: implement! + } else { /* signature not supported, new version on server? */ |