Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Preparations for storing channels per peer #1542

Merged
merged 4 commits into from
Jul 13, 2022
+233 −75
Merged

Preparations for storing channels per peer #1542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
908e898
Add `counterparty_node_id` to `short_to_id` map
ViktorTigerstrom May 17, 2022
872c037
Rename `short_to_id` map to `short_to_chan_info`
ViktorTigerstrom Jun 9, 2022
4058861
Add id_to_peer map
ViktorTigerstrom Jun 3, 2022
fa7f170
Add `ChannelManager:id_to_peer` map coverage test
ViktorTigerstrom Jun 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lightning/src/ln/channel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4936,8 +4936,9 @@ impl<Signer: Sign> Channel<Signer> {
// the funding transaction is at least still in the mempool of most nodes).
//
// Note that ideally we wouldn't force-close if we see *any* reorg on a 1-conf or
// 0-conf channel, but not doing so may lead to the `ChannelManager::short_to_id` map
// being inconsistent, so we currently have to.
// 0-conf channel, but not doing so may lead to the
// `ChannelManager::short_to_chan_info` map being inconsistent, so we currently have
// to.
if funding_tx_confirmations == 0 && self.funding_tx_confirmed_in.is_some() {
let err_reason = format!("Funding transaction was un-confirmed. Locked at {} confs, now have {} confs.",
self.minimum_depth.unwrap(), funding_tx_confirmations);
Expand Down
Loading