@@ -2470,7 +2470,6 @@ pub(crate) struct SpliceInstructions {
2470
2470
change_script: Option<ScriptBuf>,
2471
2471
funding_feerate_per_kw: u32,
2472
2472
locktime: u32,
2473
- original_funding_txo: OutPoint,
2474
2473
}
2475
2474
2476
2475
impl_writeable_tlv_based!(SpliceInstructions, {
@@ -2480,7 +2479,6 @@ impl_writeable_tlv_based!(SpliceInstructions, {
2480
2479
(7, change_script, option),
2481
2480
(9, funding_feerate_per_kw, required),
2482
2481
(11, locktime, required),
2483
- (13, original_funding_txo, required),
2484
2482
});
2485
2483
2486
2484
pub(crate) enum QuiescentAction {
@@ -11184,11 +11182,6 @@ where
11184
11182
}
11185
11183
}
11186
11184
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
-
11192
11185
let (our_funding_inputs, our_funding_outputs, change_script) = contribution.into_tx_parts();
11193
11186
11194
11187
let action = QuiescentAction::Splice(SpliceInstructions {
@@ -11198,7 +11191,6 @@ where
11198
11191
change_script,
11199
11192
funding_feerate_per_kw,
11200
11193
locktime,
11201
- original_funding_txo,
11202
11194
});
11203
11195
self.propose_quiescence(logger, action)
11204
11196
.map_err(|e| APIError::APIMisuseError { err: e.to_owned() })
@@ -11215,7 +11207,6 @@ where
11215
11207
change_script,
11216
11208
funding_feerate_per_kw,
11217
11209
locktime,
11218
- original_funding_txo,
11219
11210
} = instructions;
11220
11211
11221
11212
// Check if a splice has been initiated already.
0 commit comments