lightningd: don't say 'killing channel' when HTLC times out.

We're actually only killing the connection.  I saw this in my logs,
but it was all OK.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2019-08-07 16:13:16 +09:30 committed by ZmnSCPxj, ZmnSCPxj jxPCSmnZ
parent cd91c06ce9
commit b73a85a75e
2 changed files with 3 additions and 3 deletions

View File

@ -421,10 +421,10 @@ static void htlc_offer_timeout(struct channel *channel)
return;
log_unusual(channel->owner->log,
"Adding HTLC too slow: killing channel");
"Adding HTLC too slow: killing connection");
tal_free(channel->owner);
channel_set_billboard(channel, false,
"Adding HTLC timed out: killed channel");
"Adding HTLC timed out: killed connection");
}
enum onion_type send_htlc_out(struct channel *out,

View File

@ -936,7 +936,7 @@ def test_htlc_send_timeout(node_factory, bitcoind):
assert not l2.daemon.is_in_log(r'channeld.*:\[IN\] 0013')
assert not l2.daemon.is_in_log(r'channeld.*:\[OUT\] 0084')
# L2 killed the channel with l3 because it was too slow.
l2.daemon.wait_for_log('channeld-{}.*Adding HTLC too slow: killing channel'.format(l3.info['id']))
l2.daemon.wait_for_log('channeld-{}.*Adding HTLC too slow: killing connection'.format(l3.info['id']))
def test_ipv4_and_ipv6(node_factory):