mirror of
https://github.com/aljazceru/lightning.git
synced 2025-12-19 15:14:23 +01:00
committed by
Christian Decker
parent
428da65fb1
commit
1851ebbc56
@@ -284,7 +284,7 @@ static bool param_arr(struct command *cmd, const char *buffer,
|
|||||||
{
|
{
|
||||||
#if DEVELOPER
|
#if DEVELOPER
|
||||||
if (!check_params(params)) {
|
if (!check_params(params)) {
|
||||||
command_fail(cmd, PARAM_DEV_ERROR, "programmer error");
|
command_fail(cmd, PARAM_DEV_ERROR, "developer error");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@@ -312,7 +312,7 @@ bool param(struct command *cmd, const char *buffer,
|
|||||||
void *arg = va_arg(ap, void *);
|
void *arg = va_arg(ap, void *);
|
||||||
size_t argsize = va_arg(ap, size_t);
|
size_t argsize = va_arg(ap, size_t);
|
||||||
if (!param_add(¶ms, name, required, cb, arg, argsize)) {
|
if (!param_add(¶ms, name, required, cb, arg, argsize)) {
|
||||||
command_fail(cmd, PARAM_DEV_ERROR, "programmer error");
|
command_fail(cmd, PARAM_DEV_ERROR, "developer error");
|
||||||
va_end(ap);
|
va_end(ap);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -268,33 +268,33 @@ static void bad_programmer(void)
|
|||||||
p_req("double", json_tok_double, &dval),
|
p_req("double", json_tok_double, &dval),
|
||||||
p_req("repeat", json_tok_u64, &ival2), NULL));
|
p_req("repeat", json_tok_u64, &ival2), NULL));
|
||||||
assert(check_fail());
|
assert(check_fail());
|
||||||
assert(strstr(fail_msg, "programmer error"));
|
assert(strstr(fail_msg, "developer error"));
|
||||||
|
|
||||||
assert(!param(cmd, j->buffer, j->toks,
|
assert(!param(cmd, j->buffer, j->toks,
|
||||||
p_req("repeat", json_tok_u64, &ival),
|
p_req("repeat", json_tok_u64, &ival),
|
||||||
p_req("double", json_tok_double, &dval),
|
p_req("double", json_tok_double, &dval),
|
||||||
p_req("repeat", json_tok_u64, &ival), NULL));
|
p_req("repeat", json_tok_u64, &ival), NULL));
|
||||||
assert(check_fail());
|
assert(check_fail());
|
||||||
assert(strstr(fail_msg, "programmer error"));
|
assert(strstr(fail_msg, "developer error"));
|
||||||
|
|
||||||
assert(!param(cmd, j->buffer, j->toks,
|
assert(!param(cmd, j->buffer, j->toks,
|
||||||
p_req("u64", json_tok_u64, &ival),
|
p_req("u64", json_tok_u64, &ival),
|
||||||
p_req("repeat", json_tok_double, &dval),
|
p_req("repeat", json_tok_double, &dval),
|
||||||
p_req("repeat", json_tok_double, &dval), NULL));
|
p_req("repeat", json_tok_double, &dval), NULL));
|
||||||
assert(check_fail());
|
assert(check_fail());
|
||||||
assert(strstr(fail_msg, "programmer error"));
|
assert(strstr(fail_msg, "developer error"));
|
||||||
|
|
||||||
/* check for repeated arguments */
|
/* check for repeated arguments */
|
||||||
assert(!param(cmd, j->buffer, j->toks,
|
assert(!param(cmd, j->buffer, j->toks,
|
||||||
p_req("u64", json_tok_u64, &ival),
|
p_req("u64", json_tok_u64, &ival),
|
||||||
p_req("repeated-arg", json_tok_u64, &ival), NULL));
|
p_req("repeated-arg", json_tok_u64, &ival), NULL));
|
||||||
assert(check_fail());
|
assert(check_fail());
|
||||||
assert(strstr(fail_msg, "programmer error"));
|
assert(strstr(fail_msg, "developer error"));
|
||||||
|
|
||||||
assert(!param(cmd, j->buffer, j->toks,
|
assert(!param(cmd, j->buffer, j->toks,
|
||||||
p_req("u64", (param_cb) NULL, &ival), NULL));
|
p_req("u64", (param_cb) NULL, &ival), NULL));
|
||||||
assert(check_fail());
|
assert(check_fail());
|
||||||
assert(strstr(fail_msg, "programmer error"));
|
assert(strstr(fail_msg, "developer error"));
|
||||||
|
|
||||||
/* Add required param after optional */
|
/* Add required param after optional */
|
||||||
j = json_parse(cmd, "[ '25', '546', '26', '1.1' ]");
|
j = json_parse(cmd, "[ '25', '546', '26', '1.1' ]");
|
||||||
@@ -306,7 +306,7 @@ static void bad_programmer(void)
|
|||||||
p_opt_def("msatoshi", json_tok_number, &msatoshi, 100),
|
p_opt_def("msatoshi", json_tok_number, &msatoshi, 100),
|
||||||
p_req("riskfactor", json_tok_double, &riskfactor), NULL));
|
p_req("riskfactor", json_tok_double, &riskfactor), NULL));
|
||||||
assert(check_fail());
|
assert(check_fail());
|
||||||
assert(strstr(fail_msg, "programmer error"));
|
assert(strstr(fail_msg, "developer error"));
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user