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

return counterparty pk when rejecting subchannel offer and handle rejected state #182

Merged
merged 2 commits into from
Dec 12, 2023
Merged

return counterparty pk when rejecting subchannel offer and handle rejected state #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60c3012
chore: return counterparty pk when rejecting subchannel offer
bonomat Dec 4, 2023
994864a
chore: allow opening channel from rejected state
bonomat Dec 4, 2023
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
8 changes: 4 additions & 4 deletions dlc-manager/src/sub_channel_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ where
.get_sub_channel(channel_details.channel_id)?
{
Some(mut s) => match s.state {
SubChannelState::OffChainClosed => {
SubChannelState::OffChainClosed | SubChannelState::Rejected => {
s.is_offer = true;
s.update_idx -= 1;

Expand Down Expand Up @@ -1480,7 +1480,7 @@ where
}

/// Reject an offer to establish a sub channel.
pub fn reject_sub_channel_offer(&self, channel_id: ChannelId) -> Result<Reject, Error> {
pub fn reject_sub_channel_offer(&self, channel_id: ChannelId) -> Result<(PublicKey, Reject), Error> {
let (mut sub_channel, _) = get_sub_channel_in_state!(
self.dlc_channel_manager,
channel_id,
Expand All @@ -1494,7 +1494,7 @@ where
.get_store()
.upsert_sub_channel(&sub_channel)?;

Ok(Reject { channel_id })
Ok((sub_channel.counter_party, Reject { channel_id }))
}

/// Reject an offer to collaboratively close a sub channel off chain.
Expand Down Expand Up @@ -1585,7 +1585,7 @@ where
.get_sub_channel(channel_details.channel_id)?
{
Some(mut s) => match s.state {
SubChannelState::OffChainClosed => {
SubChannelState::OffChainClosed | SubChannelState::Rejected => {
s.is_offer = false;
s.update_idx -= 1;
Some(s)
Expand Down
25 changes: 24 additions & 1 deletion dlc-manager/tests/ln_dlc_channel_execution_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,6 +951,29 @@ fn ln_dlc_rejected_offer() {
reject_offer(&test_params);
}


#[test]
#[ignore]
fn ln_dlc_rejected_offer_then_new_offer_and_accept_offer() {
let test_params = test_init();
make_ln_payment(&test_params.alice_node, &test_params.bob_node, 900000);

reject_offer(&test_params);

open_sub_channel(&test_params);

assert_sub_channel_state!(
test_params.alice_node.sub_channel_manager,
&test_params.channel_id,
Signed
);
assert_sub_channel_state!(
test_params.bob_node.sub_channel_manager,
&test_params.channel_id,
Signed
);
}

#[test]
#[ignore]
fn ln_dlc_rejected_close() {
Expand Down Expand Up @@ -2860,7 +2883,7 @@ fn reject_offer(test_params: &LnDlcTestParams) {
Offered
);

let reject = test_params
let (_, reject) = test_params
.bob_node
.sub_channel_manager
.reject_sub_channel_offer(test_params.channel_id)
Expand Down
Loading