Update combined network

crates/constants/src/lib.rs

@@ -8,3 +8,12 @@ pub const LOOK_AHEAD: u64 = 5;
 
 /// the default kademlia record republication interval (in seconds)
 pub const KAD_DEFAULT_REPUB_INTERVAL_SEC: u64 = 28800;
+
+/// the number of messages to cache in the combined network
+pub const COMBINED_NETWORK_CACHE_SIZE: usize = 1000;
+
+/// the number of messages to attempt to send over the primary network before switching to prefer the secondary network
+pub const COMBINED_NETWORK_MIN_PRIMARY_FAILURES: u64 = 10;
+
+/// the number of messages to send over the secondary network before re-attempting the (presumed down) primary network
+pub const COMBINED_NETWORK_PRIMARY_CHECK_INTERVAL: u64 = 10;

crates/hotshot/src/traits.rs

@@ -13,9 +13,9 @@ pub use storage::{Result as StorageResult, Storage};
 pub mod implementations {
     pub use super::{
         networking::{
+            combined_network::{CombinedCommChannel, CombinedNetworks},
             libp2p_network::{Libp2pCommChannel, Libp2pNetwork, PeerInfoVec},
             memory_network::{DummyReliability, MasterMap, MemoryCommChannel, MemoryNetwork},
-            web_server_libp2p_fallback::{CombinedNetworks, WebServerWithFallbackCommChannel},
             web_server_network::{WebCommChannel, WebServerNetwork},
         },
         storage::memory_storage::MemoryStorage, // atomic_storage::AtomicStorage,

crates/hotshot/src/traits/networking.rs

@@ -5,9 +5,9 @@
 //! - [`MemoryNetwork`](memory_network::MemoryNetwork), an in memory testing-only implementation
 //! - [`Libp2pNetwork`](libp2p_network::Libp2pNetwork), a production-ready networking impelmentation built on top of libp2p-rs.
 
+pub mod combined_network;
 pub mod libp2p_network;
 pub mod memory_network;
-pub mod web_server_libp2p_fallback;
 pub mod web_server_network;
 
 pub use hotshot_types::traits::network::{