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

Remove redundant code

Browse Source
This commit is contained in:
practicalswift
2017-12-10 14:18:44 +01:00
committed by Rusty Russell
parent 0353ec0983
commit 4452e3f3f1
4 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channeld/channel.c
View File

@@ -2396,7 +2396,7 @@ static bool peer_write_pending(struct peer *peer)
dev_sabotage_fd(PEER_FD); dev_sabotage_fd(PEER_FD);
break; break;
case DEV_DISCONNECT_DROPPKT: case DEV_DISCONNECT_DROPPKT:
msg = tal_free(msg); tal_free(msg);
peer->post_sabotage = true; peer->post_sabotage = true;
peer->peer_outmsg = NULL; peer->peer_outmsg = NULL;
peer->peer_outoff = 0; peer->peer_outoff = 0;

6
channeld/test/run-full_channel.c
View File

@@ -189,15 +189,11 @@ static void tx_must_be_eq(const struct bitcoin_tx *a,
{ {
tal_t *tmpctx = tal_tmpctx(NULL); tal_t *tmpctx = tal_tmpctx(NULL);
u8 *lina, *linb; u8 *lina, *linb;
size_t i, len; size_t i;
lina = linearize_tx(tmpctx, a); lina = linearize_tx(tmpctx, a);
linb = linearize_tx(tmpctx, b); linb = linearize_tx(tmpctx, b);
len = tal_len(lina);
if (tal_len(linb) < len)
len = tal_len(linb);
for (i = 0; i < tal_len(lina); i++) { for (i = 0; i < tal_len(lina); i++) {
if (i >= tal_len(linb)) if (i >= tal_len(linb))
errx(1, "Second tx is truncated:\n" errx(1, "Second tx is truncated:\n"

2
lightningd/peer_control.c
View File

@@ -581,7 +581,7 @@ void peer_connected(struct lightningd *ld, const u8 *msg,
/* Reconnect: discard old one. */ /* Reconnect: discard old one. */
case OPENINGD: case OPENINGD:
peer = tal_free(peer); tal_free(peer);
goto return_to_gossipd; goto return_to_gossipd;
case ONCHAIND_CHEATED: case ONCHAIND_CHEATED:

6
lightningd/test/run-commit_tx.c
View File

@@ -75,15 +75,11 @@ static void tx_must_be_eq(const struct bitcoin_tx *a,
{ {
tal_t *tmpctx = tal_tmpctx(NULL); tal_t *tmpctx = tal_tmpctx(NULL);
u8 *lina, *linb; u8 *lina, *linb;
size_t i, len; size_t i;
lina = linearize_tx(tmpctx, a); lina = linearize_tx(tmpctx, a);
linb = linearize_tx(tmpctx, b); linb = linearize_tx(tmpctx, b);
len = tal_len(lina);
if (tal_len(linb) < len)
len = tal_len(linb);
for (i = 0; i < tal_len(lina); i++) { for (i = 0; i < tal_len(lina); i++) {
if (i >= tal_len(linb)) if (i >= tal_len(linb))
errx(1, "Second tx is truncated:\n" errx(1, "Second tx is truncated:\n"