Merge branch '184058031-contract-resource-usage' of github.com:freene…

…t/locutus into 184058031-contract-resource-usage

.gitignore

@@ -19,7 +19,8 @@ target/
 .idea/*
 **/.vscode/*
 
+# Other config files
 config.toml
+.env
 .rustc*
-expanded_code.rs
 

crates/core/src/runtime/contract_store.rs

@@ -215,13 +215,11 @@ impl ContractStore {
 
 #[cfg(test)]
 mod test {
-    use tempfile::TempDir;
-
     use super::*;
 
     #[test]
     fn store_and_load() -> Result<(), Box<dyn std::error::Error>> {
-        let contract_dir = TempDir::new()?;
+        let contract_dir = crate::util::tests_util::get_temp_dir();
         std::fs::create_dir_all(contract_dir.path())?;
         let mut store = ContractStore::new(contract_dir.path().into(), 10_000)?;
         let contract = WrappedContract::new(

crates/core/src/runtime/delegate.rs

@@ -390,7 +390,8 @@ mod test {
     use freenet_stdlib::prelude::*;
     use serde::{Deserialize, Serialize};
     use std::sync::Arc;
-    use tempfile::TempDir;
+
+    use crate::util::tests_util::get_temp_dir;
 
     use super::super::{delegate_store::DelegateStore, ContractStore, SecretsStore};
     use super::*;
@@ -416,9 +417,9 @@ mod test {
 
     fn setup_runtime(
         name: &str,
-    ) -> Result<(DelegateContainer, Runtime, TempDir), Box<dyn std::error::Error>> {
+    ) -> Result<(DelegateContainer, Runtime, tempfile::TempDir), Box<dyn std::error::Error>> {
         // let _ = tracing_subscriber::fmt().with_env_filter("info").try_init();
-        let temp_dir = TempDir::new().expect("Failed to create a temporary directory");
+        let temp_dir = get_temp_dir();
         let contracts_dir = temp_dir.path().join("contracts");
         let delegates_dir = temp_dir.path().join("delegates");
         let secrets_dir = temp_dir.path().join("secrets");
@@ -455,7 +456,7 @@ mod test {
             Arc::new(ContractCode::from(vec![1])),
             Parameters::from(vec![]),
         );
-        let (delegate, mut runtime, _temp_dir) = setup_runtime(TEST_DELEGATE_1)?;
+        let (delegate, mut runtime, temp_dir) = setup_runtime(TEST_DELEGATE_1)?;
         let app = ContractInstanceId::try_from(contract.key.to_string()).unwrap();
 
         // CreateInboxRequest message parts
@@ -489,6 +490,7 @@ mod test {
             outbound.get(0),
             Some(OutboundDelegateMsg::ApplicationMessage(msg)) if *msg.payload == expected_payload
         ));
+        std::mem::drop(temp_dir);
         Ok(())
     }
 }

crates/core/src/runtime/store.rs

@@ -337,9 +337,10 @@ mod tests {
         sync::{Arc, Barrier},
     };
 
+    use crate::util::tests_util::get_temp_dir;
+
     use super::*;
     use dashmap::DashMap;
-    use tempfile::TempDir;
 
     struct TestStore1;
 
@@ -375,7 +376,7 @@ mod tests {
 
     #[test]
     fn test_store() {
-        let temp_dir = TempDir::new().expect("Failed to create a temporary directory");
+        let temp_dir = crate::util::tests_util::get_temp_dir();
         let contract_keys_file_path = temp_dir.path().join("contract_keys");
         let delegate_keys_file_path = temp_dir.path().join("delegate_keys");
 
@@ -453,7 +454,7 @@ mod tests {
     fn test_concurrent_updates() {
         const NUM_THREADS: usize = 4;
 
-        let temp_dir = TempDir::new().expect("Failed to create a temporary directory");
+        let temp_dir = get_temp_dir();
         let contract_keys_file_path = temp_dir.path().join("contract_keys");
         std::fs::File::create(&contract_keys_file_path).expect("Failed to create file");
 
@@ -513,7 +514,7 @@ mod tests {
 
     #[test]
     fn test_concurrent_compaction() {
-        let temp_dir = TempDir::new().expect("Failed to create temp dir");
+        let temp_dir = get_temp_dir();
         let key_file_path = temp_dir.path().join("data.dat");
         std::fs::File::create(&key_file_path).expect("Failed to create file");
 

crates/core/src/runtime/tests/contract.rs

@@ -14,7 +14,7 @@ fn validate_state() -> Result<(), Box<dyn std::error::Error>> {
         delegate_store,
         secrets_store,
         contract_key,
-        temp_dir: _,
+        temp_dir,
     } = super::setup_test_contract(TEST_CONTRACT_1)?;
     let mut runtime = Runtime::build(contract_store, delegate_store, secrets_store, false).unwrap();
 
@@ -33,7 +33,7 @@ fn validate_state() -> Result<(), Box<dyn std::error::Error>> {
         &Default::default(),
     )?;
     assert!(matches!(not_valid, ValidateResult::RequestRelated(_)));
-
+    std::mem::drop(temp_dir);
     Ok(())
 }
 
@@ -44,7 +44,7 @@ fn validate_delta() -> Result<(), Box<dyn std::error::Error>> {
         delegate_store,
         secrets_store,
         contract_key,
-        temp_dir: _,
+        temp_dir,
     } = super::setup_test_contract(TEST_CONTRACT_1)?;
     let mut runtime = Runtime::build(contract_store, delegate_store, secrets_store, false).unwrap();
 
@@ -61,7 +61,7 @@ fn validate_delta() -> Result<(), Box<dyn std::error::Error>> {
         &StateDelta::from([1, 0, 0, 1].as_ref()),
     )?;
     assert!(not_valid);
-
+    std::mem::drop(temp_dir);
     Ok(())
 }
 
@@ -72,7 +72,7 @@ fn update_state() -> Result<(), Box<dyn std::error::Error>> {
         delegate_store,
         secrets_store,
         contract_key,
-        temp_dir: _,
+        temp_dir,
     } = super::setup_test_contract(TEST_CONTRACT_1)?;
     let mut runtime = Runtime::build(contract_store, delegate_store, secrets_store, false).unwrap();
 
@@ -86,6 +86,7 @@ fn update_state() -> Result<(), Box<dyn std::error::Error>> {
         .unwrap_valid();
     assert!(new_state.as_ref().len() == 4);
     assert!(new_state.as_ref()[3] == 4);
+    std::mem::drop(temp_dir);
     Ok(())
 }
 
@@ -96,7 +97,7 @@ fn summarize_state() -> Result<(), Box<dyn std::error::Error>> {
         delegate_store,
         secrets_store,
         contract_key,
-        temp_dir: _,
+        temp_dir,
     } = super::setup_test_contract(TEST_CONTRACT_1)?;
     let mut runtime = Runtime::build(contract_store, delegate_store, secrets_store, false).unwrap();
 
@@ -106,6 +107,7 @@ fn summarize_state() -> Result<(), Box<dyn std::error::Error>> {
         &WrappedState::new(vec![5, 2, 3, 4]),
     )?;
     assert_eq!(summary.as_ref(), &[5, 2, 3]);
+    std::mem::drop(temp_dir);
     Ok(())
 }
 
@@ -116,7 +118,7 @@ fn get_state_delta() -> Result<(), Box<dyn std::error::Error>> {
         delegate_store,
         secrets_store,
         contract_key,
-        temp_dir: _,
+        temp_dir,
     } = super::setup_test_contract(TEST_CONTRACT_1)?;
     let mut runtime = Runtime::build(contract_store, delegate_store, secrets_store, false).unwrap();
 
@@ -128,5 +130,6 @@ fn get_state_delta() -> Result<(), Box<dyn std::error::Error>> {
     )?;
     assert!(delta.as_ref().len() == 1);
     assert!(delta.as_ref()[0] == 4);
+    std::mem::drop(temp_dir);
     Ok(())
 }

crates/core/src/runtime/tests/mod.rs

@@ -7,7 +7,8 @@ use std::{
 use freenet_stdlib::prelude::{
     ContractCode, ContractContainer, ContractKey, ContractWasmAPIVersion, WrappedContract,
 };
-use tempfile::TempDir;
+
+use crate::util::tests_util::get_temp_dir;
 
 use super::{ContractStore, DelegateStore, SecretsStore};
 
@@ -49,7 +50,7 @@ pub(crate) fn get_test_module(name: &str) -> Result<Vec<u8>, Box<dyn std::error:
 
 pub(crate) struct TestSetup {
     #[allow(unused)]
-    temp_dir: TempDir,
+    temp_dir: tempfile::TempDir,
     contract_store: ContractStore,
     delegate_store: DelegateStore,
     secrets_store: SecretsStore,
@@ -58,7 +59,7 @@ pub(crate) struct TestSetup {
 
 pub(crate) fn setup_test_contract(name: &str) -> Result<TestSetup, Box<dyn std::error::Error>> {
     // let _ = tracing_subscriber::fmt().with_env_filter("info").try_init();
-    let temp_dir = TempDir::new().expect("Failed to create a temporary directory");
+    let temp_dir = get_temp_dir();
 
     let mut contract_store = ContractStore::new(temp_dir.path().join("contract"), 10_000)?;
     let delegate_store = DelegateStore::new(temp_dir.path().join("delegate"), 10_000)?;

crates/core/src/runtime/tests/time.rs

@@ -11,7 +11,7 @@ fn now() -> Result<(), Box<dyn std::error::Error>> {
         delegate_store,
         secrets_store,
         contract_key,
-        temp_dir: _,
+        temp_dir,
     } = super::setup_test_contract("test_contract_2")?;
     let mut runtime = Runtime::build(contract_store, delegate_store, secrets_store, false).unwrap();
 
@@ -22,5 +22,6 @@ fn now() -> Result<(), Box<dyn std::error::Error>> {
         .get_function("time_func")?
         .typed(&runtime.wasm_store)?;
     f.call(&mut runtime.wasm_store)?;
+    std::mem::drop(temp_dir);
     Ok(())
 }

crates/core/src/util.rs

@@ -236,3 +236,21 @@ impl<'x> Contains<PeerKey> for &'x [&PeerKey] {
         self.contains(&target)
     }
 }
+
+#[cfg(test)]
+pub mod tests_util {
+    use rand::Rng;
+    use tempfile::TempDir;
+
+    /// Use this to guarantee unique directory names in case you are running multiple tests in parallel.
+    pub fn get_temp_dir() -> TempDir {
+        tempfile::Builder::new()
+            .suffix(
+                &(0..8)
+                    .map(|_| rand::thread_rng().gen::<char>())
+                    .collect::<String>(),
+            )
+            .tempdir()
+            .expect("Failed to create a temporary directory")
+    }
+}