f

Author: TheBlueMatt

lightning-net-tokio/src/lib.rs

@@ -485,13 +485,6 @@ impl peer_handler::SocketDescriptor for SocketDescriptor {
 		let mut ctx = task::Context::from_waker(&waker);
 		let mut written_len = 0;
 		loop {
-			macro_rules! handle_write_err {
-				($err: expr) => { {
-					// Probably we've already been closed, just return what we have and let the
-					// read thread handle closing logic.
-					return written_len;
-				} }
-			}
 			match us.writer.as_ref().unwrap().poll_write_ready(&mut ctx) {
 				task::Poll::Ready(Ok(())) => {
 					match us.writer.as_ref().unwrap().try_write(&data[written_len..]) {
@@ -500,10 +493,10 @@ impl peer_handler::SocketDescriptor for SocketDescriptor {
 							written_len += res;
 							if written_len == data.len() { return written_len; }
 						},
-						Err(e) => handle_write_err!(e),
+						Err(e) => return written_len,
 					}
 				},
-				task::Poll::Ready(Err(e)) => handle_write_err!(e),
+				task::Poll::Ready(Err(e)) => return written_len,
 				task::Poll::Pending => {
 					// We're queued up for a write event now, but we need to make sure we also
 					// pause read given we're now waiting on the remote end to ACK (and in