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

db: always call db_update_our_closing in a transaction.

Browse Source 
It's not in a transaction in one caller, so wrap that.
This removes some more error handling code.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-09-06 16:47:49 +09:30
parent 5bcc9047b0
commit fce9ee29e3
3 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
daemon/peer.c
View File

@@ -914,7 +914,9 @@ static bool closing_pkt_in(struct peer *peer, const Pkt *pkt)
peer->closing.closing_order = peer->order_counter++;
if (!db_update_our_closing(peer)) {
db_start_transaction(peer);
db_update_our_closing(peer);
if (db_commit_transaction(peer) != NULL) {
return peer_comms_err(peer,
pkt_err(peer, "Database error"));
}
@@ -1283,7 +1285,7 @@ static void peer_calculate_close_fee(struct peer *peer)
assert(!(peer->closing.our_fee & 1));
}
static bool start_closing_in_transaction(struct peer *peer)
static void start_closing_in_transaction(struct peer *peer)
{
assert(!committed_to_htlcs(peer));
@@ -1291,26 +1293,18 @@ static bool start_closing_in_transaction(struct peer *peer)
peer_calculate_close_fee(peer);
peer->closing.closing_order = peer->order_counter++;
if (!db_update_our_closing(peer))
return false;
db_update_our_closing(peer);
queue_pkt_close_signature(peer);
return true;
}
static Pkt *start_closing(struct peer *peer)
{
db_start_transaction(peer);
if (!start_closing_in_transaction(peer)) {
db_abort_transaction(peer);
goto fail;
}
start_closing_in_transaction(peer);
if (db_commit_transaction(peer) != NULL)
goto fail;
return pkt_err(peer, "database error");
return NULL;
fail:
return pkt_err(peer, "database error");
}
/* This is the io loop while we're doing shutdown. */
@@ -1433,12 +1427,9 @@ static bool peer_start_shutdown(struct peer *peer)
set_peer_state(peer, newstate, __func__, true);
/* Catch case where we've exchanged and had no HTLCs anyway. */
if (peer->closing.their_script && !committed_to_htlcs(peer)) {
if (!start_closing_in_transaction(peer)) {
db_abort_transaction(peer);
return false;
}
}
if (peer->closing.their_script && !committed_to_htlcs(peer))
start_closing_in_transaction(peer);
return db_commit_transaction(peer) == NULL;
}