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_deposit.c | |
| parent | a78b3345fbf017b1cddfd09afb4b2c29287b0bba (diff) | |
| parent | 22fe5da700df7328de183470c1c7f59b21c9f4f9 (diff) | |
-minor merge conflict resolves
Diffstat (limited to 'src/testing/testing_api_cmd_deposit.c')
| -rw-r--r-- | src/testing/testing_api_cmd_deposit.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/testing/testing_api_cmd_deposit.c b/src/testing/testing_api_cmd_deposit.c index d3fafc63..d3a444ee 100644 --- a/src/testing/testing_api_cmd_deposit.c +++ b/src/testing/testing_api_cmd_deposit.c @@ -409,8 +409,7 @@ deposit_run (void *cls, { TALER_age_commitment_hash (age_commitment, &h_age_commitment); } - - ds->deposit_fee = denom_pub->fee_deposit; + ds->deposit_fee = denom_pub->fees.deposit; GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv->eddsa_priv, &coin_pub.eddsa_pub); @@ -440,7 +439,7 @@ deposit_run (void *cls, TALER_JSON_merchant_wire_signature_hash (ds->wire_details, &h_wire)); TALER_wallet_deposit_sign (&ds->amount, - &denom_pub->fee_deposit, + &denom_pub->fees.deposit, &h_wire, &h_contract_terms, &h_age_commitment, |