diff options
| author | Christian Grothoff <christian@grothoff.org> | 2022-06-05 00:43:11 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2022-06-05 00:43:11 +0200 |
| commit | 8e0b9982177df1b5aa2e566beec130d7e30261ba (patch) | |
| tree | 3f7d2959b2fcacd32c02a0222155fb1d51674f2b | |
| parent | 21a1c715ee2578b0cb7738a46117552674f0a294 (diff) | |
| download | exchange-8e0b9982177df1b5aa2e566beec130d7e30261ba.tar.gz exchange-8e0b9982177df1b5aa2e566beec130d7e30261ba.tar.bz2 exchange-8e0b9982177df1b5aa2e566beec130d7e30261ba.zip | |
-unify API
| -rw-r--r-- | src/exchange/taler-exchange-httpd_purses_create.c | 2 | ||||
| -rw-r--r-- | src/exchange/taler-exchange-httpd_reserves_purse.c | 2 | ||||
| -rw-r--r-- | src/lib/exchange_api_purse_create_with_merge.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/exchange/taler-exchange-httpd_purses_create.c b/src/exchange/taler-exchange-httpd_purses_create.c index 434984d85..112a24dc5 100644 --- a/src/exchange/taler-exchange-httpd_purses_create.c +++ b/src/exchange/taler-exchange-httpd_purses_create.c @@ -419,7 +419,7 @@ create_transaction (void *cls, &h_econtract), GNUNET_JSON_pack_data_auto ("econtract_sig", &econtract.econtract_sig), - GNUNET_JSON_pack_data_auto ("pub_ckey", + GNUNET_JSON_pack_data_auto ("contract_pub", &econtract.contract_pub)); GNUNET_free (econtract.econtract); return GNUNET_DB_STATUS_HARD_ERROR; diff --git a/src/exchange/taler-exchange-httpd_reserves_purse.c b/src/exchange/taler-exchange-httpd_reserves_purse.c index 74291976d..7aa00a500 100644 --- a/src/exchange/taler-exchange-httpd_reserves_purse.c +++ b/src/exchange/taler-exchange-httpd_reserves_purse.c @@ -461,7 +461,7 @@ purse_transaction (void *cls, &h_econtract), GNUNET_JSON_pack_data_auto ("econtract_sig", &econtract.econtract_sig), - GNUNET_JSON_pack_data_auto ("pub_ckey", + GNUNET_JSON_pack_data_auto ("contract_pub", &econtract.contract_pub)); GNUNET_free (econtract.econtract); return GNUNET_DB_STATUS_HARD_ERROR; diff --git a/src/lib/exchange_api_purse_create_with_merge.c b/src/lib/exchange_api_purse_create_with_merge.c index 90301b869..e726b712f 100644 --- a/src/lib/exchange_api_purse_create_with_merge.c +++ b/src/lib/exchange_api_purse_create_with_merge.c @@ -354,7 +354,7 @@ handle_purse_create_with_merge_finished (void *cls, break; case TALER_EC_EXCHANGE_PURSE_ECONTRACT_CONFLICTING_META_DATA: { - struct TALER_ContractDiffiePublicP pub_ckey; + struct TALER_ContractDiffiePublicP contract_pub; struct TALER_PurseContractSignatureP contract_sig; struct GNUNET_HashCode h_econtract; struct GNUNET_JSON_Specification spec[] = { @@ -362,8 +362,8 @@ handle_purse_create_with_merge_finished (void *cls, &h_econtract), GNUNET_JSON_spec_fixed_auto ("econtract_sig", &contract_sig), - GNUNET_JSON_spec_fixed_auto ("pub_ckey", - &pub_ckey), + GNUNET_JSON_spec_fixed_auto ("contract_pub", + &contract_pub), GNUNET_JSON_spec_end () }; @@ -380,7 +380,7 @@ handle_purse_create_with_merge_finished (void *cls, if (GNUNET_OK != TALER_wallet_econtract_upload_verify2 ( &h_econtract, - &pub_ckey, + &contract_pub, &pcm->purse_pub, &contract_sig)) { |