498a5c4 node: Handle `fetched` differently if initiated — heartwood

Radicle Heartwood Protocol & Stack

node: Handle `fetched` differently if initiated

Alexis Sellier committed 3 years ago

commit 498a5c4e4a07bac289fcfafbad603bbb347dcf79
parent 3aa105afdac236b73a7da59d4271b3b9ff1aeb38

4 files changed +47 -40

modified radicle-node/src/service.rs

@@ -512,53 +512,56 @@ where

         let remote = result.remote;
         let rid = result.rid;
         let namespaces = result.namespaces;
         let initiated = result.initiated;
         log::debug!(
             target: "service",
             "Fetched {rid} {remote} (error={:?})", result.result.as_ref().err()
         );
         let result = match result.result {
             Ok(updated) => {
                 self.reactor.event(Event::RefsFetched {
                     remote,
                     rid,
                     updated: updated.clone(),
                 });
                 Ok(updated)
             }
             Err(err) => {
                 error!(target: "service", "Fetch failed for {rid} from {remote}: {err}");
         if initiated {
             log::debug!(
                 target: "service",
                 "Fetched {rid} {remote} (error={:?})", result.result.as_ref().err()
             );
             let result = match result.result {
                 Ok(updated) => {
                     self.reactor.event(Event::RefsFetched {
                         remote,
                         rid,
                         updated: updated.clone(),
                     });
                     Ok(updated)
                 }
                 Err(err) => {
                     error!(target: "service", "Fetch failed for {rid} from {remote}: {err}");
                 if let FetchError::Io(_) = err {
                     self.reactor
                         .disconnect(result.remote, DisconnectReason::Fetch(err));
                     return;
                 } else {
                     Err(err)
                     if let FetchError::Io(_) = err {
                         self.reactor
                             .disconnect(result.remote, DisconnectReason::Fetch(err));
                         return;
                     } else {
                         Err(err)
                     }
                 }
             }
         };
             };
         if let Some(results) = self.fetch_reqs.get(&rid) {
             log::debug!(target: "service", "Found existing fetch request, sending result..");
             if let Some(results) = self.fetch_reqs.get(&rid) {
                 log::debug!(target: "service", "Found existing fetch request, sending result..");
             if results
                 .send(FetchResult {
                     rid,
                     remote,
                     namespaces,
                     result,
                 })
                 .is_err()
             {
                 log::error!(target: "service", "Error sending fetch result for {rid}..");
                 self.fetch_reqs.remove(&rid);
                 if results
                     .send(FetchResult {
                         rid,
                         initiated,
                         remote,
                         namespaces,
                         result,
                     })
                     .is_err()
                 {
                     log::error!(target: "service", "Error sending fetch result for {rid}..");
                     self.fetch_reqs.remove(&rid);
                 } else {
                     log::debug!(target: "service", "Sent fetch result for {rid}..");
                 }
             } else {
                 log::debug!(target: "service", "Sent fetch result for {rid}..");
                 log::debug!(target: "service", "No fetch requests found for {rid}..");
             }
         } else {
             log::debug!(target: "service", "No fetch requests found for {rid}..");
         }
         if let Some(session) = self.sessions.get_mut(&remote) {

modified radicle-node/src/test/simulator.rs

@@ -621,6 +621,7 @@ impl<S: WriteStorage + 'static, G: Signer> Simulation<S, G> {

                             remote: fetch.remote,
                             input: Input::Fetched(Arc::new(FetchResult {
                                 rid: fetch.repo,
                                 initiated: fetch.initiated,
                                 remote: fetch.remote,
                                 namespaces: fetch.namespaces,
                                 result: Err(FetchError::Io(io::ErrorKind::Other.into())),

@@ -635,6 +636,7 @@ impl<S: WriteStorage + 'static, G: Signer> Simulation<S, G> {

                             remote: fetch.remote,
                             input: Input::Fetched(Arc::new(FetchResult {
                                 rid: fetch.repo,
                                 initiated: fetch.initiated,
                                 remote: fetch.remote,
                                 namespaces: fetch.namespaces,
                                 result: Ok(vec![]),

modified radicle-node/src/worker.rs

@@ -81,6 +81,7 @@ impl<G: Signer + EcSign + 'static> Worker<G> {

             rid: fetch.repo,
             remote: fetch.remote,
             namespaces: fetch.namespaces,
             initiated: fetch.initiated,
             result,
         };
         log::debug!(target: "worker", "Sending response back to service..");

modified radicle/src/node.rs

@@ -61,6 +61,7 @@ impl From<net::SocketAddr> for Address {

 pub struct FetchResult {
     pub rid: Id,
     pub remote: NodeId,
     pub initiated: bool,
     pub namespaces: Namespaces,
     pub result: Result<Vec<RefUpdate>, FetchError>,
 }