f - use bitcoin::Weight

Author: jkczyz

lightning/src/ln/interactivetxs.rs

@@ -220,8 +220,8 @@ pub(crate) struct ConstructedTransaction {
 pub(crate) struct NegotiatedTxInput {
 	serial_id: SerialId,
 	txin: TxIn,
-	/// The weight of the input (in WU's)
-	weight: u64,
+	// The weight of the input including an estimate of its witness weight.
+	weight: Weight,
 }
 
 impl_writeable_tlv_based!(NegotiatedTxInput, {
@@ -314,7 +314,7 @@ impl ConstructedTransaction {
 
 	pub fn weight(&self) -> Weight {
 		let inputs_weight = self.inputs.iter().fold(Weight::from_wu(0), |weight, input| {
-			weight.checked_add(Weight::from_wu(input.weight)).unwrap_or(Weight::MAX)
+			weight.checked_add(input.weight).unwrap_or(Weight::MAX)
 		});
 		let outputs_weight = self.outputs.iter().fold(Weight::from_wu(0), |weight, output| {
 			weight.checked_add(get_output_weight(output.script_pubkey())).unwrap_or(Weight::MAX)
@@ -1532,7 +1532,7 @@ impl InteractiveTxInput {
 	}
 
 	fn into_negotiated_input(self) -> NegotiatedTxInput {
-		let weight = self.input.estimate_input_weight().to_wu();
+		let weight = self.input.estimate_input_weight();
 		NegotiatedTxInput { serial_id: self.serial_id, txin: self.input.into_tx_in(), weight }
 	}
 }

lightning/src/util/ser.rs

@@ -41,7 +41,7 @@ use bitcoin::secp256k1::ecdsa;
 use bitcoin::secp256k1::schnorr;
 use bitcoin::secp256k1::{PublicKey, SecretKey};
 use bitcoin::transaction::{OutPoint, Transaction, TxOut};
-use bitcoin::{consensus, TxIn, Witness};
+use bitcoin::{consensus, TxIn, Weight, Witness};
 
 use dnssec_prover::rr::Name;
 
@@ -1381,6 +1381,19 @@ impl Readable for Amount {
 	}
 }
 
+impl Writeable for Weight {
+	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
+		self.to_wu().write(w)
+	}
+}
+
+impl Readable for Weight {
+	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
+		let wu: u64 = Readable::read(r)?;
+		Ok(Weight::from_wu(wu))
+	}
+}
+
 impl Writeable for Txid {
 	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 		w.write_all(&self[..])