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/testing/testing_api_cmd_refresh.c | |
| parent | a78b3345fbf017b1cddfd09afb4b2c29287b0bba (diff) | |
| parent | 22fe5da700df7328de183470c1c7f59b21c9f4f9 (diff) | |
| download | exchange-f4f502d037a84a38db4bc21a1db06324a05d26aa.tar.xz | |
-minor merge conflict resolves
Diffstat (limited to 'src/testing/testing_api_cmd_refresh.c')
| -rw-r--r-- | src/testing/testing_api_cmd_refresh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/testing/testing_api_cmd_refresh.c b/src/testing/testing_api_cmd_refresh.c index 8ae4ab93f..29ad9d2fa 100644 --- a/src/testing/testing_api_cmd_refresh.c +++ b/src/testing/testing_api_cmd_refresh.c @@ -1102,7 +1102,7 @@ melt_run (void *cls, /* Melt amount starts with the melt fee of the old coin; we'll add the values and withdraw fees of the fresh coins next */ - melt_amount = melt_denom_pub->fee_refresh; + melt_amount = melt_denom_pub->fees.refresh; age_restricted = melt_denom_pub->key.age_mask.mask != 0; for (unsigned int i = 0; i<num_fresh_coins; i++) { @@ -1137,7 +1137,7 @@ melt_run (void *cls, GNUNET_assert (0 <= TALER_amount_add (&melt_amount, &melt_amount, - &fresh_pk->fee_withdraw)); + &fresh_pk->fees.withdraw)); rms->fresh_pks[i] = *fresh_pk; /* Make a deep copy of the RSA key */ TALER_denom_pub_deep_copy (&rms->fresh_pks[i].key, |