aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-20 15:44:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

test_state_coverage: remove depth argument.

Browse Source 
We stash it in the trail instead.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2015-09-25 11:51:19 +09:30
parent 8e468d077d
commit afc67e1ff1
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
test/test_state_coverage.c
View File

@@ -119,6 +119,7 @@ struct trail {
const struct state_data *before, *after; const struct state_data *before, *after;
int htlc_id; int htlc_id;
unsigned int num_peer_outputs; unsigned int num_peer_outputs;
unsigned int depth;
const char *pkt_sent; const char *pkt_sent;
}; };
@@ -958,7 +959,6 @@ static void copy_peers(struct state_data *dst, struct state_data *peer,
/* Recursion! */ /* Recursion! */
static void run_peer(const struct state_data *sdata, static void run_peer(const struct state_data *sdata,
bool normalpath, bool errorpath, bool normalpath, bool errorpath,
size_t depth,
const struct trail *prev_trail, const struct trail *prev_trail,
struct hist *hist); struct hist *hist);
@@ -1022,6 +1022,7 @@ static void init_trail(struct trail *t,
{ {
t->name = before->name; t->name = before->name;
t->prev = prev; t->prev = prev;
t->depth = prev ? prev->depth + 1 : 0;
t->input = input; t->input = input;
t->before = before; t->before = before;
t->after = after; t->after = after;
@@ -1616,7 +1617,6 @@ static void try_input(const struct state_data *sdata,
enum state_input i, enum state_input i,
const union input *idata, const union input *idata,
bool normalpath, bool errorpath, bool normalpath, bool errorpath,
size_t depth,
const struct trail *prev_trail, const struct trail *prev_trail,
struct hist *hist) struct hist *hist)
{ {
@@ -1696,7 +1696,7 @@ static void try_input(const struct state_data *sdata,
tal_free(effect); tal_free(effect);
return; return;
} }
if (depth > STATE_MAX * 10) if (t.depth > STATE_MAX * 10)
report_trail(&t, "Loop"); report_trail(&t, "Loop");
} }
@@ -1735,11 +1735,11 @@ static void try_input(const struct state_data *sdata,
} }
/* Try inputs from here down. */ /* Try inputs from here down. */
run_peer(&copy, normalpath, errorpath, depth+1, &t, hist); run_peer(&copy, normalpath, errorpath, &t, hist);
/* Don't bother running other peer we can't communicate. */ /* Don't bother running other peer we can't communicate. */
if (copy.core.pkt_inputs || peer.core.pkt_inputs) if (copy.core.pkt_inputs || peer.core.pkt_inputs)
run_peer(&peer, normalpath, errorpath, depth+1, &t, hist); run_peer(&peer, normalpath, errorpath, &t, hist);
tal_free(effect); tal_free(effect);
} }
@@ -1822,7 +1822,6 @@ static unsigned int next_htlc_id(void)
static void run_peer(const struct state_data *sdata, static void run_peer(const struct state_data *sdata,
bool normalpath, bool errorpath, bool normalpath, bool errorpath,
size_t depth,
const struct trail *prev_trail, const struct trail *prev_trail,
struct hist *hist) struct hist *hist)
{ {
@@ -1846,7 +1845,7 @@ static void run_peer(const struct state_data *sdata,
if (!can_refire(i)) if (!can_refire(i))
remove_event(&copy.core.event_notifies, i); remove_event(&copy.core.event_notifies, i);
activate_event(&copy, i); activate_event(&copy, i);
try_input(&copy, i, idata, normalpath, errorpath, depth, try_input(&copy, i, idata, normalpath, errorpath,
prev_trail, hist); prev_trail, hist);
copy.core.event_notifies = old_notifies; copy.core.event_notifies = old_notifies;
} }
@@ -1859,8 +1858,7 @@ static void run_peer(const struct state_data *sdata,
&& !sdata->core.closing_cmd) { && !sdata->core.closing_cmd) {
copy.core.closing_cmd = true; copy.core.closing_cmd = true;
try_input(&copy, CMD_CLOSE, idata, try_input(&copy, CMD_CLOSE, idata,
normalpath, errorpath, depth, normalpath, errorpath, prev_trail, hist);
prev_trail, hist);
copy.core.closing_cmd = false; copy.core.closing_cmd = false;
} }
@@ -1882,7 +1880,7 @@ static void run_peer(const struct state_data *sdata,
idata->htlc_prog->htlc.id = next_htlc_id(); idata->htlc_prog->htlc.id = next_htlc_id();
try_input(&copy, copy.core.current_command, idata, try_input(&copy, copy.core.current_command, idata,
normalpath, errorpath, depth, normalpath, errorpath,
prev_trail, hist); prev_trail, hist);
idata->htlc_prog = tal_free(idata->htlc_prog); idata->htlc_prog = tal_free(idata->htlc_prog);
} }
@@ -1899,12 +1897,12 @@ static void run_peer(const struct state_data *sdata,
= CMD_SEND_HTLC_FULFILL; = CMD_SEND_HTLC_FULFILL;
try_input(&copy, copy.core.current_command, try_input(&copy, copy.core.current_command,
idata, normalpath, errorpath, idata, normalpath, errorpath,
depth, prev_trail, hist); prev_trail, hist);
} }
copy.core.current_command = CMD_SEND_HTLC_ROUTEFAIL; copy.core.current_command = CMD_SEND_HTLC_ROUTEFAIL;
try_input(&copy, copy.core.current_command, try_input(&copy, copy.core.current_command,
idata, normalpath, errorpath, idata, normalpath, errorpath,
depth, prev_trail, hist); prev_trail, hist);
} }
/* We can timeout an HTLC we offered. */ /* We can timeout an HTLC we offered. */
@@ -1916,7 +1914,7 @@ static void run_peer(const struct state_data *sdata,
copy.core.current_command = CMD_SEND_HTLC_TIMEDOUT; copy.core.current_command = CMD_SEND_HTLC_TIMEDOUT;
try_input(&copy, copy.core.current_command, try_input(&copy, copy.core.current_command,
idata, normalpath, errorpath, idata, normalpath, errorpath,
depth, prev_trail, hist); prev_trail, hist);
} }
/* Restore current_command */ /* Restore current_command */
@@ -1930,21 +1928,21 @@ static void run_peer(const struct state_data *sdata,
if (!rval_known(sdata, idata->htlc->id)) { if (!rval_known(sdata, idata->htlc->id)) {
try_input(&copy, INPUT_RVALUE, try_input(&copy, INPUT_RVALUE,
idata, normalpath, errorpath, idata, normalpath, errorpath,
depth, prev_trail, hist); prev_trail, hist);
} }
try_input(&copy, BITCOIN_HTLC_TOUS_TIMEOUT, try_input(&copy, BITCOIN_HTLC_TOUS_TIMEOUT,
idata, normalpath, errorpath, idata, normalpath, errorpath,
depth, prev_trail, hist); prev_trail, hist);
} }
for (i = 0; i < sdata->num_live_htlcs_to_them; i++) { for (i = 0; i < sdata->num_live_htlcs_to_them; i++) {
idata->htlc = (struct htlc *)&copy.live_htlcs_to_them[i]; idata->htlc = (struct htlc *)&copy.live_htlcs_to_them[i];
try_input(&copy, BITCOIN_HTLC_TOTHEM_SPENT, try_input(&copy, BITCOIN_HTLC_TOTHEM_SPENT,
idata, normalpath, errorpath, idata, normalpath, errorpath,
depth, prev_trail, hist); prev_trail, hist);
try_input(&copy, BITCOIN_HTLC_TOTHEM_TIMEOUT, try_input(&copy, BITCOIN_HTLC_TOTHEM_TIMEOUT,
idata, normalpath, errorpath, idata, normalpath, errorpath,
depth, prev_trail, hist); prev_trail, hist);
} }
/* If they're watching HTLC spends, we can send events. */ /* If they're watching HTLC spends, we can send events. */
@@ -1952,13 +1950,13 @@ static void run_peer(const struct state_data *sdata,
idata->htlc = (struct htlc *)&copy.htlc_spends_to_us[i]; idata->htlc = (struct htlc *)&copy.htlc_spends_to_us[i];
try_input(&copy, BITCOIN_HTLC_FULFILL_SPEND_DONE, try_input(&copy, BITCOIN_HTLC_FULFILL_SPEND_DONE,
idata, normalpath, errorpath, idata, normalpath, errorpath,
depth, prev_trail, hist); prev_trail, hist);
} }
for (i = 0; i < sdata->num_htlc_spends_to_them; i++) { for (i = 0; i < sdata->num_htlc_spends_to_them; i++) {
idata->htlc = (struct htlc *)&copy.htlc_spends_to_them[i]; idata->htlc = (struct htlc *)&copy.htlc_spends_to_them[i];
try_input(&copy, BITCOIN_HTLC_RETURN_SPEND_DONE, try_input(&copy, BITCOIN_HTLC_RETURN_SPEND_DONE,
idata, normalpath, errorpath, idata, normalpath, errorpath,
depth, prev_trail, hist); prev_trail, hist);
} }
/* Allowed to send inputs? */ /* Allowed to send inputs? */
@@ -1971,7 +1969,7 @@ static void run_peer(const struct state_data *sdata,
i = copy.core.deferred_pkt; i = copy.core.deferred_pkt;
copy.core.deferred_pkt = INPUT_NONE; copy.core.deferred_pkt = INPUT_NONE;
try_input(&copy, i, idata, try_input(&copy, i, idata,
normalpath, errorpath, depth, normalpath, errorpath,
prev_trail, hist); prev_trail, hist);
} }
/* Can't send anything until that's done. */ /* Can't send anything until that's done. */
@@ -1996,7 +1994,7 @@ static void run_peer(const struct state_data *sdata,
/* Reset so that hashing doesn't get confused. */ /* Reset so that hashing doesn't get confused. */
peer.core.outputs[peer.core.num_outputs] = 0; peer.core.outputs[peer.core.num_outputs] = 0;
try_input(&copy, i, idata, normalpath, errorpath, try_input(&copy, i, idata, normalpath, errorpath,
depth, prev_trail, hist); prev_trail, hist);
} }
} }
tal_free(idata); tal_free(idata);
@@ -2139,7 +2137,7 @@ int main(int argc, char *argv[])
abort(); abort();
/* Now, try each input in each state. */ /* Now, try each input in each state. */
run_peer(&a, true, false, 0, NULL, &hist); run_peer(&a, true, false, NULL, &hist);
#if 0 /* FIXME */ #if 0 /* FIXME */
/* Now try with declining an HTLC. */ /* Now try with declining an HTLC. */