spelling of 'mismatch'
This commit is contained in:
parent
f45b1c912b
commit
26ad7c8191
@ -1008,7 +1008,7 @@ check_time_difference (const char *table,
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
GNUNET_asprintf (&details,
|
GNUNET_asprintf (&details,
|
||||||
"execution date missmatch (%s)",
|
"execution date mismatch (%s)",
|
||||||
GNUNET_STRINGS_relative_time_to_string (delta,
|
GNUNET_STRINGS_relative_time_to_string (delta,
|
||||||
GNUNET_YES));
|
GNUNET_YES));
|
||||||
report (report_row_minor_inconsistencies,
|
report (report_row_minor_inconsistencies,
|
||||||
@ -1093,7 +1093,7 @@ wire_out_cb (void *cls,
|
|||||||
"amount_justified", TALER_JSON_from_amount (&zero),
|
"amount_justified", TALER_JSON_from_amount (&zero),
|
||||||
"wtid", GNUNET_JSON_from_data_auto (wtid),
|
"wtid", GNUNET_JSON_from_data_auto (wtid),
|
||||||
"timestamp", json_from_time_abs (date),
|
"timestamp", json_from_time_abs (date),
|
||||||
"diagnostic", "recevier account missmatch",
|
"diagnostic", "recevier account mismatch",
|
||||||
"account_section", wa->section_name));
|
"account_section", wa->section_name));
|
||||||
GNUNET_break (GNUNET_OK ==
|
GNUNET_break (GNUNET_OK ==
|
||||||
TALER_amount_add (&total_bad_amount_out_plus,
|
TALER_amount_add (&total_bad_amount_out_plus,
|
||||||
@ -1106,7 +1106,7 @@ wire_out_cb (void *cls,
|
|||||||
"amount_justified", TALER_JSON_from_amount (amount),
|
"amount_justified", TALER_JSON_from_amount (amount),
|
||||||
"wtid", GNUNET_JSON_from_data_auto (wtid),
|
"wtid", GNUNET_JSON_from_data_auto (wtid),
|
||||||
"timestamp", json_from_time_abs (date),
|
"timestamp", json_from_time_abs (date),
|
||||||
"diagnostic", "receiver account missmatch",
|
"diagnostic", "receiver account mismatch",
|
||||||
"account_section", wa->section_name));
|
"account_section", wa->section_name));
|
||||||
GNUNET_break (GNUNET_OK ==
|
GNUNET_break (GNUNET_OK ==
|
||||||
TALER_amount_add (&total_bad_amount_out_minus,
|
TALER_amount_add (&total_bad_amount_out_minus,
|
||||||
@ -1805,7 +1805,7 @@ history_credit_cb (void *cls,
|
|||||||
"table", "reserves_in",
|
"table", "reserves_in",
|
||||||
"row", (json_int_t) rii->rowid,
|
"row", (json_int_t) rii->rowid,
|
||||||
"bank_row", (json_int_t) row_off,
|
"bank_row", (json_int_t) row_off,
|
||||||
"diagnostic", "execution date missmatch"));
|
"diagnostic", "execution date mismatch"));
|
||||||
}
|
}
|
||||||
cleanup:
|
cleanup:
|
||||||
GNUNET_assert (GNUNET_OK ==
|
GNUNET_assert (GNUNET_OK ==
|
||||||
|
@ -697,7 +697,7 @@ run_audit
|
|||||||
|
|
||||||
echo -n "Testing inconsistency detection... "
|
echo -n "Testing inconsistency detection... "
|
||||||
DIAG=`jq -r .row_minor_inconsistencies[0].diagnostic < test-wire-audit.json`
|
DIAG=`jq -r .row_minor_inconsistencies[0].diagnostic < test-wire-audit.json`
|
||||||
if test "x$DIAG" != "xexecution date missmatch"
|
if test "x$DIAG" != "xexecution date mismatch"
|
||||||
then
|
then
|
||||||
exit_fail "Reported diagnostic wrong: $DIAG"
|
exit_fail "Reported diagnostic wrong: $DIAG"
|
||||||
fi
|
fi
|
||||||
@ -1045,7 +1045,7 @@ then
|
|||||||
fi
|
fi
|
||||||
DIAG=`jq -r .row_minor_inconsistencies[0].diagnostic < test-wire-audit.json`
|
DIAG=`jq -r .row_minor_inconsistencies[0].diagnostic < test-wire-audit.json`
|
||||||
DIAG=`echo "$DIAG" | awk '{print $1 " " $2 " " $3}'`
|
DIAG=`echo "$DIAG" | awk '{print $1 " " $2 " " $3}'`
|
||||||
if test "x$DIAG" != "xexecution date missmatch"
|
if test "x$DIAG" != "xexecution date mismatch"
|
||||||
then
|
then
|
||||||
exit_fail "Reported diagnostic wrong: $DIAG"
|
exit_fail "Reported diagnostic wrong: $DIAG"
|
||||||
fi
|
fi
|
||||||
|
@ -102,7 +102,7 @@ reply_refresh_reveal_success (struct MHD_Connection *connection,
|
|||||||
* @return a MHD result code
|
* @return a MHD result code
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
reply_refresh_reveal_missmatch (struct MHD_Connection *connection,
|
reply_refresh_reveal_mismatch (struct MHD_Connection *connection,
|
||||||
const struct TALER_RefreshCommitmentP *rc)
|
const struct TALER_RefreshCommitmentP *rc)
|
||||||
{
|
{
|
||||||
return TALER_MHD_reply_json_pack (connection,
|
return TALER_MHD_reply_json_pack (connection,
|
||||||
@ -410,7 +410,7 @@ refresh_reveal_transaction (void *cls,
|
|||||||
&rc_expected))
|
&rc_expected))
|
||||||
{
|
{
|
||||||
GNUNET_break_op (0);
|
GNUNET_break_op (0);
|
||||||
*mhd_ret = reply_refresh_reveal_missmatch (connection,
|
*mhd_ret = reply_refresh_reveal_mismatch (connection,
|
||||||
&rc_expected);
|
&rc_expected);
|
||||||
return GNUNET_DB_STATUS_HARD_ERROR;
|
return GNUNET_DB_STATUS_HARD_ERROR;
|
||||||
}
|
}
|
||||||
|
@ -316,7 +316,7 @@ refund_transaction (void *cls,
|
|||||||
TALER_amount_cmp_currency (&refund->details.refund_fee,
|
TALER_amount_cmp_currency (&refund->details.refund_fee,
|
||||||
&dep->deposit_fee)) )
|
&dep->deposit_fee)) )
|
||||||
{
|
{
|
||||||
GNUNET_break_op (0); /* currency missmatch */
|
GNUNET_break_op (0); /* currency mismatch */
|
||||||
TEH_plugin->free_coin_transaction_list (TEH_plugin->cls,
|
TEH_plugin->free_coin_transaction_list (TEH_plugin->cls,
|
||||||
tl);
|
tl);
|
||||||
*mhd_ret = reply_refund_failure (connection,
|
*mhd_ret = reply_refund_failure (connection,
|
||||||
|
@ -2140,7 +2140,7 @@ postgres_insert_withdraw_info (void *cls,
|
|||||||
left before we tried this; however, concurrent operations may have changed
|
left before we tried this; however, concurrent operations may have changed
|
||||||
the situation by now. We should re-try the transaction. */
|
the situation by now. We should re-try the transaction. */
|
||||||
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
|
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
|
||||||
"Withdrawal from reserve `%s' refused due to balance missmatch. Retrying.\n",
|
"Withdrawal from reserve `%s' refused due to balance mismatch. Retrying.\n",
|
||||||
TALER_B2S (&collectable->reserve_pub));
|
TALER_B2S (&collectable->reserve_pub));
|
||||||
return GNUNET_DB_STATUS_SOFT_ERROR;
|
return GNUNET_DB_STATUS_SOFT_ERROR;
|
||||||
}
|
}
|
||||||
@ -5085,7 +5085,7 @@ postgres_insert_reserve_closed (void *cls,
|
|||||||
left before we tried this; however, concurrent operations may have changed
|
left before we tried this; however, concurrent operations may have changed
|
||||||
the situation by now. We should re-try the transaction. */
|
the situation by now. We should re-try the transaction. */
|
||||||
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
|
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
|
||||||
"Closing of reserve `%s' refused due to balance missmatch. Retrying.\n",
|
"Closing of reserve `%s' refused due to balance mismatch. Retrying.\n",
|
||||||
TALER_B2S (reserve_pub));
|
TALER_B2S (reserve_pub));
|
||||||
return GNUNET_DB_STATUS_HARD_ERROR;
|
return GNUNET_DB_STATUS_HARD_ERROR;
|
||||||
}
|
}
|
||||||
|
@ -183,7 +183,7 @@ handle_refund_finished (void *cls,
|
|||||||
(it was too late for the refund). */
|
(it was too late for the refund). */
|
||||||
break;
|
break;
|
||||||
case MHD_HTTP_PRECONDITION_FAILED:
|
case MHD_HTTP_PRECONDITION_FAILED:
|
||||||
/* Client request was inconsistent; might be a currency missmatch
|
/* Client request was inconsistent; might be a currency mismatch
|
||||||
problem. */
|
problem. */
|
||||||
break;
|
break;
|
||||||
case MHD_HTTP_CONFLICT:
|
case MHD_HTTP_CONFLICT:
|
||||||
|
@ -187,7 +187,7 @@ run (void *cls,
|
|||||||
"EUR:5",
|
"EUR:5",
|
||||||
MHD_HTTP_OK),
|
MHD_HTTP_OK),
|
||||||
TALER_TESTING_cmd_refund
|
TALER_TESTING_cmd_refund
|
||||||
("refund-currency-missmatch",
|
("refund-currency-mismatch",
|
||||||
MHD_HTTP_PRECONDITION_FAILED,
|
MHD_HTTP_PRECONDITION_FAILED,
|
||||||
"USD:5",
|
"USD:5",
|
||||||
"USD:0.01",
|
"USD:0.01",
|
||||||
@ -220,7 +220,7 @@ run (void *cls,
|
|||||||
bc.user42_payto,
|
bc.user42_payto,
|
||||||
/* This parameter will make any comparison about
|
/* This parameter will make any comparison about
|
||||||
h_contract_terms fail, when /refund will be handled.
|
h_contract_terms fail, when /refund will be handled.
|
||||||
So in other words, this is h_contract missmatch. */
|
So in other words, this is h_contract mismatch. */
|
||||||
"{\"items\":[{\"name\":\"ice skate\","
|
"{\"items\":[{\"name\":\"ice skate\","
|
||||||
"\"value\":\"EUR:5\"}]}",
|
"\"value\":\"EUR:5\"}]}",
|
||||||
GNUNET_TIME_UNIT_MINUTES,
|
GNUNET_TIME_UNIT_MINUTES,
|
||||||
|
@ -142,7 +142,7 @@ history_traits (void *cls,
|
|||||||
*
|
*
|
||||||
* @param h what we expected.
|
* @param h what we expected.
|
||||||
* @param h_len number of entries in @a h.
|
* @param h_len number of entries in @a h.
|
||||||
* @param off position of the missmatch.
|
* @param off position of the mismatch.
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
print_expected (struct History *h,
|
print_expected (struct History *h,
|
||||||
@ -296,7 +296,7 @@ build_history (struct TALER_TESTING_Interpreter *is,
|
|||||||
continue; /* skip until we find the marker */
|
continue; /* skip until we find the marker */
|
||||||
if (0 != strcasecmp (hs->account_url,
|
if (0 != strcasecmp (hs->account_url,
|
||||||
exchange_credit_url))
|
exchange_credit_url))
|
||||||
continue; /* account missmatch */
|
continue; /* account mismatch */
|
||||||
if (total >= GNUNET_MAX (hs->num_results,
|
if (total >= GNUNET_MAX (hs->num_results,
|
||||||
-hs->num_results) )
|
-hs->num_results) )
|
||||||
{
|
{
|
||||||
|
@ -146,7 +146,7 @@ history_traits (void *cls,
|
|||||||
*
|
*
|
||||||
* @param h what we expected.
|
* @param h what we expected.
|
||||||
* @param h_len number of entries in @a h.
|
* @param h_len number of entries in @a h.
|
||||||
* @param off position of the missmatch.
|
* @param off position of the mismatch.
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
print_expected (struct History *h,
|
print_expected (struct History *h,
|
||||||
|
@ -233,7 +233,7 @@ recoup_cb (void *cls,
|
|||||||
if (0 != TALER_amount_cmp (amount, &expected_amount))
|
if (0 != TALER_amount_cmp (amount, &expected_amount))
|
||||||
{
|
{
|
||||||
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
|
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
|
||||||
"Total amount missmatch to command %s\n",
|
"Total amount mismatch to command %s\n",
|
||||||
cmd->label);
|
cmd->label);
|
||||||
json_dumpf (full_response, stderr, 0);
|
json_dumpf (full_response, stderr, 0);
|
||||||
TALER_TESTING_interpreter_fail (is);
|
TALER_TESTING_interpreter_fail (is);
|
||||||
|
@ -545,7 +545,7 @@ track_transfer_cb (void *cls,
|
|||||||
&expected_amount))
|
&expected_amount))
|
||||||
{
|
{
|
||||||
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
|
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
|
||||||
"Total amount missmatch to command %s - "
|
"Total amount mismatch to command %s - "
|
||||||
"%s vs %s\n",
|
"%s vs %s\n",
|
||||||
cmd->label,
|
cmd->label,
|
||||||
TALER_amount_to_string (total_amount),
|
TALER_amount_to_string (total_amount),
|
||||||
@ -569,7 +569,7 @@ track_transfer_cb (void *cls,
|
|||||||
&expected_amount))
|
&expected_amount))
|
||||||
{
|
{
|
||||||
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
|
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
|
||||||
"Wire fee missmatch to command %s\n",
|
"Wire fee mismatch to command %s\n",
|
||||||
cmd->label);
|
cmd->label);
|
||||||
json_dumpf (json, stderr, 0);
|
json_dumpf (json, stderr, 0);
|
||||||
TALER_TESTING_interpreter_fail (is);
|
TALER_TESTING_interpreter_fail (is);
|
||||||
|
@ -125,7 +125,7 @@ wire_cb (void *cls,
|
|||||||
&expected_fee))
|
&expected_fee))
|
||||||
{
|
{
|
||||||
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
|
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
|
||||||
"Wire fee missmatch to command %s\n",
|
"Wire fee mismatch to command %s\n",
|
||||||
cmd->label);
|
cmd->label);
|
||||||
TALER_TESTING_interpreter_fail (ws->is);
|
TALER_TESTING_interpreter_fail (ws->is);
|
||||||
GNUNET_free (method);
|
GNUNET_free (method);
|
||||||
|
@ -114,7 +114,7 @@ main (int argc,
|
|||||||
TALER_amount_cmp_currency (&a1,
|
TALER_amount_cmp_currency (&a1,
|
||||||
&a2));
|
&a2));
|
||||||
|
|
||||||
/* test subtraction failure (currency missmatch) */
|
/* test subtraction failure (currency mismatch) */
|
||||||
GNUNET_assert (GNUNET_SYSERR ==
|
GNUNET_assert (GNUNET_SYSERR ==
|
||||||
TALER_amount_subtract (&a3,
|
TALER_amount_subtract (&a3,
|
||||||
&a3,
|
&a3,
|
||||||
|
Loading…
Reference in New Issue
Block a user