Skip to content

Commit 5f83e54

Browse files
committed
Drop unused variable
An earlier version of 92f1961 required tracking the funding txo when we initialize splicing, but it is now unused, so can be dropped.
1 parent 2150f24 commit 5f83e54

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

lightning/src/ln/channel.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2470,7 +2470,6 @@ pub(crate) struct SpliceInstructions {
24702470
change_script: Option<ScriptBuf>,
24712471
funding_feerate_per_kw: u32,
24722472
locktime: u32,
2473-
original_funding_txo: OutPoint,
24742473
}
24752474

24762475
impl_writeable_tlv_based!(SpliceInstructions, {
@@ -2480,7 +2479,6 @@ impl_writeable_tlv_based!(SpliceInstructions, {
24802479
(7, change_script, option),
24812480
(9, funding_feerate_per_kw, required),
24822481
(11, locktime, required),
2483-
(13, original_funding_txo, required),
24842482
});
24852483

24862484
pub(crate) enum QuiescentAction {
@@ -11184,11 +11182,6 @@ where
1118411182
}
1118511183
}
1118611184

11187-
let original_funding_txo = self.funding.get_funding_txo().ok_or_else(|| {
11188-
debug_assert!(false);
11189-
APIError::APIMisuseError { err: "Channel isn't yet fully funded".to_owned() }
11190-
})?;
11191-
1119211185
let (our_funding_inputs, our_funding_outputs, change_script) = contribution.into_tx_parts();
1119311186

1119411187
let action = QuiescentAction::Splice(SpliceInstructions {
@@ -11198,7 +11191,6 @@ where
1119811191
change_script,
1119911192
funding_feerate_per_kw,
1120011193
locktime,
11201-
original_funding_txo,
1120211194
});
1120311195
self.propose_quiescence(logger, action)
1120411196
.map_err(|e| APIError::APIMisuseError { err: e.to_owned() })
@@ -11215,7 +11207,6 @@ where
1121511207
change_script,
1121611208
funding_feerate_per_kw,
1121711209
locktime,
11218-
original_funding_txo,
1121911210
} = instructions;
1122011211

1122111212
// Check if a splice has been initiated already.

0 commit comments

Comments
 (0)