feat: use libp2p timeout instead of internal sync timeout.

Zilliqa · Jan 28, 2025 · 269df2e · 269df2e
1 parent a5ea91d
commit 269df2e
Show file tree

Hide file tree

Showing 4 changed files with 98 additions and 130 deletions.
diff --git a/zilliqa/src/consensus.rs b/zilliqa/src/consensus.rs
@@ -33,7 +33,7 @@ use crate::{
         ExternalMessage, InternalMessage, NewView, Proposal, QuorumCertificate, Vote,
         MAX_COMMITTEE_SIZE,
     },
-    node::{MessageSender, NetworkMessage, OutgoingMessageFailure},
+    node::{MessageSender, NetworkMessage},
     pool::{TransactionPool, TxAddResult, TxPoolContent},
     state::State,
     sync::{Sync, SyncPeers},
@@ -3125,13 +3125,6 @@ impl Consensus {
         Ok(count)
     }
 
-    pub fn report_outgoing_message_failure(
-        &mut self,
-        _failure: OutgoingMessageFailure,
-    ) -> Result<()> {
-        Ok(()) // FIXME: Stub
-    }
-
     pub fn tick(&mut self) -> Result<()> {
         trace!("consensus::tick()");
         trace!("request_missing_blocks from timer");

diff --git a/zilliqa/src/node.rs b/zilliqa/src/node.rs
@@ -331,7 +331,7 @@ impl Node {
         failure: OutgoingMessageFailure,
     ) -> Result<()> {
         debug!(from = %self.peer_id, %to, ?failure, "handling message failure");
-        self.consensus.report_outgoing_message_failure(failure)?;
+        self.consensus.sync.handle_request_failure(failure)?;
         Ok(())
     }
 

diff --git a/zilliqa/src/p2p_node.rs b/zilliqa/src/p2p_node.rs
@@ -112,7 +112,8 @@ impl P2pNode {
                 Ok(Behaviour {
                     request_response: request_response::cbor::Behaviour::new(
                         iter::once((StreamProtocol::new("/zq2-message/1"), ProtocolSupport::Full)),
-                        Default::default(),
+                        request_response::Config::default()
+                            .with_request_timeout(Duration::from_secs(10)),
                     ),
                     gossipsub: gossipsub::Behaviour::new(
                         MessageAuthenticity::Signed(key_pair.clone()),