This means we don't have to manually choose what to link against, which is much of the complexity of our Makefiles: the compiler will automatically use any object files it needs to link. We already do this for ccan as libccan.a, now we have libcommon.a. We don't link against it for *everything*, as some tests require their own versions. Notes: 1. I get rid of the weird plugins/test/Makefile2 (accidental commit?) 2. Many tests change due to update-mocks. 3. In some places I added the missing dependency on the Makefile itself, though most are in the next patch. Before: Total program size: 221366528 Total tests size: 364243856 After: Total program size: 190733656 Total tests size: 337880888 Build time from make clean (RUST=0) (includes building external libs): Before: real 0m38.227000-44.245000(41.8222+/-1.6)s user 3m2.105000-33.696000(23.1442+/-8.4)s sys 0m35.054000-42.269000(39.7231+/-2)s After: real 0m38.944000-40.416000(40.1131+/-0.4)s user 3m6.790000-17.159000(15.0571+/-2.8)s sys 0m35.304000-37.336000(36.8942+/-0.57)s Build time after touch config.vars (RUST=0): Before: real 0m18.928000-22.776000(21.5084+/-1.1)s user 2m8.613000-36.567000(27.7281+/-7.7)s sys 0m20.458000-23.436000(22.3963+/-0.77)s After: real 0m19.831000-21.862000(21.5528+/-0.58)s user 2m15.361000-30.731000(28.4798+/-4.4)s sys 0m21.056000-22.339000(22.0346+/-0.35)s Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> rusty@rusty-Framework:~/devel/cvs/lightni
270 lines
9.4 KiB
C
270 lines
9.4 KiB
C
#include "config.h"
|
|
#include "../../common/json_filter.c"
|
|
#include "../../common/json_stream.c"
|
|
#include "../jsonrpc.c"
|
|
#include "../feerate.c"
|
|
#include <common/daemon.h>
|
|
#include <common/setup.h>
|
|
#include <stdio.h>
|
|
|
|
/* AUTOGENERATED MOCKS START */
|
|
/* Generated stub for db_begin_transaction_ */
|
|
void db_begin_transaction_(struct db *db UNNEEDED, const char *location UNNEEDED)
|
|
{ fprintf(stderr, "db_begin_transaction_ called!\n"); abort(); }
|
|
/* Generated stub for db_commit_transaction */
|
|
void db_commit_transaction(struct db *db UNNEEDED)
|
|
{ fprintf(stderr, "db_commit_transaction called!\n"); abort(); }
|
|
/* Generated stub for db_get_intvar */
|
|
s64 db_get_intvar(struct db *db UNNEEDED, const char *varname UNNEEDED, s64 defval UNNEEDED)
|
|
{ fprintf(stderr, "db_get_intvar called!\n"); abort(); }
|
|
/* Generated stub for db_set_readonly */
|
|
void db_set_readonly(struct db *db UNNEEDED, bool readonly UNNEEDED)
|
|
{ fprintf(stderr, "db_set_readonly called!\n"); abort(); }
|
|
/* Generated stub for fatal */
|
|
void fatal(const char *fmt UNNEEDED, ...)
|
|
{ fprintf(stderr, "fatal called!\n"); abort(); }
|
|
/* Generated stub for feerate_for_deadline */
|
|
u32 feerate_for_deadline(const struct chain_topology *topo UNNEEDED, u32 blockcount UNNEEDED)
|
|
{ fprintf(stderr, "feerate_for_deadline called!\n"); abort(); }
|
|
/* Generated stub for get_feerate_floor */
|
|
u32 get_feerate_floor(const struct chain_topology *topo UNNEEDED)
|
|
{ fprintf(stderr, "get_feerate_floor called!\n"); abort(); }
|
|
/* Generated stub for hsm_secret_arg */
|
|
char *hsm_secret_arg(const tal_t *ctx UNNEEDED,
|
|
const char *arg UNNEEDED,
|
|
const u8 **hsm_secret UNNEEDED)
|
|
{ fprintf(stderr, "hsm_secret_arg called!\n"); abort(); }
|
|
/* Generated stub for lightningd_deprecated_in_ok */
|
|
bool lightningd_deprecated_in_ok(struct lightningd *ld UNNEEDED,
|
|
struct logger *log UNNEEDED,
|
|
bool deprecated_apis UNNEEDED,
|
|
const char *subsys UNNEEDED,
|
|
const char *api UNNEEDED,
|
|
const char *start UNNEEDED,
|
|
const char *end UNNEEDED,
|
|
const char *details UNNEEDED)
|
|
{ fprintf(stderr, "lightningd_deprecated_in_ok called!\n"); abort(); }
|
|
/* Generated stub for lightningd_deprecated_out_ok */
|
|
bool lightningd_deprecated_out_ok(struct lightningd *ld UNNEEDED,
|
|
bool deprecated_apis UNNEEDED,
|
|
const char *subsys UNNEEDED,
|
|
const char *api UNNEEDED,
|
|
const char *start UNNEEDED,
|
|
const char *end UNNEEDED)
|
|
{ fprintf(stderr, "lightningd_deprecated_out_ok called!\n"); abort(); }
|
|
/* Generated stub for log_ */
|
|
void log_(struct logger *logger UNNEEDED, enum log_level level UNNEEDED,
|
|
const struct node_id *node_id UNNEEDED,
|
|
bool call_notifier UNNEEDED,
|
|
const char *fmt UNNEEDED, ...)
|
|
|
|
{ fprintf(stderr, "log_ called!\n"); abort(); }
|
|
/* Generated stub for log_io */
|
|
void log_io(struct logger *logger UNNEEDED, enum log_level dir UNNEEDED,
|
|
const struct node_id *node_id UNNEEDED,
|
|
const char *comment UNNEEDED,
|
|
const void *data UNNEEDED, size_t len UNNEEDED)
|
|
{ fprintf(stderr, "log_io called!\n"); abort(); }
|
|
/* Generated stub for mutual_close_feerate */
|
|
u32 mutual_close_feerate(struct chain_topology *topo UNNEEDED)
|
|
{ fprintf(stderr, "mutual_close_feerate called!\n"); abort(); }
|
|
/* Generated stub for new_logger */
|
|
struct logger *new_logger(const tal_t *ctx UNNEEDED, struct log_book *record UNNEEDED,
|
|
const struct node_id *default_node_id UNNEEDED,
|
|
const char *fmt UNNEEDED, ...)
|
|
{ fprintf(stderr, "new_logger called!\n"); abort(); }
|
|
/* Generated stub for opening_feerate */
|
|
u32 opening_feerate(struct chain_topology *topo UNNEEDED)
|
|
{ fprintf(stderr, "opening_feerate called!\n"); abort(); }
|
|
/* Generated stub for penalty_feerate */
|
|
u32 penalty_feerate(struct chain_topology *topo UNNEEDED)
|
|
{ fprintf(stderr, "penalty_feerate called!\n"); abort(); }
|
|
/* Generated stub for plugin_hook_call_ */
|
|
bool plugin_hook_call_(struct lightningd *ld UNNEEDED,
|
|
const struct plugin_hook *hook UNNEEDED,
|
|
const char *cmd_id TAKES UNNEEDED,
|
|
tal_t *cb_arg STEALS UNNEEDED)
|
|
{ fprintf(stderr, "plugin_hook_call_ called!\n"); abort(); }
|
|
/* Generated stub for unilateral_feerate */
|
|
u32 unilateral_feerate(struct chain_topology *topo UNNEEDED, bool option_anchors UNNEEDED)
|
|
{ fprintf(stderr, "unilateral_feerate called!\n"); abort(); }
|
|
/* AUTOGENERATED MOCKS END */
|
|
|
|
static int test_json_filter(void)
|
|
{
|
|
struct json_stream *result = new_json_stream(NULL, NULL, NULL);
|
|
jsmntok_t *toks;
|
|
const jsmntok_t *x;
|
|
bool valid, complete;
|
|
int i;
|
|
char *badstr = tal_arr(result, char, 256);
|
|
const char *str;
|
|
size_t len;
|
|
jsmn_parser parser;
|
|
|
|
/* Fill with junk, and nul-terminate (256 -> 0) */
|
|
for (i = 1; i < 257; i++)
|
|
badstr[i-1] = i;
|
|
|
|
json_object_start(result, NULL);
|
|
json_add_string(result, "x", badstr);
|
|
json_object_end(result);
|
|
|
|
/* Parse back in, make sure nothing crazy. */
|
|
str = json_out_contents(result->jout, &len);
|
|
str = tal_strndup(result, str, len);
|
|
|
|
toks = toks_alloc(str);
|
|
jsmn_init(&parser);
|
|
valid = json_parse_input(&parser, &toks, str, strlen(str), &complete);
|
|
/* Fails to parse because it's not valid UTF8 */
|
|
assert(!valid);
|
|
|
|
assert(toks[0].type == JSMN_OBJECT);
|
|
x = json_get_member(str, toks, "x");
|
|
assert(x);
|
|
assert(x->type == JSMN_STRING);
|
|
|
|
/* There are 7 one-letter escapes, and (32-5) \uXXXX escapes. */
|
|
assert((x->end - x->start) == 255 + 7*1 + (32-5)*5);
|
|
/* No control characters. */
|
|
for (i = x->start; i < x->end; i++) {
|
|
assert((unsigned)str[i] >= ' ');
|
|
assert((unsigned)str[i] != 127);
|
|
}
|
|
tal_free(result);
|
|
return 0;
|
|
}
|
|
|
|
static void test_json_escape(void)
|
|
{
|
|
int i;
|
|
|
|
for (i = 1; i < 256; i++) {
|
|
char badstr[2];
|
|
struct json_stream *result = new_json_stream(NULL, NULL, NULL);
|
|
struct json_escape *esc;
|
|
|
|
badstr[0] = i;
|
|
badstr[1] = 0;
|
|
|
|
json_object_start(result, NULL);
|
|
esc = json_escape(NULL, badstr);
|
|
json_add_escaped_string(result, "x", take(esc));
|
|
json_object_end(result);
|
|
|
|
size_t len;
|
|
const char *str = json_out_contents(result->jout, &len);
|
|
str = tal_strndup(result, str, len);
|
|
if (i == '\\' || i == '"'
|
|
|| i == '\n' || i == '\r' || i == '\b'
|
|
|| i == '\t' || i == '\f')
|
|
assert(strstarts(str, "{\"x\":\"\\"));
|
|
else if (i < 32 || i == 127) {
|
|
assert(strstarts(str, "{\"x\":\"\\u00"));
|
|
} else {
|
|
char expect[] = "{\"x\":\"?\"}";
|
|
expect[6] = i;
|
|
assert(streq(str, expect));
|
|
}
|
|
tal_free(result);
|
|
}
|
|
}
|
|
|
|
static void test_json_partial(void)
|
|
{
|
|
const tal_t *ctx = tal(NULL, char);
|
|
|
|
assert(streq(json_partial_escape(ctx, "\\")->s, "\\\\"));
|
|
assert(streq(json_partial_escape(ctx, "\\\\")->s, "\\\\"));
|
|
assert(streq(json_partial_escape(ctx, "\\\\\\")->s, "\\\\\\\\"));
|
|
assert(streq(json_partial_escape(ctx, "\\\\\\\\")->s, "\\\\\\\\"));
|
|
assert(streq(json_partial_escape(ctx, "\\n")->s, "\\n"));
|
|
assert(streq(json_partial_escape(ctx, "\n")->s, "\\n"));
|
|
assert(streq(json_partial_escape(ctx, "\\\"")->s, "\\\""));
|
|
assert(streq(json_partial_escape(ctx, "\"")->s, "\\\""));
|
|
assert(streq(json_partial_escape(ctx, "\\t")->s, "\\t"));
|
|
assert(streq(json_partial_escape(ctx, "\t")->s, "\\t"));
|
|
assert(streq(json_partial_escape(ctx, "\\b")->s, "\\b"));
|
|
assert(streq(json_partial_escape(ctx, "\b")->s, "\\b"));
|
|
assert(streq(json_partial_escape(ctx, "\\r")->s, "\\r"));
|
|
assert(streq(json_partial_escape(ctx, "\r")->s, "\\r"));
|
|
assert(streq(json_partial_escape(ctx, "\\f")->s, "\\f"));
|
|
assert(streq(json_partial_escape(ctx, "\f")->s, "\\f"));
|
|
/* You're allowed to escape / according to json.org. */
|
|
assert(streq(json_partial_escape(ctx, "\\/")->s, "\\/"));
|
|
assert(streq(json_partial_escape(ctx, "/")->s, "/"));
|
|
|
|
assert(streq(json_partial_escape(ctx, "\\u0FFF")->s, "\\u0FFF"));
|
|
assert(streq(json_partial_escape(ctx, "\\u0FFFx")->s, "\\u0FFFx"));
|
|
|
|
/* Unknown escapes should be escaped. */
|
|
assert(streq(json_partial_escape(ctx, "\\x")->s, "\\\\x"));
|
|
tal_free(ctx);
|
|
}
|
|
|
|
/* Test that we can segment and parse a stream of json objects correctly. */
|
|
static void test_json_stream(void)
|
|
{
|
|
bool valid, complete;
|
|
char *input, *talstr;
|
|
jsmntok_t *toks;
|
|
jsmn_parser parser;
|
|
|
|
/* Multiple full messages in a single buffer (happens when buffer
|
|
* boundary coincides with message boundary, or read returned after
|
|
* timeout. */
|
|
input = "{\"x\":\"x\"}{\"y\":\"y\"}";
|
|
talstr = tal_strndup(NULL, input, strlen(input));
|
|
toks = toks_alloc(NULL);
|
|
jsmn_init(&parser);
|
|
valid = json_parse_input(&parser, &toks, talstr, strlen(talstr), &complete);
|
|
assert(tal_count(toks) == 4);
|
|
assert(toks[0].start == 0 && toks[0].end == 9);
|
|
assert(valid);
|
|
assert(complete);
|
|
tal_free(talstr);
|
|
|
|
/* Multiple messages, and the last one is partial, far more likely than
|
|
* accidentally getting the boundaries to match. */
|
|
input = "{\"x\":\"x\"}{\"y\":\"y\"}{\"z\":\"z";
|
|
talstr = tal_strndup(NULL, input, strlen(input));
|
|
toks_reset(toks);
|
|
jsmn_init(&parser);
|
|
valid = json_parse_input(&parser, &toks, talstr, strlen(talstr), &complete);
|
|
assert(toks);
|
|
assert(tal_count(toks) == 4);
|
|
assert(toks[0].start == 0 && toks[0].end == 9);
|
|
assert(valid);
|
|
assert(complete);
|
|
tal_free(talstr);
|
|
|
|
/* We can do this incrementally, too. */
|
|
toks_reset(toks);
|
|
input = "{\"x\":\"x\"}";
|
|
jsmn_init(&parser);
|
|
for (size_t i = 0; i <= strlen(input); i++) {
|
|
valid = json_parse_input(&parser, &toks, input, i, &complete);
|
|
assert(valid);
|
|
if (i == strlen(input))
|
|
assert(complete);
|
|
else
|
|
assert(!complete);
|
|
}
|
|
assert(tal_count(toks) == 4);
|
|
assert(toks[0].start == 0 && toks[0].end == 9);
|
|
tal_free(toks);
|
|
}
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
common_setup(argv[0]);
|
|
|
|
test_json_filter();
|
|
test_json_escape();
|
|
test_json_partial();
|
|
test_json_stream();
|
|
|
|
common_shutdown();
|
|
}
|