f: Rename and move constants

Author: tankyleo

lightning/src/events/bump_transaction/mod.rs

@@ -24,10 +24,10 @@ use crate::io_extras::sink;
 use crate::ln::chan_utils;
 use crate::ln::chan_utils::{
 	shared_anchor_script_pubkey, HTLCOutputInCommitment, ANCHOR_INPUT_WITNESS_WEIGHT,
-	BASE_INPUT_WEIGHT, EMPTY_SCRIPT_SIG_WEIGHT, HTLC_SUCCESS_INPUT_KEYED_ANCHOR_WITNESS_WEIGHT,
-	HTLC_SUCCESS_INPUT_P2A_ANCHOR_WITNESS_WEIGHT, HTLC_TIMEOUT_INPUT_KEYED_ANCHOR_WITNESS_WEIGHT,
-	HTLC_TIMEOUT_INPUT_P2A_ANCHOR_WITNESS_WEIGHT, P2A_ANCHOR_INPUT_WITNESS_WEIGHT,
-	P2WSH_TXOUT_WEIGHT, TRUC_CHILD_MAX_WEIGHT, TRUC_MAX_WEIGHT,
+	BASE_INPUT_WEIGHT, BASE_TX_SIZE, EMPTY_SCRIPT_SIG_WEIGHT, EMPTY_WITNESS_WEIGHT,
+	HTLC_SUCCESS_INPUT_KEYED_ANCHOR_WITNESS_WEIGHT, HTLC_SUCCESS_INPUT_P2A_ANCHOR_WITNESS_WEIGHT,
+	HTLC_TIMEOUT_INPUT_KEYED_ANCHOR_WITNESS_WEIGHT, HTLC_TIMEOUT_INPUT_P2A_ANCHOR_WITNESS_WEIGHT,
+	P2WSH_TXOUT_WEIGHT, SEGWIT_MARKER_FLAG_WEIGHT, TRUC_CHILD_MAX_WEIGHT, TRUC_MAX_WEIGHT,
 };
 use crate::ln::types::ChannelId;
 use crate::prelude::*;
@@ -584,7 +584,6 @@ where
 		Box::pin(async move {
 			let utxos = self.source.list_confirmed_utxos().await?;
 			// TODO: Use fee estimation utils when we upgrade to bitcoin v0.30.0.
-			const BASE_TX_SIZE: u64 = 4 /* version */ + 1 /* input count */ + 1 /* output count */ + 4 /* locktime */;
 			let total_output_size: u64 = must_pay_to
 				.iter()
 				.map(
@@ -596,8 +595,9 @@ where
 			let total_input_weight =
 				(BASE_INPUT_WEIGHT * must_spend.len() as u64) + total_satisfaction_weight;
 
-			let preexisting_tx_weight = 2 /* segwit marker & flag */ + total_input_weight +
-			((BASE_TX_SIZE + total_output_size) * WITNESS_SCALE_FACTOR as u64);
+			let preexisting_tx_weight = SEGWIT_MARKER_FLAG_WEIGHT
+				+ total_input_weight
+				+ ((BASE_TX_SIZE + total_output_size) * WITNESS_SCALE_FACTOR as u64);
 			let input_amount_sat = must_spend.iter().map(|input| input.previous_utxo.value).sum();
 			let target_amount_sat = must_pay_to.iter().map(|output| output.value).sum();
 
@@ -723,7 +723,7 @@ where
 			.transaction_parameters
 			.channel_type_features;
 		let anchor_input_witness_weight = if channel_type.supports_anchor_zero_fee_commitments() {
-			P2A_ANCHOR_INPUT_WITNESS_WEIGHT
+			EMPTY_WITNESS_WEIGHT
 		} else {
 			ANCHOR_INPUT_WITNESS_WEIGHT
 		};

lightning/src/ln/chan_utils.rs

@@ -90,8 +90,8 @@ pub const ANCHOR_INPUT_WITNESS_WEIGHT: u64 = 114;
 #[cfg(not(feature = "grind_signatures"))]
 pub const ANCHOR_INPUT_WITNESS_WEIGHT: u64 = 115;
 
-/// The weight of a P2A anchor witness.
-pub const P2A_ANCHOR_INPUT_WITNESS_WEIGHT: u64 = 1;
+/// The weight of an empty witness; used to spend a P2A output.
+pub const EMPTY_WITNESS_WEIGHT: u64 = 1;
 
 /// The maximum value of a P2A anchor.
 pub const P2A_MAX_VALUE: u64 = 240;
@@ -132,6 +132,8 @@ pub const FUNDING_TRANSACTION_WITNESS_WEIGHT: u64 = 1 + // number_of_witness_ele
 	1 + // witness_script_length
 	MULTISIG_SCRIPT_SIZE;
 
+pub(crate) const BASE_TX_SIZE: u64 = 4 /* version */ + 1 /* input count */ + 1 /* output count */ + 4 /* locktime */;
+pub(crate) const SEGWIT_MARKER_FLAG_WEIGHT: u64 = 2;
 pub(crate) const EMPTY_SCRIPT_SIG_WEIGHT: u64 =
 	1 /* empty script_sig */ * WITNESS_SCALE_FACTOR as u64;
 pub(crate) const BASE_INPUT_SIZE: u64 = 32 /* txid */ + 4 /* vout */ + 4 /* sequence */;