all: Use #[graph::test] instead of #[tokio::test]

That ensures that all tests use the same runtime, and we therefore don't
have issues with closed connections because a second runtime was dropped.

Author: lutter

chain/ethereum/src/chain.rs

@@ -1268,8 +1268,6 @@ impl FirehoseMapperTrait<Chain> for FirehoseMapper {
 
 #[cfg(test)]
 mod tests {
-    use tokio;
-
     use graph::blockchain::mock::MockChainStore;
     use graph::slog;
 
@@ -1288,7 +1286,7 @@ mod tests {
         }
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn test_fetch_unique_blocks_single_block() {
         let logger = Logger::root(slog::Discard, o!());
         let mut chain_store = MockChainStore::default();
@@ -1307,7 +1305,7 @@ mod tests {
         assert!(missing.is_empty());
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn test_fetch_unique_blocks_duplicate_blocks() {
         let logger = Logger::root(slog::Discard, o!());
         let mut chain_store = MockChainStore::default();
@@ -1330,7 +1328,7 @@ mod tests {
         assert_eq!(missing[0], 1);
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn test_fetch_unique_blocks_missing_blocks() {
         let logger = Logger::root(slog::Discard, o!());
         let mut chain_store = MockChainStore::default();
@@ -1349,7 +1347,7 @@ mod tests {
         assert_eq!(missing, vec![2]);
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn test_fetch_unique_blocks_multiple_valid_blocks() {
         let logger = Logger::root(slog::Discard, o!());
         let mut chain_store = MockChainStore::default();
@@ -1371,7 +1369,7 @@ mod tests {
         assert!(missing.is_empty());
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn test_fetch_unique_blocks_mixed_scenario() {
         let logger = Logger::root(slog::Discard, o!());
         let mut chain_store = MockChainStore::default();

chain/ethereum/src/ethereum_adapter.rs

@@ -2674,7 +2674,6 @@ mod tests {
     };
     use graph::blockchain::BlockPtr;
     use graph::prelude::ethabi::ethereum_types::U64;
-    use graph::prelude::tokio::{self};
     use graph::prelude::web3::transports::test::TestTransport;
     use graph::prelude::web3::types::{Address, Block, Bytes, H256};
     use graph::prelude::web3::Web3;
@@ -2722,7 +2721,7 @@ mod tests {
         );
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn test_check_block_receipts_support() {
         let mut transport = TestTransport::default();
 

chain/ethereum/src/network.rs

@@ -309,8 +309,6 @@ impl EthereumNetworkAdapters {
 
 #[cfg(test)]
 mod tests {
-    use tokio;
-
     use graph::cheap_clone::CheapClone;
     use graph::components::network_provider::ProviderCheckStrategy;
     use graph::components::network_provider::ProviderManager;
@@ -385,7 +383,7 @@ mod tests {
         assert_eq!(true, &full_traces >= &full_traces);
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn adapter_selector_selects_eth_call() {
         let metrics = Arc::new(EndpointMetrics::mock());
         let logger = graph::log::logger(true);
@@ -491,7 +489,7 @@ mod tests {
         }
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn adapter_selector_unlimited() {
         let metrics = Arc::new(EndpointMetrics::mock());
         let logger = graph::log::logger(true);
@@ -562,7 +560,7 @@ mod tests {
         assert_eq!(keep.iter().any(|a| !a.is_call_only()), false);
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn adapter_selector_disable_call_only_fallback() {
         let metrics = Arc::new(EndpointMetrics::mock());
         let logger = graph::log::logger(true);
@@ -629,7 +627,7 @@ mod tests {
         );
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn adapter_selector_no_call_only_fallback() {
         let metrics = Arc::new(EndpointMetrics::mock());
         let logger = graph::log::logger(true);
@@ -675,7 +673,7 @@ mod tests {
         );
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn eth_adapter_selection_multiple_adapters() {
         let logger = Logger::root(Discard, o!());
         let unavailable_provider = "unavailable-provider";
@@ -788,7 +786,7 @@ mod tests {
         );
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn eth_adapter_selection_single_adapter() {
         let logger = Logger::root(Discard, o!());
         let unavailable_provider = "unavailable-provider";

chain/near/src/chain.rs

@@ -593,7 +593,7 @@ mod test {
     use graph::{
         blockchain::{block_stream::BlockWithTriggers, DataSource as _, TriggersAdapter as _},
         data::subgraph::LATEST_VERSION,
-        prelude::{tokio, Link},
+        prelude::Link,
         semver::Version,
         slog::{self, o, Logger},
     };
@@ -917,7 +917,7 @@ mod test {
         }
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn test_trigger_filter_empty() {
         let account1: String = "account1".into();
 
@@ -935,7 +935,7 @@ mod test {
         assert_eq!(block_with_triggers.trigger_count(), 0);
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn test_trigger_filter_every_block() {
         let account1: String = "account1".into();
 
@@ -961,7 +961,7 @@ mod test {
         assert_eq!(height, vec![1]);
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn test_trigger_filter_every_receipt() {
         let account1: String = "account1".into();
 

chain/near/src/trigger.rs

@@ -154,8 +154,6 @@ pub struct ReceiptWithOutcome {
 mod tests {
     use std::convert::TryFrom;
 
-    use tokio;
-
     use super::*;
 
     use graph::{
@@ -167,7 +165,7 @@ mod tests {
         util::mem::init_slice,
     };
 
-    #[tokio::test]
+    #[graph::test]
     async fn block_trigger_to_asc_ptr() {
         let mut heap = BytesHeap::new(API_VERSION_0_0_5);
         let trigger = NearTrigger::Block(Arc::new(block()));
@@ -178,7 +176,7 @@ mod tests {
         assert!(result.is_ok());
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn receipt_trigger_to_asc_ptr() {
         let mut heap = BytesHeap::new(API_VERSION_0_0_5);
         let trigger = NearTrigger::Receipt(Arc::new(ReceiptWithOutcome {

chain/substreams/src/data_source.rs

@@ -443,7 +443,7 @@ mod test {
         assert_eq!(ds, expected);
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn data_source_conversion() {
         let ds: UnresolvedDataSource = serde_yaml::from_str(TEMPLATE_DATA_SOURCE).unwrap();
         let link_resolver: Arc<dyn LinkResolver> = Arc::new(NoopLinkResolver {});
@@ -477,7 +477,7 @@ mod test {
         assert_eq!(ds, expected);
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn data_source_conversion_override_params() {
         let mut package = gen_package();
         let mut modules = package.modules.unwrap();

core/src/polling_monitor/ipfs_service.rs

@@ -109,7 +109,6 @@ mod test {
     use graph::ipfs::test_utils::add_files_to_local_ipfs_node_for_testing;
     use graph::ipfs::{IpfsContext, IpfsMetrics, IpfsRpcClient, ServerAddress};
     use graph::log::discard;
-    use tokio;
     use tower::ServiceExt;
     use wiremock::matchers as m;
     use wiremock::Mock;
@@ -118,7 +117,7 @@ mod test {
 
     use super::*;
 
-    #[tokio::test]
+    #[graph::test]
     async fn cat_file_in_folder() {
         let random_bytes = "One morning, when Gregor Samsa woke \
           from troubled dreams, he found himself transformed in his bed \
@@ -155,7 +154,7 @@ mod test {
         assert_eq!(content.to_vec(), random_bytes);
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn arweave_get() {
         const ID: &str = "8APeQ5lW0-csTcBaGdPBDLAL2ci2AT9pTn2tppGPU_8";
 
@@ -169,7 +168,7 @@ mod test {
         assert_eq!(expected, body);
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn no_client_retries_to_allow_polling_monitor_to_handle_retries_internally() {
         const CID: &str = "QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn";
 

core/src/polling_monitor/mod.rs

@@ -281,7 +281,7 @@ mod tests {
         (handle, monitor, rx)
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn polling_monitor_shared_svc() {
         let (svc, mut handle) = mock::pair();
         let shared_svc = tower::buffer::Buffer::new(tower::limit::ConcurrencyLimit::new(svc, 1), 1);
@@ -303,7 +303,7 @@ mod tests {
         assert_eq!(rx1.recv().await, Some(("req-0", "res-0")));
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn polling_monitor_simple() {
         let (mut handle, monitor, mut rx) = setup();
 
@@ -313,7 +313,7 @@ mod tests {
         assert_eq!(rx.recv().await, Some(("req-0", "res-0")));
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn polling_monitor_unordered() {
         let (mut handle, monitor, mut rx) = setup();
 
@@ -330,7 +330,7 @@ mod tests {
         assert_eq!(rx.recv().await, Some(("req-1", "res-1")));
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn polling_monitor_failed_push_to_back() {
         let (mut handle, monitor, mut rx) = setup();
 
@@ -354,7 +354,7 @@ mod tests {
         assert_eq!(rx.recv().await, Some(("req-1", "res-1")));
     }
 
-    #[tokio::test]
+    #[graph::test]
     async fn polling_monitor_cancelation() {
         // Cancelation on receiver drop, no pending request.
         let (mut handle, _monitor, rx) = setup();

graph/src/blockchain/block_stream.rs

@@ -986,7 +986,7 @@ mod test {
         }
     }
 
-    #[tokio::test]
+    #[crate::test]
     async fn consume_stream() {
         let initial_block = 100;
         let buffer_size = 5;

graph/src/components/link_resolver/arweave.rs

@@ -128,7 +128,7 @@ mod test {
     // This test ensures that passing txid/filename works when the txid refers to manifest.
     // the actual data seems to have some binary header and footer so these ranges were found
     // by inspecting the data with hexdump.
-    #[tokio::test]
+    #[crate::test]
     async fn fetch_bundler_url() {
         let url = Base64::from("Rtdn3QWEzM88MPC2dpWyV5waO7Vuz3VwPl_usS2WoHM/DriveManifest.json");
         #[derive(Deserialize, Debug, PartialEq)]