c99497e Update `netservices` to 0.2.2 — heartwood

Radicle Heartwood Protocol & Stack

Update `netservices` to 0.2.2

Alexis Sellier committed 3 years ago

commit c99497eb2151ef41bde39b72c7287808f80f63de
parent cb79ebef769761f61faee142600226fcce950add

3 files changed +6 -8

modified 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",

modified 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" }

modified 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>(