ref: simplify some idioms and add some comments on retrieval timeouts

Author: aesedepece

net/src/client/http/mod.rs

@@ -14,12 +14,15 @@ pub struct WitnetHttpClient {
 
 impl WitnetHttpClient {
     /// Simple wrapper around `isahc::HttpClient::send_async`.
+    ///
+    /// Opinionated in only one thing: if a timeout is not specified, it uses a 10 seconds timeout.
     pub async fn send(
         &self,
         request: reqwest::RequestBuilder,
         timeout: Option<Duration>,
     ) -> Result<WitnetHttpResponse, WitnetHttpError> {
-        let req = match request.timeout(timeout.unwrap_or(Duration::new(10, 0))).build() {
+        let timeout = timeout.unwrap_or(Duration::from_secs(10));
+        let req = match request.timeout(timeout).build() {
             Ok(req) => req,
             Err(e) => return Err(WitnetHttpError::HttpRequestError { msg: e.to_string() }),
         };

node/src/actors/chain_manager/mod.rs

@@ -3784,6 +3784,8 @@ pub fn run_dr_locally(dr: &DataRequestOutput) -> Result<RadonTypes, anyhow::Erro
             retrieve,
             active_wips.clone(),
             protocol_version,
+            // TODO: decide whether to enable custom timeouts for this type of local execution
+            None,
         ))
     };
 

rad/src/lib.rs

@@ -557,7 +557,15 @@ pub async fn run_paranoid_retrieval(
 ) -> Result<RadonReport<RadonTypes>> {
     // We can skip paranoid checks for retrieval types that don't use networking (e.g. RNG)
     if !retrieve.kind.is_http() {
-        return run_retrieval_report(retrieve, settings, active_wips, protocol_version, None, timeout).await;
+        return run_retrieval_report(
+            retrieve,
+            settings,
+            active_wips,
+            protocol_version,
+            None,
+            timeout,
+        )
+        .await;
     }
 
     let futures: Result<Vec<_>> = witnessing

toolkit/src/cli/arguments.rs

@@ -30,7 +30,7 @@ pub(crate) struct TryDataRequest {
     )]
     pub full_trace: Option<bool>,
     #[structopt(
-        long, 
+        long,
         help = "Maximum amount of seconds to wait for a data source to respond."
     )]
     pub timeout: Option<u64>,

toolkit/src/cli/data_requests.rs

@@ -43,11 +43,7 @@ pub(crate) fn try_from_args(
     args: arguments::TryDataRequest,
 ) -> Result<RADRequestExecutionReport, Error> {
     let full_trace = args.full_trace.unwrap_or(true);
-    let timeout: Option<Duration> = if let Some(timeout) = args.timeout {
-        Some(Duration::from_secs(timeout))
-    } else {
-        None
-    };
+    let timeout = args.timeout.map(Duration::from_secs);
     let request = decode_from_args(args.into())?.data_request;
     witnet_toolkit::data_requests::try_data_request(&request, full_trace, timeout)
 }

wallet/src/actors/worker/methods.rs

@@ -58,6 +58,8 @@ impl Worker {
             None,
             Some(self.params.witnessing.clone()),
             false,
+            // TODO: decide whether to enable custom timeouts for this type of execution
+            None,
         )
     }
 

wallet/tests/data_requests.rs

@@ -110,6 +110,7 @@ fn test_data_request_report_json_serialization() {
         Some(&inputs),
         None,
         false,
+        None,
     );
 
     // Number of retrieval reports should match number of sources