Builder request timeout (#3632)

builder request timeout

Author: rob-maron

crates/hotshot-builder/refactored/src/testing/mod.rs

@@ -77,7 +77,7 @@ impl TestServiceWrapper {
         let url: Url = format!("http://localhost:{port}").parse().unwrap();
         let app = Arc::clone(&global_state).into_app().unwrap();
         spawn(app.serve(url.clone(), StaticVersion::<0, 1> {}));
-        let client = BuilderClient::new(url);
+        let client = BuilderClient::new(url, Duration::from_secs(5));
         assert!(client.connect(Duration::from_secs(1)).await);
         Self {
             event_sender: event_stream_sender,

crates/hotshot/hotshot/src/tasks/task_state.rs

@@ -211,7 +211,7 @@ impl<TYPES: NodeType, I: NodeImplementation<TYPES>, V: Versions> CreateTaskState
                 .builder_urls
                 .iter()
                 .cloned()
-                .map(BuilderClient::new)
+                .map(|url| BuilderClient::new(url, handle.builder_timeout()))
                 .collect(),
             upgrade_lock: handle.hotshot.upgrade_lock.clone(),
             epoch_height: handle.epoch_height,

crates/hotshot/task-impls/src/builder.rs

@@ -73,12 +73,12 @@ impl<TYPES: NodeType, Ver: StaticVersionType> BuilderClient<TYPES, Ver> {
     /// # Panics
     ///
     /// If the URL is malformed.
-    pub fn new(base_url: impl Into<Url>) -> Self {
+    pub fn new(base_url: impl Into<Url>, request_timeout: Duration) -> Self {
         let url = base_url.into();
 
         Self {
             client: Client::builder(url.clone())
-                .set_timeout(Some(Duration::from_secs(2)))
+                .set_timeout(Some(request_timeout))
                 .build(),
             _marker: std::marker::PhantomData,
         }

crates/hotshot/testing/tests/tests_1/block_builder.rs

@@ -50,7 +50,8 @@ async fn test_random_block_builder() {
 
     let builder_started = Instant::now();
 
-    let client: BuilderClient<TestTypes, StaticVersion<0, 1>> = BuilderClient::new(api_url);
+    let client: BuilderClient<TestTypes, StaticVersion<0, 1>> =
+        BuilderClient::new(api_url, Duration::from_secs(5));
     assert!(client.connect(Duration::from_millis(100)).await);
 
     let (pub_key, private_key) =

sequencer/api/public-env-vars.toml

@@ -75,7 +75,6 @@ variables = [
     "ESPRESSO_SEQUENCER_L1_POLLING_INTERVAL",
     "ESPRESSO_SEQUENCER_L1_RATE_LIMIT_DELAY",
     "ESPRESSO_SEQUENCER_L1_STAKE_TABLE_UPDATE_INTERVAL",
-    "ESPRESSO_SEQUENCER_L1_WS_PROVIDER",
     "ESPRESSO_SEQUENCER_L1_FINALIZED_SAFETY_MARGIN",
     "ESPRESSO_SEQUENCER_L1_RETRY_DELAY",
     "ESPRESSO_SEQUENCER_L1_SUBSCRIPTION_TIMEOUT",