runtime: fix test

Author: leoyvens

runtime/wasm/src/host.rs

@@ -28,10 +28,8 @@ use web3::types::{Log, Transaction};
 use crate::host_exports::HostExports;
 use crate::mapping::{MappingContext, MappingRequest, MappingTrigger};
 
-pub(crate) const TIMEOUT_ENV_VAR: &str = "GRAPH_MAPPING_HANDLER_TIMEOUT";
-
 lazy_static! {
-    pub static ref TIMEOUT: Option<Duration> = std::env::var(TIMEOUT_ENV_VAR)
+    static ref TIMEOUT: Option<Duration> = std::env::var("GRAPH_MAPPING_HANDLER_TIMEOUT")
         .ok()
         .map(|s| u64::from_str(&s).expect("Invalid value for GRAPH_MAPPING_HANDLER_TIMEOUT"))
         .map(Duration::from_secs);

runtime/wasm/src/module/test.rs

@@ -27,6 +27,17 @@ fn test_valid_module_and_store(
 ) -> (
     WasmInstance,
     Arc<impl Store + SubgraphDeploymentStore + EthereumCallCache>,
+) {
+    test_valid_module_and_store_with_timeout(subgraph_id, data_source, None)
+}
+
+fn test_valid_module_and_store_with_timeout(
+    subgraph_id: &str,
+    data_source: DataSource,
+    timeout: Option<Duration>,
+) -> (
+    WasmInstance,
+    Arc<impl Store + SubgraphDeploymentStore + EthereumCallCache>,
 ) {
     let store = STORE.clone();
     let metrics_registry = Arc::new(MockMetricsRegistry::new());
@@ -59,7 +70,7 @@ fn test_valid_module_and_store(
         Arc::new(ValidModule::new(data_source.mapping.runtime.as_ref()).unwrap()),
         mock_context(deployment_id, data_source, store.clone()),
         host_metrics,
-        *crate::host::TIMEOUT,
+        timeout,
         true,
     )
     .unwrap();

runtime/wasm/src/module/test/abi.rs

@@ -1,14 +1,14 @@
 use super::*;
-use std::env;
 
 #[tokio::test(threaded_scheduler)]
 async fn unbounded_loop() {
     // Set handler timeout to 3 seconds.
-    env::set_var(crate::host::TIMEOUT_ENV_VAR, "3");
-    let module = test_module(
+    let module = test_valid_module_and_store_with_timeout(
         "unboundedLoop",
         mock_data_source("wasm_test/non_terminating.wasm"),
-    );
+        Some(Duration::from_secs(3)),
+    )
+    .0;
     let func = module.get_func("loop").get0().unwrap();
     let res: Result<(), _> = func();
     assert!(res.unwrap_err().to_string().contains(TRAP_TIMEOUT));