vincenzopalazzo
/
rgb-cln
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

devtools/gossipwith: change timeout to seconds. 

I always get this wrong, then wonder why it's dying!

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2019-11-15 14:48:34 +10:30 committed by Christian Decker
parent 709c98f539
commit 3437f7e25d
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/pyln-testing/pyln/testing/utils.py
View File

@ -877,7 +877,7 @@ class LightningNode(object):
timeout=TIMEOUT,
stdout=subprocess.PIPE).stdout.strip()
out = subprocess.run(['devtools/gossipwith',
'--timeout-after={}'.format(int(math.sqrt(TIMEOUT) * 1000)),
'--timeout-after={}'.format(int(math.sqrt(TIMEOUT) + 1)),
'{}@localhost:{}'.format(self.info['id'],
self.port),
query],

5
devtools/gossipwith.c
View File

@ -164,7 +164,8 @@ static struct io_plan *handshake_success(struct io_conn *conn,
beint16_t belen;
u8 *msg;
if (poll(pollfd, ARRAY_SIZE(pollfd), timeout_after) == 0)
if (poll(pollfd, ARRAY_SIZE(pollfd),
timeout_after < 0 ? -1 : timeout_after * 1000) == 0)
return 0;
/* We always to stdin first if we can */
@ -235,7 +236,7 @@ int main(int argc, char *argv[])
"Secret key to use for our identity");
opt_register_arg("--timeout-after", opt_set_intval, opt_show_intval,
&timeout_after,
"Exit (success) this many msec after no msgs rcvd");
"Exit (success) this many seconds after no msgs rcvd");
opt_register_noarg("--help|-h", opt_usage_and_exit,
"id@addr[:port] [hex-msg-tosend...]\n"
"Connect to a lightning peer and relay gossip messages from it",

2
tests/test_gossip.py
View File

@ -1066,7 +1066,7 @@ def test_gossipwith(node_factory):
out = subprocess.run(['devtools/gossipwith',
'--initial-sync',
'--timeout-after={}'.format(int(math.sqrt(TIMEOUT) * 1000)),
'--timeout-after={}'.format(int(math.sqrt(TIMEOUT) + 1)),
'{}@localhost:{}'.format(l1.info['id'], l1.port)],
check=True,
timeout=TIMEOUT, stdout=subprocess.PIPE).stdout