Skip to content

Commit

Permalink
fix: more fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Frando committed Oct 2, 2023
1 parent 8b96769 commit 45c227f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
5 changes: 4 additions & 1 deletion iroh-gossip/src/net.rs
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,10 @@ mod test {
use std::time::Duration;

use iroh_net::PeerAddr;
use iroh_net::{derp::{DerpMap, DerpMode}, MagicEndpoint};
use iroh_net::{
derp::{DerpMap, DerpMode},
MagicEndpoint,
};
use tokio::spawn;
use tokio::time::timeout;
use tokio_util::sync::CancellationToken;
Expand Down
2 changes: 1 addition & 1 deletion iroh-net/src/magicsock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2648,7 +2648,7 @@ pub(crate) mod tests {
use tracing_subscriber::{prelude::*, EnvFilter};

use super::*;
use crate::{test_utils::run_derper, tls, MagicEndpoint, derp::DerpMode};
use crate::{derp::DerpMode, test_utils::run_derper, tls, MagicEndpoint};

fn make_transmit(destination: SocketAddr) -> quinn_udp::Transmit {
quinn_udp::Transmit {
Expand Down
2 changes: 0 additions & 2 deletions iroh/tests/provide.rs
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,6 @@ async fn test_custom_collection_parser() {
let doc_store = iroh_sync::store::memory::Store::default();
let node = Node::builder(db, doc_store)
.collection_parser(CollectionsAreJustLinks)
.enable_derp(iroh_net::defaults::default_derp_map())
.bind_addr(addr)
.runtime(&rt)
.spawn()
Expand Down Expand Up @@ -1056,7 +1055,6 @@ async fn test_token_passthrough() -> Result<()> {
tokio::time::timeout(Duration::from_secs(30), async move {
let endpoint = MagicEndpoint::builder()
.secret_key(SecretKey::generate())
.enable_derp(iroh_net::defaults::default_derp_map())
.keylog(true)
.bind(0)
.await?;
Expand Down

0 comments on commit 45c227f

Please sign in to comment.