@@ -7029,12 +7029,6 @@ pub struct SpliceFundingNegotiated {
70297029
70307030/// Information about a splice funding negotiation that has failed.
70317031pub struct SpliceFundingFailed {
7032- /// The outpoint of the channel's splice funding transaction, if one was created.
7033- pub funding_txo: Option<bitcoin::OutPoint>,
7034-
7035- /// The features that this channel will operate with, if available.
7036- pub channel_type: Option<ChannelTypeFeatures>,
7037-
70387032 /// UTXOs spent as inputs contributed to the splice transaction.
70397033 pub contributed_inputs: Vec<bitcoin::OutPoint>,
70407034
@@ -7052,15 +7046,6 @@ macro_rules! maybe_create_splice_funding_failed {
70527046 .and_then(|funding_negotiation| {
70537047 let is_initiator = funding_negotiation.is_initiator();
70547048
7055- let funding_txo = funding_negotiation
7056- .as_funding()
7057- .and_then(|funding| funding.get_funding_txo())
7058- .map(|txo| txo.into_bitcoin_outpoint());
7059-
7060- let channel_type = funding_negotiation
7061- .as_funding()
7062- .map(|funding| funding.get_channel_type().clone());
7063-
70647049 let (mut contributed_inputs, mut contributed_outputs) = match funding_negotiation {
70657050 FundingNegotiation::AwaitingAck { context, .. } => {
70667051 context.$contributed_inputs_and_outputs()
@@ -7094,13 +7079,7 @@ macro_rules! maybe_create_splice_funding_failed {
70947079 let contribution =
70957080 $pending_splice_ref.and_then(|ps| ps.contributions.last().cloned());
70967081
7097- Some(SpliceFundingFailed {
7098- funding_txo,
7099- channel_type,
7100- contributed_inputs,
7101- contributed_outputs,
7102- contribution,
7103- })
7082+ Some(SpliceFundingFailed { contributed_inputs, contributed_outputs, contribution })
71047083 })
71057084 }};
71067085}
@@ -7142,8 +7121,6 @@ where
71427121 }
71437122 }
71447123 SpliceFundingFailed {
7145- funding_txo: None,
7146- channel_type: None,
71477124 contributed_inputs: inputs,
71487125 contributed_outputs: outputs,
71497126 contribution: Some(cloned_contribution),
0 commit comments