patch remove-bitcoin_release_anchor.patch

This commit is contained in:
Rusty Russell
2016-11-09 08:04:24 +10:30
parent f71f0da19c
commit 8c5fae2b28
3 changed files with 0 additions and 13 deletions

View File

@@ -4101,12 +4101,6 @@ void bitcoin_create_anchor(struct peer *peer)
assert(tx->input[i].witness);
}
/* We didn't end up broadcasting the anchor: we don't need to do anything
* to "release" TXOs, since we have our own internal wallet now. */
void bitcoin_release_anchor(struct peer *peer, enum state_input done)
{
}
/* Get the bitcoin anchor tx. */
const struct bitcoin_tx *bitcoin_anchor(struct peer *peer)
{

View File

@@ -169,7 +169,6 @@ enum state state(struct peer *peer,
if (err) {
peer->local.commit->sig
= tal_free(peer->local.commit->sig);
bitcoin_release_anchor(peer, INPUT_NONE);
peer_open_complete(peer, err->error->problem);
goto err_breakdown;
}
@@ -181,7 +180,6 @@ enum state state(struct peer *peer,
db_err = db_commit_transaction(peer);
if (db_err) {
bitcoin_release_anchor(peer, INPUT_NONE);
err = pkt_err(peer, "database error");
peer_open_complete(peer, db_err);
goto err_breakdown;
@@ -190,7 +188,6 @@ enum state state(struct peer *peer,
peer_watch_anchor(peer, peer->local.mindepth);
return next_state(peer, STATE_OPEN_WAITING_OURANCHOR);
} else if (input_is_pkt(input)) {
bitcoin_release_anchor(peer, INPUT_NONE);
peer_open_complete(peer, "unexpected packet");
goto unexpected_pkt;
}

View File

@@ -112,8 +112,4 @@ void bitcoin_create_anchor(struct peer *peer);
/* Get the bitcoin anchor tx. */
const struct bitcoin_tx *bitcoin_anchor(struct peer *peer);
/* We didn't end up broadcasting the anchor: release the utxos.
* If done != INPUT_NONE, remove existing create_anchor too. */
void bitcoin_release_anchor(struct peer *peer, enum state_input done);
#endif /* LIGHTNING_STATE_H */