-work on FTBFS
This commit is contained in:
parent
74234f75a4
commit
b6be9dc0c0
@ -294,10 +294,6 @@ expired_reserve_cb (void *cls,
|
|||||||
GNUNET_SCHEDULER_shutdown ();
|
GNUNET_SCHEDULER_shutdown ();
|
||||||
return GNUNET_DB_STATUS_HARD_ERROR;
|
return GNUNET_DB_STATUS_HARD_ERROR;
|
||||||
}
|
}
|
||||||
if ( (0 == amount_without_fee.value) &&
|
|
||||||
(0 == amount_without_fee.fraction) )
|
|
||||||
ret = GNUNET_NO;
|
|
||||||
|
|
||||||
/* NOTE: sizeof (*reserve_pub) == sizeof (wtid) right now, but to
|
/* NOTE: sizeof (*reserve_pub) == sizeof (wtid) right now, but to
|
||||||
be future-compatible, we use the memset + min construction */
|
be future-compatible, we use the memset + min construction */
|
||||||
memset (&wtid,
|
memset (&wtid,
|
||||||
@ -307,7 +303,7 @@ expired_reserve_cb (void *cls,
|
|||||||
reserve_pub,
|
reserve_pub,
|
||||||
GNUNET_MIN (sizeof (wtid),
|
GNUNET_MIN (sizeof (wtid),
|
||||||
sizeof (*reserve_pub)));
|
sizeof (*reserve_pub)));
|
||||||
if (GNUNET_SYSERR != ret)
|
if (TALER_AAR_INVALID_NEGATIVE_RESULT != ret)
|
||||||
qs = db_plugin->insert_reserve_closed (db_plugin->cls,
|
qs = db_plugin->insert_reserve_closed (db_plugin->cls,
|
||||||
reserve_pub,
|
reserve_pub,
|
||||||
now,
|
now,
|
||||||
@ -321,10 +317,10 @@ expired_reserve_cb (void *cls,
|
|||||||
"Closing reserve %s over %s (%d, %d)\n",
|
"Closing reserve %s over %s (%d, %d)\n",
|
||||||
TALER_B2S (reserve_pub),
|
TALER_B2S (reserve_pub),
|
||||||
TALER_amount2s (left),
|
TALER_amount2s (left),
|
||||||
ret,
|
(int) ret,
|
||||||
qs);
|
qs);
|
||||||
/* Check for hard failure */
|
/* Check for hard failure */
|
||||||
if ( (GNUNET_SYSERR == ret) ||
|
if ( (TALER_AAR_INVALID_NEGATIVE_RESULT == ret) ||
|
||||||
(GNUNET_DB_STATUS_HARD_ERROR == qs) )
|
(GNUNET_DB_STATUS_HARD_ERROR == qs) )
|
||||||
{
|
{
|
||||||
GNUNET_break (0);
|
GNUNET_break (0);
|
||||||
@ -332,10 +328,10 @@ expired_reserve_cb (void *cls,
|
|||||||
GNUNET_SCHEDULER_shutdown ();
|
GNUNET_SCHEDULER_shutdown ();
|
||||||
return GNUNET_DB_STATUS_HARD_ERROR;
|
return GNUNET_DB_STATUS_HARD_ERROR;
|
||||||
}
|
}
|
||||||
if ( (GNUNET_OK != ret) ||
|
if ( (TALER_AAR_RESULT_ZERO == ret) ||
|
||||||
(GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs) )
|
(GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs) )
|
||||||
{
|
{
|
||||||
/* Reserve balance was almost zero OR soft error */
|
/* Reserve balance was zero OR soft error */
|
||||||
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
|
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
|
||||||
"Reserve was virtually empty, moving on\n");
|
"Reserve was virtually empty, moving on\n");
|
||||||
(void) commit_or_warn ();
|
(void) commit_or_warn ();
|
||||||
|
@ -45,7 +45,7 @@ struct AddAuditorDenomContext
|
|||||||
/**
|
/**
|
||||||
* Denomination this is about.
|
* Denomination this is about.
|
||||||
*/
|
*/
|
||||||
const struct GNUNET_HashCode *h_denom_pub;
|
const struct TALER_DenominationHash *h_denom_pub;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Auditor this is about.
|
* Auditor this is about.
|
||||||
@ -101,7 +101,7 @@ add_auditor_denom_sig (void *cls,
|
|||||||
connection,
|
connection,
|
||||||
MHD_HTTP_NOT_FOUND,
|
MHD_HTTP_NOT_FOUND,
|
||||||
TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN,
|
TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN,
|
||||||
GNUNET_h2s (awc->h_denom_pub));
|
GNUNET_h2s (&awc->h_denom_pub->hash));
|
||||||
return GNUNET_DB_STATUS_HARD_ERROR;
|
return GNUNET_DB_STATUS_HARD_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -192,7 +192,7 @@ MHD_RESULT
|
|||||||
TEH_handler_auditors (
|
TEH_handler_auditors (
|
||||||
struct MHD_Connection *connection,
|
struct MHD_Connection *connection,
|
||||||
const struct TALER_AuditorPublicKeyP *auditor_pub,
|
const struct TALER_AuditorPublicKeyP *auditor_pub,
|
||||||
const struct GNUNET_HashCode *h_denom_pub,
|
const struct TALER_DenominationHash *h_denom_pub,
|
||||||
const json_t *root)
|
const json_t *root)
|
||||||
{
|
{
|
||||||
struct AddAuditorDenomContext awc = {
|
struct AddAuditorDenomContext awc = {
|
||||||
|
@ -39,7 +39,7 @@ MHD_RESULT
|
|||||||
TEH_handler_auditors (
|
TEH_handler_auditors (
|
||||||
struct MHD_Connection *connection,
|
struct MHD_Connection *connection,
|
||||||
const struct TALER_AuditorPublicKeyP *auditor_pub,
|
const struct TALER_AuditorPublicKeyP *auditor_pub,
|
||||||
const struct GNUNET_HashCode *h_denom_pub,
|
const struct TALER_DenominationHash *h_denom_pub,
|
||||||
const json_t *root);
|
const json_t *root);
|
||||||
|
|
||||||
|
|
||||||
|
@ -47,8 +47,8 @@
|
|||||||
*/
|
*/
|
||||||
static MHD_RESULT
|
static MHD_RESULT
|
||||||
reply_deposit_details (struct MHD_Connection *connection,
|
reply_deposit_details (struct MHD_Connection *connection,
|
||||||
const struct GNUNET_HashCode *h_contract_terms,
|
const struct TALER_PrivateContractHash *h_contract_terms,
|
||||||
const struct GNUNET_HashCode *h_wire,
|
const struct TALER_MerchantWireHash *h_wire,
|
||||||
const struct TALER_CoinSpendPublicKeyP *coin_pub,
|
const struct TALER_CoinSpendPublicKeyP *coin_pub,
|
||||||
const struct TALER_Amount *coin_contribution,
|
const struct TALER_Amount *coin_contribution,
|
||||||
const struct TALER_WireTransferIdentifierRawP *wtid,
|
const struct TALER_WireTransferIdentifierRawP *wtid,
|
||||||
|
@ -353,8 +353,8 @@ TALER_exchange_offline_wire_add_sign (
|
|||||||
|
|
||||||
GNUNET_assert (GNUNET_OK ==
|
GNUNET_assert (GNUNET_OK ==
|
||||||
GNUNET_TIME_round_abs (&now));
|
GNUNET_TIME_round_abs (&now));
|
||||||
TALER_exchange_wire_signature_hash (payto_uri,
|
TALER_payto_hash (payto_uri,
|
||||||
&kv.h_payto);
|
&kv.h_payto);
|
||||||
GNUNET_CRYPTO_eddsa_sign (&master_priv->eddsa_priv,
|
GNUNET_CRYPTO_eddsa_sign (&master_priv->eddsa_priv,
|
||||||
&kv,
|
&kv,
|
||||||
&master_sig->eddsa_signature);
|
&master_sig->eddsa_signature);
|
||||||
@ -374,8 +374,8 @@ TALER_exchange_offline_wire_add_verify (
|
|||||||
.start_date = GNUNET_TIME_absolute_hton (sign_time),
|
.start_date = GNUNET_TIME_absolute_hton (sign_time),
|
||||||
};
|
};
|
||||||
|
|
||||||
TALER_exchange_wire_signature_hash (payto_uri,
|
TALER_payto_hash (payto_uri,
|
||||||
&aw.h_payto);
|
&aw.h_payto);
|
||||||
return
|
return
|
||||||
GNUNET_CRYPTO_eddsa_verify (
|
GNUNET_CRYPTO_eddsa_verify (
|
||||||
TALER_SIGNATURE_MASTER_ADD_WIRE,
|
TALER_SIGNATURE_MASTER_ADD_WIRE,
|
||||||
@ -400,8 +400,8 @@ TALER_exchange_offline_wire_del_sign (
|
|||||||
|
|
||||||
GNUNET_assert (GNUNET_OK ==
|
GNUNET_assert (GNUNET_OK ==
|
||||||
GNUNET_TIME_round_abs (&now));
|
GNUNET_TIME_round_abs (&now));
|
||||||
TALER_exchange_wire_signature_hash (payto_uri,
|
TALER_payto_hash (payto_uri,
|
||||||
&kv.h_payto);
|
&kv.h_payto);
|
||||||
GNUNET_CRYPTO_eddsa_sign (&master_priv->eddsa_priv,
|
GNUNET_CRYPTO_eddsa_sign (&master_priv->eddsa_priv,
|
||||||
&kv,
|
&kv,
|
||||||
&master_sig->eddsa_signature);
|
&master_sig->eddsa_signature);
|
||||||
@ -422,8 +422,8 @@ TALER_exchange_offline_wire_del_verify (
|
|||||||
.end_date = GNUNET_TIME_absolute_hton (sign_time),
|
.end_date = GNUNET_TIME_absolute_hton (sign_time),
|
||||||
};
|
};
|
||||||
|
|
||||||
TALER_exchange_wire_signature_hash (payto_uri,
|
TALER_payto_hash (payto_uri,
|
||||||
&aw.h_payto);
|
&aw.h_payto);
|
||||||
return GNUNET_CRYPTO_eddsa_verify (
|
return GNUNET_CRYPTO_eddsa_verify (
|
||||||
TALER_SIGNATURE_MASTER_DEL_WIRE,
|
TALER_SIGNATURE_MASTER_DEL_WIRE,
|
||||||
&aw,
|
&aw,
|
||||||
|
Loading…
Reference in New Issue
Block a user