Skip to content

Encapsulate Channel enum variants inside a struct #3550

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

Merged
merged 13 commits into from
Jan 27, 2025
Merged

Encapsulate Channel enum variants inside a struct #3550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
efa1b35
Rename convert_chan_phase_err
jkczyz Jan 13, 2025
92bdf28
Rename break_chan_phase_entry
jkczyz Jan 13, 2025
a73c1f4
Rename try_chan_phase_entry
jkczyz Jan 13, 2025
38114d7
Rename remove_channel_phase
jkczyz Jan 13, 2025
7e95cba
Rename chan_phase_entry to chan_entry
jkczyz Jan 13, 2025
17b4972
Rename chan_phase as appropriate
jkczyz Jan 13, 2025
7c92614
Remove explicit use of Channel variants from tests
jkczyz Jan 14, 2025
ae651ea
Rename phase and qualify chan, as needed
jkczyz Jan 14, 2025
b5ef7c9
Encapsulate Channel enum variants inside a struct
jkczyz Jan 16, 2025
f8975d9
Add ChannelPhase::Undefined variant
jkczyz Jan 16, 2025
cfeb0c9
Add ChannelError::SendError variant
jkczyz Jan 17, 2025
d4bd56f
Move funding_signed phase transition to Channel
jkczyz Jan 17, 2025
b75ca39
Move tx_complete phase transition to Channel
jkczyz Jan 17, 2025
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
4 changes: 2 additions & 2 deletions lightning/src/ln/async_signer_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1022,9 +1022,9 @@ fn do_test_closing_signed(extra_closing_signed: bool, reconnect: bool) {

let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
let mut chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
let chan = chan_lock.channel_by_id.get_mut(&chan_id).map(|phase| phase.context_mut()).unwrap();
let context = chan_lock.channel_by_id.get_mut(&chan_id).map(|chan| chan.context_mut()).unwrap();

let signer = chan.get_mut_signer().as_mut_ecdsa().unwrap();
let signer = context.get_mut_signer().as_mut_ecdsa().unwrap();
let signature = signer.sign_closing_transaction(&closing_tx_2, &Secp256k1::new()).unwrap();
node_1_closing_signed_2.signature = signature;
node_1_closing_signed_2
Expand Down
Loading
Loading