From c50ed0dd84f8cb6102ccfc847317dfefa38f3d11 Mon Sep 17 00:00:00 2001 From: Rob Date: Mon, 11 Sep 2023 20:11:26 -0400 Subject: [PATCH] inject consensus info to fallback network --- crates/hotshot/src/traits/networking/libp2p_network.rs | 8 +++++--- .../src/traits/networking/web_server_libp2p_fallback.rs | 8 +++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/crates/hotshot/src/traits/networking/libp2p_network.rs b/crates/hotshot/src/traits/networking/libp2p_network.rs index 4a39ea65cd..ddc13b9571 100644 --- a/crates/hotshot/src/traits/networking/libp2p_network.rs +++ b/crates/hotshot/src/traits/networking/libp2p_network.rs @@ -338,8 +338,8 @@ impl Libp2pNetwork { topic_map, node_lookup_send, cache_gc_shutdown_send, - // Start the latest view from 0. "Latest" refers to "most recent view we are polling for - // proposals on". We need this because to have consensus info injected we need a working + // Start the latest view from 0. "Latest" refers to "most recent view we are polling for + // proposals on". We need this because to have consensus info injected we need a working // network already. In the worst case, we send a few lookups we don't need. latest_seen_view: Arc::new(AtomicU64::new(0)), }), @@ -743,7 +743,9 @@ impl ConnectedNetwork for Libp2p ConsensusIntentEvent::PollForProposal(new_view) => { if new_view > self.inner.latest_seen_view.load(Ordering::Relaxed) { - self.inner.latest_seen_view.store(new_view, Ordering::Relaxed); + self.inner + .latest_seen_view + .store(new_view, Ordering::Relaxed); } } diff --git a/crates/hotshot/src/traits/networking/web_server_libp2p_fallback.rs b/crates/hotshot/src/traits/networking/web_server_libp2p_fallback.rs index 7af2e978ef..170ad630f5 100644 --- a/crates/hotshot/src/traits/networking/web_server_libp2p_fallback.rs +++ b/crates/hotshot/src/traits/networking/web_server_libp2p_fallback.rs @@ -281,8 +281,14 @@ impl< as ConnectedNetwork< Message, TYPES::SignatureKey, - >>::inject_consensus_info(self.network(), event) + >>::inject_consensus_info(self.network(), event.clone()) .await; + + as ConnectedNetwork< + Message, + TYPES::SignatureKey, + >>::inject_consensus_info(self.fallback(), event) + .await; } }