Skip to content

Commit a8d7646

Browse files
committed
Remove unused fields from ConstructedTransaction
The output values are never used so there's no need to persist them. If needed, they can be re-computed though the shared output's local and remote amounts would be lost.
1 parent 0cab3c3 commit a8d7646

File tree

1 file changed

+7
-24
lines changed

1 file changed

+7
-24
lines changed

lightning/src/ln/interactivetxs.rs

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,7 @@ pub(crate) struct ConstructedTransaction {
203203
tx: Transaction,
204204

205205
local_inputs_value_satoshis: u64,
206-
local_outputs_value_satoshis: u64,
207-
208206
remote_inputs_value_satoshis: u64,
209-
remote_outputs_value_satoshis: u64,
210207

211208
shared_input_index: Option<u32>,
212209
}
@@ -253,10 +250,8 @@ impl_writeable_tlv_based!(ConstructedTransaction, {
253250
(5, output_metadata, required),
254251
(7, tx, required),
255252
(9, local_inputs_value_satoshis, required),
256-
(11, local_outputs_value_satoshis, required),
257-
(13, remote_inputs_value_satoshis, required),
258-
(15, remote_outputs_value_satoshis, required),
259-
(17, shared_input_index, option),
253+
(11, remote_inputs_value_satoshis, required),
254+
(13, shared_input_index, option),
260255
});
261256

262257
impl ConstructedTransaction {
@@ -280,14 +275,7 @@ impl ConstructedTransaction {
280275
.inputs
281276
.iter()
282277
.fold(0u64, |value, (_, input)| value.saturating_add(input.local_value()));
283-
284-
let local_outputs_value_satoshis = context
285-
.outputs
286-
.iter()
287-
.fold(0u64, |value, (_, output)| value.saturating_add(output.local_value()));
288-
289278
let remote_inputs_value_satoshis = context.remote_inputs_value();
290-
let remote_outputs_value_satoshis = context.remote_outputs_value();
291279

292280
let satisfaction_weight =
293281
Weight::from_wu(context.inputs.iter().fold(0u64, |value, (_, input)| {
@@ -326,16 +314,13 @@ impl ConstructedTransaction {
326314
Ok(Self {
327315
holder_is_initiator: context.holder_is_initiator,
328316

329-
local_inputs_value_satoshis,
330-
local_outputs_value_satoshis,
331-
332-
remote_inputs_value_satoshis,
333-
remote_outputs_value_satoshis,
334-
335317
input_metadata,
336318
output_metadata,
337319
tx,
338320

321+
local_inputs_value_satoshis,
322+
remote_inputs_value_satoshis,
323+
339324
shared_input_index,
340325
})
341326
}
@@ -3321,10 +3306,8 @@ mod tests {
33213306
input_metadata,
33223307
output_metadata: vec![], // N/A for test
33233308
tx: transaction.clone(),
3324-
local_inputs_value_satoshis: 0, // N/A for test
3325-
local_outputs_value_satoshis: 0, // N/A for test
3326-
remote_inputs_value_satoshis: 0, // N/A for test
3327-
remote_outputs_value_satoshis: 0, // N/A for test
3309+
local_inputs_value_satoshis: 0, // N/A for test
3310+
remote_inputs_value_satoshis: 0, // N/A for test
33283311
shared_input_index: None,
33293312
};
33303313

0 commit comments

Comments
 (0)