From c99497eb2151ef41bde39b72c7287808f80f63de Mon Sep 17 00:00:00 2001
From: Alexis Sellier <self@cloudhead.io>
Date: Mon, 17 Apr 2023 15:53:31 +0200
Subject: [PATCH] Update `netservices` to 0.2.2

This includes a small change in how the EOF is sent as well.
---
 Cargo.lock                 | 4 ++--
 radicle-node/Cargo.toml    | 2 +-
 radicle-node/src/worker.rs | 8 +++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 21f01738..84d12329 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1467,9 +1467,9 @@ dependencies = [
 
 [[package]]
 name = "netservices"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f51055f5481bdb91d30a7bd731c215325b2f4a6ed437fd9c43fdaef72d49fa53"
+checksum = "888832afc021aa978d7cfcf5cbe9a694c066e21ea503791e4b8fcc82c5b7bc6f"
 dependencies = [
  "amplify",
  "cyphernet",
diff --git a/radicle-node/Cargo.toml b/radicle-node/Cargo.toml
index 3dadf867..e3419422 100644
--- a/radicle-node/Cargo.toml
+++ b/radicle-node/Cargo.toml
@@ -25,7 +25,7 @@ lexopt = { version = "0.2.1" }
 libc = { version = "0.2.137" }
 log = { version = "0.4.17", features = ["std"] }
 localtime = { version = "1.2.0" }
-netservices = { version = "0.2.1", features = ["io-reactor", "socket2"] }
+netservices = { version = "0.2.2", features = ["io-reactor", "socket2"] }
 nonempty = { version = "0.8.1", features = ["serialize"] }
 qcheck = { version = "1", default-features = false, optional = true }
 sqlite = { version = "0.30.3" }
diff --git a/radicle-node/src/worker.rs b/radicle-node/src/worker.rs
index 138b5d3a..6e09058f 100644
--- a/radicle-node/src/worker.rs
+++ b/radicle-node/src/worker.rs
@@ -346,7 +346,7 @@ impl Worker {
                     match daemon_r.read(&mut buffer) {
                         Ok(0) => break,
                         Ok(n) => {
-                            stream_w.write_all(&buffer[..n]).unwrap();
+                            stream_w.write_all(&buffer[..n])?;
 
                             if let Err(e) = self.handle.flush(remote, stream) {
                                 log::error!(target: "worker", "Worker channel disconnected; aborting");
@@ -362,7 +362,7 @@ impl Worker {
                         }
                     }
                 }
-                Ok(())
+                Self::eof(remote, stream, stream_w, &mut self.handle).map_err(UploadError::from)
             });
 
             let stream_to_daemon = s.spawn(move || -> Result<(), io::Error> {
@@ -382,9 +382,7 @@ impl Worker {
             daemon_to_stream.join().unwrap()?;
 
             Ok::<(), UploadError>(())
-        })?;
-
-        Self::eof(remote, stream, stream_w, &mut self.handle).map_err(UploadError::from)
+        })
     }
 
     fn _fetch<S>(