From 3932661a93bb79b1ecaf0f78a11bfbc26bfafec4 Mon Sep 17 00:00:00 2001
From: teor <teor@riseup.net>
Date: Tue, 15 Jun 2021 23:01:56 +1000
Subject: [PATCH] Qualify std::sync::Mutex in the unit tests (#2304)

Also add a missing zebra_test::init().
---
 zebra-network/src/peer_set/candidate_set/tests/prop.rs |  6 +++---
 .../src/peer_set/candidate_set/tests/vectors.rs        | 10 +++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/zebra-network/src/peer_set/candidate_set/tests/prop.rs b/zebra-network/src/peer_set/candidate_set/tests/prop.rs
index 20592d359..1763c738c 100644
--- a/zebra-network/src/peer_set/candidate_set/tests/prop.rs
+++ b/zebra-network/src/peer_set/candidate_set/tests/prop.rs
@@ -1,6 +1,6 @@
 use std::{
     env,
-    sync::{Arc, Mutex},
+    sync::Arc,
     time::{Duration, Instant},
 };
 
@@ -69,7 +69,7 @@ proptest! {
         // Since the address book is empty, there won't be any available peers
         let address_book = AddressBook::new(&Config::default(), Span::none());
 
-        let mut candidate_set = CandidateSet::new(Arc::new(Mutex::new(address_book)), peer_service);
+        let mut candidate_set = CandidateSet::new(Arc::new(std::sync::Mutex::new(address_book)), peer_service);
 
         // Make sure that the rate-limit is never triggered, even after multiple calls
         for _ in 0..next_peer_attempts {
@@ -106,7 +106,7 @@ proptest! {
         let mut address_book = AddressBook::new(&Config::default(), Span::none());
         address_book.extend(peers);
 
-        let mut candidate_set = CandidateSet::new(Arc::new(Mutex::new(address_book)), peer_service);
+        let mut candidate_set = CandidateSet::new(Arc::new(std::sync::Mutex::new(address_book)), peer_service);
 
         let checks = async move {
             // Check rate limiting for initial peers
diff --git a/zebra-network/src/peer_set/candidate_set/tests/vectors.rs b/zebra-network/src/peer_set/candidate_set/tests/vectors.rs
index 45eb7db26..737266a9e 100644
--- a/zebra-network/src/peer_set/candidate_set/tests/vectors.rs
+++ b/zebra-network/src/peer_set/candidate_set/tests/vectors.rs
@@ -3,7 +3,7 @@ use std::{
     convert::TryInto,
     iter,
     net::{IpAddr, SocketAddr},
-    sync::{Arc, Mutex},
+    sync::Arc,
     time::Duration as StdDuration,
 };
 
@@ -139,12 +139,15 @@ fn candidate_set_updates_are_rate_limited() {
     // How many times should `update` be called in each rate limit interval
     const POLL_FREQUENCY_FACTOR: u32 = 3;
 
+    zebra_test::init();
+
     let runtime = Runtime::new().expect("Failed to create Tokio runtime");
     let _guard = runtime.enter();
 
     let address_book = AddressBook::new(&Config::default(), Span::none());
     let (peer_service, call_count) = mock_peer_service();
-    let mut candidate_set = CandidateSet::new(Arc::new(Mutex::new(address_book)), peer_service);
+    let mut candidate_set =
+        CandidateSet::new(Arc::new(std::sync::Mutex::new(address_book)), peer_service);
 
     runtime.block_on(async move {
         time::pause();
@@ -178,7 +181,8 @@ fn candidate_set_update_after_update_initial_is_rate_limited() {
 
     let address_book = AddressBook::new(&Config::default(), Span::none());
     let (peer_service, call_count) = mock_peer_service();
-    let mut candidate_set = CandidateSet::new(Arc::new(Mutex::new(address_book)), peer_service);
+    let mut candidate_set =
+        CandidateSet::new(Arc::new(std::sync::Mutex::new(address_book)), peer_service);
 
     runtime.block_on(async move {
         time::pause();