De-generify Writer

This allows all methods of Writeable to be non-generic, which allows traits that require Writeable (such as Sign) to have a vtable and be dyn objects.

Also eliminate WriterWriteAdaptor.

Author: devrandom

background-processor/src/lib.rs

@@ -136,7 +136,7 @@ mod tests {
 	use lightning::util::config::UserConfig;
 	use lightning::util::events::{Event, EventsProvider, MessageSendEventsProvider, MessageSendEvent};
 	use lightning::util::logger::Logger;
-	use lightning::util::ser::Writeable;
+	use lightning::util::ser::{Writeable, Writer};
 	use lightning::util::test_utils;
 	use lightning_persister::FilesystemPersister;
 	use std::fs;
@@ -258,7 +258,7 @@ mod tests {
 						loop {
 							match std::fs::read($filepath) {
 								Ok(bytes) => {
-									if bytes == $expected_bytes {
+									if bytes == $expected_bytes.0 {
 										break
 									} else {
 										continue
@@ -275,7 +275,7 @@ mod tests {
 
 		// Check that the initial channel manager data is persisted as expected.
 		let filepath = get_full_filepath("test_background_processor_persister_0".to_string(), "manager".to_string());
-		let mut expected_bytes = Vec::new();
+		let mut expected_bytes = Writer::new();
 		check_persisted_data!(nodes[0].node, filepath.clone(), expected_bytes);
 		loop {
 			if !nodes[0].node.get_persistence_condvar_value() { break }
@@ -285,7 +285,7 @@ mod tests {
 		nodes[0].node.force_close_channel(&OutPoint { txid: tx.txid(), index: 0 }.to_channel_id()).unwrap();
 
 		// Check that the force-close updates are persisted.
-		let mut expected_bytes = Vec::new();
+		let mut expected_bytes = Writer::new();
 		check_persisted_data!(nodes[0].node, filepath.clone(), expected_bytes);
 		loop {
 			if !nodes[0].node.get_persistence_condvar_value() { break }

fuzz/src/chanmon_consistency.rs

@@ -75,17 +75,6 @@ impl BroadcasterInterface for TestBroadcaster {
 	fn broadcast_transaction(&self, _tx: &Transaction) { }
 }
 
-pub struct VecWriter(pub Vec<u8>);
-impl Writer for VecWriter {
-	fn write_all(&mut self, buf: &[u8]) -> Result<(), ::std::io::Error> {
-		self.0.extend_from_slice(buf);
-		Ok(())
-	}
-	fn size_hint(&mut self, size: usize) {
-		self.0.reserve_exact(size);
-	}
-}
-
 struct TestChainMonitor {
 	pub logger: Arc<dyn Logger>,
 	pub chain_monitor: Arc<chainmonitor::ChainMonitor<EnforcingSigner, Arc<dyn chain::Filter>, Arc<TestBroadcaster>, Arc<FuzzEstimator>, Arc<dyn Logger>, Arc<TestPersister>>>,
@@ -111,7 +100,7 @@ impl TestChainMonitor {
 }
 impl chain::Watch<EnforcingSigner> for TestChainMonitor {
 	fn watch_channel(&self, funding_txo: OutPoint, monitor: channelmonitor::ChannelMonitor<EnforcingSigner>) -> Result<(), channelmonitor::ChannelMonitorUpdateErr> {
-		let mut ser = VecWriter(Vec::new());
+		let mut ser = Writer::new();
 		monitor.write(&mut ser).unwrap();
 		if let Some(_) = self.latest_monitors.lock().unwrap().insert(funding_txo, (monitor.get_latest_update_id(), ser.0)) {
 			panic!("Already had monitor pre-watch_channel");
@@ -130,7 +119,7 @@ impl chain::Watch<EnforcingSigner> for TestChainMonitor {
 		let deserialized_monitor = <(BlockHash, channelmonitor::ChannelMonitor<EnforcingSigner>)>::
 			read(&mut Cursor::new(&map_entry.get().1), &OnlyReadsKeysInterface {}).unwrap().1;
 		deserialized_monitor.update_monitor(&update, &&TestBroadcaster{}, &&FuzzEstimator{}, &self.logger).unwrap();
-		let mut ser = VecWriter(Vec::new());
+		let mut ser = Writer::new();
 		deserialized_monitor.write(&mut ser).unwrap();
 		map_entry.insert((update.update_id, ser.0));
 		self.should_update_manager.store(true, atomic::Ordering::Relaxed);
@@ -498,11 +487,11 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 	let mut ba_events = Vec::new();
 	let mut bc_events = Vec::new();
 
-	let mut node_a_ser = VecWriter(Vec::new());
+	let mut node_a_ser = Writer::new();
 	nodes[0].write(&mut node_a_ser).unwrap();
-	let mut node_b_ser = VecWriter(Vec::new());
+	let mut node_b_ser = Writer::new();
 	nodes[1].write(&mut node_b_ser).unwrap();
-	let mut node_c_ser = VecWriter(Vec::new());
+	let mut node_c_ser = Writer::new();
 	nodes[2].write(&mut node_c_ser).unwrap();
 
 	macro_rules! test_return {

fuzz/src/chanmon_deser.rs

@@ -12,21 +12,10 @@ use utils::test_logger;
 
 use std::io::Cursor;
 
-struct VecWriter(Vec<u8>);
-impl Writer for VecWriter {
-	fn write_all(&mut self, buf: &[u8]) -> Result<(), ::std::io::Error> {
-		self.0.extend_from_slice(buf);
-		Ok(())
-	}
-	fn size_hint(&mut self, size: usize) {
-		self.0.reserve_exact(size);
-	}
-}
-
 #[inline]
 pub fn do_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
 	if let Ok((latest_block_hash, monitor)) = <(BlockHash, channelmonitor::ChannelMonitor<EnforcingSigner>)>::read(&mut Cursor::new(data), &OnlyReadsKeysInterface {}) {
-		let mut w = VecWriter(Vec::new());
+		let mut w = Writer::new();
 		monitor.write(&mut w).unwrap();
 		let deserialized_copy = <(BlockHash, channelmonitor::ChannelMonitor<EnforcingSigner>)>::read(&mut Cursor::new(&w.0), &OnlyReadsKeysInterface {}).unwrap();
 		assert!(latest_block_hash == deserialized_copy.0);

fuzz/src/msg_targets/msg_accept_channel.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_announcement_signatures.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_channel_announcement.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_channel_reestablish.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_channel_update.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_closing_signed.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_commitment_signed.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_decoded_onion_error_packet.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_error_message.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_funding_created.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_funding_locked.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_funding_signed.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_gossip_timestamp_filter.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_init.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_node_announcement.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_onion_hop_data.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_open_channel.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_ping.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_pong.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_query_channel_range.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_query_short_channel_ids.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_reply_channel_range.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_reply_short_channel_ids_end.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_revoke_and_ack.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_shutdown.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_target_template.txt

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_update_add_htlc.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_update_fail_htlc.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_update_fail_malformed_htlc.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_update_fee.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]

fuzz/src/msg_targets/msg_update_fulfill_htlc.rs

@@ -12,7 +12,6 @@
 
 use lightning::ln::msgs;
 
-use msg_targets::utils::VecWriter;
 use utils::test_logger;
 
 #[inline]