refactor tests

ProvableHQ · Dec 19, 2023 · 4a7e429 · 4a7e429
1 parent 1111971
commit 4a7e429
Show file tree

Hide file tree

Showing 57 changed files with 81 additions and 34 deletions.
diff --git a/leo/cli/cli.rs b/leo/cli/cli.rs
@@ -146,8 +146,8 @@ mod tests {
     pub fn build_nested_test() {
         use leo_span::symbol::create_session_if_not_set_then;
 
-        let build_dir: PathBuf = PathBuf::from("utils").join("tmp").join("nested");
-        let home_dir: PathBuf = PathBuf::from("utils").join("tmp").join(".aleo");
+        let build_dir: PathBuf = PathBuf::from("utils").join("tests").join("build_nested_test").join("nested");
+        let home_dir: PathBuf = PathBuf::from("utils").join("tests").join("build_nested_test").join(".aleo");
 
         let cli = CLI {
             debug: false,
@@ -167,8 +167,10 @@ mod tests {
     pub fn mixed_local_network_build_test() {
         use leo_span::symbol::create_session_if_not_set_then;
 
-        let build_dir: PathBuf = PathBuf::from("utils").join("tmp").join("local_test");
-        let home_dir: PathBuf = PathBuf::from("utils").join("tmp").join(".aleo");
+        let build_dir: PathBuf =
+            PathBuf::from("utils").join("tests").join("mixed_local_network_build_test").join("local_test");
+        let home_dir: PathBuf =
+            PathBuf::from("utils").join("tests").join("mixed_local_network_build_test").join(".aleo");
 
         let cli = CLI {
             debug: false,
@@ -189,8 +191,8 @@ mod tests {
         use crate::cli::commands::Run;
         use leo_span::symbol::create_session_if_not_set_then;
 
-        let build_dir: PathBuf = PathBuf::from("utils").join("tmp").join("grandparent");
-        let home_dir: PathBuf = PathBuf::from("utils").join("tmp").join(".aleo");
+        let build_dir: PathBuf =
+            PathBuf::from("utils").join("tests").join("double_nested_program_run_test").join("grandparent");
 
         let cli = CLI {
             debug: false,
@@ -206,7 +208,7 @@ mod tests {
                 },
             },
             path: Some(build_dir),
-            home: Some(home_dir),
+            home: None,
         };
 
         create_session_if_not_set_then(|_| {

diff --git a/...stry/testnet3/nested_example_layer_0.aleo → ...stry/testnet3/nested_example_layer_0.aleo b/...stry/testnet3/nested_example_layer_0.aleo → ...stry/testnet3/nested_example_layer_0.aleo
diff --git a/...stry/testnet3/nested_example_layer_1.aleo → ...stry/testnet3/nested_example_layer_1.aleo b/...stry/testnet3/nested_example_layer_1.aleo → ...stry/testnet3/nested_example_layer_1.aleo
diff --git a/...stry/testnet3/nested_example_layer_2.aleo → ...stry/testnet3/nested_example_layer_2.aleo b/...stry/testnet3/nested_example_layer_2.aleo → ...stry/testnet3/nested_example_layer_2.aleo
diff --git a/utils/tmp/grandparent/.gitignore → ...tests/build_nested_test/nested/.gitignore b/utils/tmp/grandparent/.gitignore → ...tests/build_nested_test/nested/.gitignore
diff --git a/utils/tmp/nested/README.md → .../tests/build_nested_test/nested/README.md b/utils/tmp/nested/README.md → .../tests/build_nested_test/nested/README.md
diff --git a/utils/tmp/nested/inputs/nested.in → ...build_nested_test/nested/inputs/nested.in b/utils/tmp/nested/inputs/nested.in → ...build_nested_test/nested/inputs/nested.in
diff --git a/utils/tmp/nested/leo.lock → ...s/tests/build_nested_test/nested/leo.lock b/utils/tmp/nested/leo.lock → ...s/tests/build_nested_test/nested/leo.lock
diff --git a/utils/tmp/nested/program.json → ...sts/build_nested_test/nested/program.json b/utils/tmp/nested/program.json → ...sts/build_nested_test/nested/program.json
diff --git a/utils/tmp/nested/src/main.leo → ...sts/build_nested_test/nested/src/main.leo b/utils/tmp/nested/src/main.leo → ...sts/build_nested_test/nested/src/main.leo
diff --git a/utils/tmp/grandparent/parent/.gitignore → ...d_program_run_test/grandparent/.gitignore b/utils/tmp/grandparent/parent/.gitignore → ...d_program_run_test/grandparent/.gitignore
diff --git a/utils/tmp/grandparent/README.md → ...ed_program_run_test/grandparent/README.md b/utils/tmp/grandparent/README.md → ...ed_program_run_test/grandparent/README.md
diff --git a/.../tmp/grandparent/inputs/import_example.in → ...test/grandparent/inputs/import_example.in b/.../tmp/grandparent/inputs/import_example.in → ...test/grandparent/inputs/import_example.in
diff --git a/utils/tmp/grandparent/leo.lock → ...ted_program_run_test/grandparent/leo.lock b/utils/tmp/grandparent/leo.lock → ...ted_program_run_test/grandparent/leo.lock
diff --git a/...s/tmp/grandparent/parent/child/.gitignore → ...am_run_test/grandparent/parent/.gitignore b/...s/tmp/grandparent/parent/child/.gitignore → ...am_run_test/grandparent/parent/.gitignore
diff --git a/utils/tmp/grandparent/parent/README.md → ...ram_run_test/grandparent/parent/README.md b/utils/tmp/grandparent/parent/README.md → ...ram_run_test/grandparent/parent/README.md
diff --git a/utils/tmp/local_test/.gitignore → ..._test/grandparent/parent/child/.gitignore b/utils/tmp/local_test/.gitignore → ..._test/grandparent/parent/child/.gitignore
diff --git a/utils/tmp/grandparent/parent/child/README.md → ...n_test/grandparent/parent/child/README.md b/utils/tmp/grandparent/parent/child/README.md → ...n_test/grandparent/parent/child/README.md
diff --git a/.../tmp/grandparent/parent/child/inputs/a.in → ...test/grandparent/parent/child/inputs/a.in b/.../tmp/grandparent/parent/child/inputs/a.in → ...test/grandparent/parent/child/inputs/a.in
diff --git a/utils/tmp/grandparent/parent/child/leo.lock → ...un_test/grandparent/parent/child/leo.lock b/utils/tmp/grandparent/parent/child/leo.lock → ...un_test/grandparent/parent/child/leo.lock
diff --git a/...tmp/grandparent/parent/child/program.json → ...est/grandparent/parent/child/program.json b/...tmp/grandparent/parent/child/program.json → ...est/grandparent/parent/child/program.json
diff --git a/...tmp/grandparent/parent/child/src/main.leo → ...est/grandparent/parent/child/src/main.leo b/...tmp/grandparent/parent/child/src/main.leo → ...est/grandparent/parent/child/src/main.leo
diff --git a/utils/tmp/grandparent/parent/inputs/b.in → ...m_run_test/grandparent/parent/inputs/b.in b/utils/tmp/grandparent/parent/inputs/b.in → ...m_run_test/grandparent/parent/inputs/b.in
diff --git a/utils/tmp/grandparent/parent/leo.lock → ...gram_run_test/grandparent/parent/leo.lock b/utils/tmp/grandparent/parent/leo.lock → ...gram_run_test/grandparent/parent/leo.lock
diff --git a/utils/tmp/grandparent/parent/program.json → ..._run_test/grandparent/parent/program.json b/utils/tmp/grandparent/parent/program.json → ..._run_test/grandparent/parent/program.json
diff --git a/utils/tmp/grandparent/parent/src/main.leo → ..._run_test/grandparent/parent/src/main.leo b/utils/tmp/grandparent/parent/src/main.leo → ..._run_test/grandparent/parent/src/main.leo
diff --git a/utils/tmp/grandparent/program.json → ...program_run_test/grandparent/program.json b/utils/tmp/grandparent/program.json → ...program_run_test/grandparent/program.json
diff --git a/utils/tmp/grandparent/src/main.leo → ...program_run_test/grandparent/src/main.leo b/utils/tmp/grandparent/src/main.leo → ...program_run_test/grandparent/src/main.leo
diff --git a/.../tests/mixed_local_network_build_test/.aleo/registry/testnet3/nested_example_layer_0.aleo b/.../tests/mixed_local_network_build_test/.aleo/registry/testnet3/nested_example_layer_0.aleo
@@ -0,0 +1,10 @@
+import nested_example_layer_2.aleo;
+import nested_example_layer_1.aleo;
+
+program nested_example_layer_0.aleo;
+
+function main:
+    input r0 as u32.public;
+    input r1 as u32.private;
+    call nested_example_layer_1.aleo/external_function r0 r1 into r2;
+    output r2 as u32.private;
diff --git a/.../tests/mixed_local_network_build_test/.aleo/registry/testnet3/nested_example_layer_1.aleo b/.../tests/mixed_local_network_build_test/.aleo/registry/testnet3/nested_example_layer_1.aleo
@@ -0,0 +1,9 @@
+import nested_example_layer_2.aleo;
+
+program nested_example_layer_1.aleo;
+
+function external_function:
+    input r0 as u32.public;
+    input r1 as u32.private;
+    call nested_example_layer_2.aleo/external_nested_function r0 r1 into r2;
+    output r2 as u32.private;
diff --git a/.../tests/mixed_local_network_build_test/.aleo/registry/testnet3/nested_example_layer_2.aleo b/.../tests/mixed_local_network_build_test/.aleo/registry/testnet3/nested_example_layer_2.aleo
@@ -0,0 +1,7 @@
+program nested_example_layer_2.aleo;
+
+function external_nested_function:
+    input r0 as u32.public;
+    input r1 as u32.private;
+    add r0 r1 into r2;
+    output r2 as u32.private;
diff --git a/utils/tmp/local_test/local_dep_1/.gitignore → ..._network_build_test/local_test/.gitignore b/utils/tmp/local_test/local_dep_1/.gitignore → ..._network_build_test/local_test/.gitignore
diff --git a/utils/tmp/local_test/README.md → ...l_network_build_test/local_test/README.md b/utils/tmp/local_test/README.md → ...l_network_build_test/local_test/README.md
diff --git a/utils/tmp/local_test/inputs/local_test.in → ...uild_test/local_test/inputs/local_test.in b/utils/tmp/local_test/inputs/local_test.in → ...uild_test/local_test/inputs/local_test.in
diff --git a/utils/tmp/local_test/leo.lock → ...al_network_build_test/local_test/leo.lock b/utils/tmp/local_test/leo.lock → ...al_network_build_test/local_test/leo.lock
diff --git a/utils/tmp/nested/.gitignore → ...ld_test/local_test/local_dep_1/.gitignore b/utils/tmp/nested/.gitignore → ...ld_test/local_test/local_dep_1/.gitignore
diff --git a/utils/tmp/local_test/local_dep_1/README.md → ...ild_test/local_test/local_dep_1/README.md b/utils/tmp/local_test/local_dep_1/README.md → ...ild_test/local_test/local_dep_1/README.md
diff --git a/...al_test/local_dep_1/inputs/local_dep_1.in → ...al_test/local_dep_1/inputs/local_dep_1.in b/...al_test/local_dep_1/inputs/local_dep_1.in → ...al_test/local_dep_1/inputs/local_dep_1.in
diff --git a/utils/tmp/local_test/local_dep_1/leo.lock → ...uild_test/local_test/local_dep_1/leo.lock b/utils/tmp/local_test/local_dep_1/leo.lock → ...uild_test/local_test/local_dep_1/leo.lock
diff --git a/...s/tmp/local_test/local_dep_1/program.json → ..._test/local_test/local_dep_1/program.json b/...s/tmp/local_test/local_dep_1/program.json → ..._test/local_test/local_dep_1/program.json
diff --git a/...s/tmp/local_test/local_dep_1/src/main.leo → ..._test/local_test/local_dep_1/src/main.leo b/...s/tmp/local_test/local_dep_1/src/main.leo → ..._test/local_test/local_dep_1/src/main.leo
diff --git a/utils/tmp/local_test/program.json → ...etwork_build_test/local_test/program.json b/utils/tmp/local_test/program.json → ...etwork_build_test/local_test/program.json
diff --git a/utils/tmp/local_test/src/main.leo → ...etwork_build_test/local_test/src/main.leo b/utils/tmp/local_test/src/main.leo → ...etwork_build_test/local_test/src/main.leo
diff --git a/utils/tmp/simple/.gitignore → ...ocal_network_build_test/nested/.gitignore b/utils/tmp/simple/.gitignore → ...ocal_network_build_test/nested/.gitignore
diff --git a/utils/tmp/simple/README.md → ...local_network_build_test/nested/README.md b/utils/tmp/simple/README.md → ...local_network_build_test/nested/README.md
@@ -1,4 +1,4 @@
-# simple.aleo
+# nested.aleo
 
 ## Build Guide
 

diff --git a/utils/tests/mixed_local_network_build_test/nested/inputs/nested.in b/utils/tests/mixed_local_network_build_test/nested/inputs/nested.in
@@ -0,0 +1,4 @@
+// The program input for nested/src/main.leo
+[main]
+public a: u32 = 1u32;
+b: u32 = 2u32;
diff --git a/utils/tests/mixed_local_network_build_test/nested/leo.lock b/utils/tests/mixed_local_network_build_test/nested/leo.lock
@@ -0,0 +1,20 @@
+[[package]]
+name = "nested_example_layer_2"
+network = "testnet3"
+location = "network"
+checksum = "b987b8490b214ad9120a47b218a1c1387c7c2763aaf2aa9c81002a4c7020b3e4"
+dependencies = []
+
+[[package]]
+name = "nested_example_layer_1"
+network = "testnet3"
+location = "network"
+checksum = "17701f7369fe6bad74cdfb956bd9d85c6753ffedbf43be9fe5a4bfdc1751617b"
+dependencies = ["nested_example_layer_2.aleo"]
+
+[[package]]
+name = "nested_example_layer_0"
+network = "testnet3"
+location = "network"
+checksum = "23414151de5687d5daa447533109ee810b7e763c4d0659e2f53562123e639b2c"
+dependencies = ["nested_example_layer_2.aleo", "nested_example_layer_1.aleo"]
diff --git a/utils/tests/mixed_local_network_build_test/nested/program.json b/utils/tests/mixed_local_network_build_test/nested/program.json
@@ -0,0 +1,13 @@
+{
+    "program": "nested.aleo",
+    "version": "0.0.0",
+    "description": "",
+    "license": "MIT",
+    "dependencies": [
+        {
+            "name": "nested_example_layer_0.aleo",
+            "location": "network",
+            "network": "testnet3"
+        }
+    ]
+}
diff --git a/utils/tests/mixed_local_network_build_test/nested/src/main.leo b/utils/tests/mixed_local_network_build_test/nested/src/main.leo
@@ -0,0 +1,8 @@
+// The 'nested' program.
+import nested_example_layer_0.aleo;
+program nested.aleo {
+    transition example(public a: u32, b: u32) -> u32 {
+        let c: u32 = nested_example_layer_0.aleo/main(a, b);
+        return c;
+    }
+}
diff --git a/utils/tmp/.env b/utils/tmp/.env
diff --git a/utils/tmp/grandparent/.env b/utils/tmp/grandparent/.env
diff --git a/utils/tmp/local_test/.env b/utils/tmp/local_test/.env
diff --git a/utils/tmp/simple/.env b/utils/tmp/simple/.env
diff --git a/utils/tmp/simple/inputs/simple.in b/utils/tmp/simple/inputs/simple.in
diff --git a/utils/tmp/simple/leo.lock b/utils/tmp/simple/leo.lock
diff --git a/utils/tmp/simple/program.json b/utils/tmp/simple/program.json
diff --git a/utils/tmp/simple/src/main.leo b/utils/tmp/simple/src/main.leo