Skip to content

Commit

Permalink
feat: re-enable all tests
Browse files Browse the repository at this point in the history
  • Loading branch information
DieracDelta committed Aug 14, 2023
1 parent 7e7efc7 commit 5cc17f9
Show file tree
Hide file tree
Showing 7 changed files with 467 additions and 206 deletions.
2 changes: 1 addition & 1 deletion justfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ test_tokio:

test_async_std_all:
echo Testing with async std executor
RUST_LOG="error" cargo test --features=full-ci --lib --bins --tests --benches --workspace --no-fail-fast test_basic -- --test-threads=1 --nocapture
cargo test --features=full-ci --lib --bins --tests --benches --workspace --no-fail-fast -- --test-threads=1

_test_basic:
echo Testing with async std executor
Expand Down
2 changes: 1 addition & 1 deletion src/traits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pub mod implementations {
libp2p_network::{Libp2pCommChannel, Libp2pNetwork, PeerInfoVec},
memory_network::{DummyReliability, MasterMap, MemoryCommChannel, MemoryNetwork},
web_server_network::{WebCommChannel, WebServerNetwork},
web_sever_libp2p_fallback::WebServerWithFallbackCommChannel,
web_sever_libp2p_fallback::{CombinedNetworks, WebServerWithFallbackCommChannel},
},
storage::memory_storage::MemoryStorage, // atomic_storage::AtomicStorage,
};
Expand Down
8 changes: 4 additions & 4 deletions src/traits/networking/web_sever_libp2p_fallback.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@ impl<TYPES: NodeType, I: NodeImplementation<TYPES>, MEMBERSHIP: Membership<TYPES
/// Wrapper for the tuple of `WebServerNetwork` and `Libp2pNetwork`
/// We need this so we can impl `TestableNetworkingImplementation`
/// on the tuple
#[derive(Debug)]
#[derive(Debug, Clone)]
pub struct CombinedNetworks<
TYPES: NodeType,
I: NodeImplementation<TYPES>,
MEMBERSHIP: Membership<TYPES>,
>(
WebServerNetwork<Message<TYPES, I>, TYPES::SignatureKey, TYPES::ElectionConfigType, TYPES>,
Libp2pNetwork<Message<TYPES, I>, TYPES::SignatureKey>,
PhantomData<MEMBERSHIP>,
pub WebServerNetwork<Message<TYPES, I>, TYPES::SignatureKey, TYPES::ElectionConfigType, TYPES>,
pub Libp2pNetwork<Message<TYPES, I>, TYPES::SignatureKey>,
pub PhantomData<MEMBERSHIP>,
);

impl<TYPES: NodeType, I: NodeImplementation<TYPES>, MEMBERSHIP: Membership<TYPES>>
Expand Down
Loading

0 comments on commit 5cc17f9

Please sign in to comment.