-unify API
This commit is contained in:
parent
21a1c715ee
commit
8e0b998217
@ -419,7 +419,7 @@ create_transaction (void *cls,
|
|||||||
&h_econtract),
|
&h_econtract),
|
||||||
GNUNET_JSON_pack_data_auto ("econtract_sig",
|
GNUNET_JSON_pack_data_auto ("econtract_sig",
|
||||||
&econtract.econtract_sig),
|
&econtract.econtract_sig),
|
||||||
GNUNET_JSON_pack_data_auto ("pub_ckey",
|
GNUNET_JSON_pack_data_auto ("contract_pub",
|
||||||
&econtract.contract_pub));
|
&econtract.contract_pub));
|
||||||
GNUNET_free (econtract.econtract);
|
GNUNET_free (econtract.econtract);
|
||||||
return GNUNET_DB_STATUS_HARD_ERROR;
|
return GNUNET_DB_STATUS_HARD_ERROR;
|
||||||
|
@ -461,7 +461,7 @@ purse_transaction (void *cls,
|
|||||||
&h_econtract),
|
&h_econtract),
|
||||||
GNUNET_JSON_pack_data_auto ("econtract_sig",
|
GNUNET_JSON_pack_data_auto ("econtract_sig",
|
||||||
&econtract.econtract_sig),
|
&econtract.econtract_sig),
|
||||||
GNUNET_JSON_pack_data_auto ("pub_ckey",
|
GNUNET_JSON_pack_data_auto ("contract_pub",
|
||||||
&econtract.contract_pub));
|
&econtract.contract_pub));
|
||||||
GNUNET_free (econtract.econtract);
|
GNUNET_free (econtract.econtract);
|
||||||
return GNUNET_DB_STATUS_HARD_ERROR;
|
return GNUNET_DB_STATUS_HARD_ERROR;
|
||||||
|
@ -354,7 +354,7 @@ handle_purse_create_with_merge_finished (void *cls,
|
|||||||
break;
|
break;
|
||||||
case TALER_EC_EXCHANGE_PURSE_ECONTRACT_CONFLICTING_META_DATA:
|
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 TALER_PurseContractSignatureP contract_sig;
|
||||||
struct GNUNET_HashCode h_econtract;
|
struct GNUNET_HashCode h_econtract;
|
||||||
struct GNUNET_JSON_Specification spec[] = {
|
struct GNUNET_JSON_Specification spec[] = {
|
||||||
@ -362,8 +362,8 @@ handle_purse_create_with_merge_finished (void *cls,
|
|||||||
&h_econtract),
|
&h_econtract),
|
||||||
GNUNET_JSON_spec_fixed_auto ("econtract_sig",
|
GNUNET_JSON_spec_fixed_auto ("econtract_sig",
|
||||||
&contract_sig),
|
&contract_sig),
|
||||||
GNUNET_JSON_spec_fixed_auto ("pub_ckey",
|
GNUNET_JSON_spec_fixed_auto ("contract_pub",
|
||||||
&pub_ckey),
|
&contract_pub),
|
||||||
GNUNET_JSON_spec_end ()
|
GNUNET_JSON_spec_end ()
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -380,7 +380,7 @@ handle_purse_create_with_merge_finished (void *cls,
|
|||||||
if (GNUNET_OK !=
|
if (GNUNET_OK !=
|
||||||
TALER_wallet_econtract_upload_verify2 (
|
TALER_wallet_econtract_upload_verify2 (
|
||||||
&h_econtract,
|
&h_econtract,
|
||||||
&pub_ckey,
|
&contract_pub,
|
||||||
&pcm->purse_pub,
|
&pcm->purse_pub,
|
||||||
&contract_sig))
|
&contract_sig))
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user