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

daemon: always call state machine through state_single.

Browse Source 
That logs transitions, and we're about to patch it.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-05-04 16:03:10 +09:30
parent 3f374d8d8b
commit 29db78ea43
1 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
daemon/peer.c
View File

@@ -363,8 +363,6 @@ static void destroy_peer(struct peer *peer)
static void peer_disconnect(struct io_conn *conn, struct peer *peer) static void peer_disconnect(struct io_conn *conn, struct peer *peer)
{ {
const struct bitcoin_tx *broadcast;
log_info(peer->log, "Disconnected"); log_info(peer->log, "Disconnected");
/* No longer connected. */ /* No longer connected. */
@@ -387,18 +385,7 @@ static void peer_disconnect(struct io_conn *conn, struct peer *peer)
if (peer->cond == PEER_CLOSED) if (peer->cond == PEER_CLOSED)
return; return;
state(peer, INPUT_CONNECTION_LOST, NULL, &broadcast); state_single(peer, INPUT_CONNECTION_LOST, NULL);
if (broadcast) {
struct sha256_double txid;
bitcoin_txid(broadcast, &txid);
/* FIXME: log_struct */
log_debug(peer->log, "INPUT_CONN_LOST: tx %02x%02x%02x%02x...",
txid.sha.u.u8[0], txid.sha.u.u8[1],
txid.sha.u.u8[2], txid.sha.u.u8[3]);
bitcoind_send_tx(peer->dstate, broadcast);
}
} }
static struct peer *new_peer(struct lightningd_state *dstate, static struct peer *new_peer(struct lightningd_state *dstate,
@@ -1900,7 +1887,6 @@ static void json_disconnect(struct command *cmd,
{ {
struct peer *peer; struct peer *peer;
jsmntok_t *peeridtok; jsmntok_t *peeridtok;
const struct bitcoin_tx *broadcast;
if (!json_get_params(buffer, params, if (!json_get_params(buffer, params,
"peerid", &peeridtok, "peerid", &peeridtok,
@@ -1924,10 +1910,7 @@ static void json_disconnect(struct command *cmd,
* one side to freak out. We just ensure we ignore it. */ * one side to freak out. We just ensure we ignore it. */
log_debug(peer->log, "Pretending connection is closed"); log_debug(peer->log, "Pretending connection is closed");
peer->fake_close = true; peer->fake_close = true;
state(peer, INPUT_CONNECTION_LOST, NULL, &broadcast); state_single(peer, INPUT_CONNECTION_LOST, NULL);
if (broadcast)
bitcoind_send_tx(peer->dstate, broadcast);
command_success(cmd, null_response(cmd)); command_success(cmd, null_response(cmd));
} }