From: Matt Corallo <git@bluematt.me>
Date: Sat, 4 Nov 2023 16:20:24 +0000 (+0000)
Subject: Prefer `Writeable.encode()` over `VecWriter` use
X-Git-Tag: v0.0.119~57^2~10
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=abee51b10c3aac329ede97efb510572f3026d7da;p=rust-lightning

Prefer `Writeable.encode()` over `VecWriter` use

It does the same thing and its much simpler.
---

diff --git a/lightning/src/blinded_path/utils.rs b/lightning/src/blinded_path/utils.rs
index c62b4e6c2..33a2cde8c 100644
--- a/lightning/src/blinded_path/utils.rs
+++ b/lightning/src/blinded_path/utils.rs
@@ -20,7 +20,7 @@ use crate::ln::msgs::DecodeError;
 use crate::ln::onion_utils;
 use crate::onion_message::Destination;
 use crate::util::chacha20poly1305rfc::ChaChaPolyWriteAdapter;
-use crate::util::ser::{Readable, VecWriter, Writeable};
+use crate::util::ser::{Readable, Writeable};
 
 use crate::io;
 use crate::prelude::*;
@@ -129,10 +129,8 @@ where
 
 /// Encrypt TLV payload to be used as a [`crate::blinded_path::BlindedHop::encrypted_payload`].
 fn encrypt_payload<P: Writeable>(payload: P, encrypted_tlvs_rho: [u8; 32]) -> Vec<u8> {
-	let mut writer = VecWriter(Vec::new());
 	let write_adapter = ChaChaPolyWriteAdapter::new(encrypted_tlvs_rho, &payload);
-	write_adapter.write(&mut writer).expect("In-memory writes cannot fail");
-	writer.0
+	write_adapter.encode()
 }
 
 /// Blinded path encrypted payloads may be padded to ensure they are equal length.