From 92b2123ff70b59e3a9b086b8dfca8e911ed99f62 Mon Sep 17 00:00:00 2001 From: Pranav Gaddamadugu <23022326+d0cd@users.noreply.github.com> Date: Mon, 15 Jan 2024 15:37:06 -0800 Subject: [PATCH] More cleanup --- utils/tests/build_nested_test/nested/README.md | 13 ------------- .../build_nested_test/nested/inputs/nested.in | 4 ---- .../grandparent/README.md | 13 ------------- .../grandparent/inputs/import_example.in | 4 ---- .../grandparent/parent/README.md | 13 ------------- .../grandparent/parent/child/README.md | 13 ------------- .../grandparent/parent/child/inputs/a.in | 4 ---- .../grandparent/parent/inputs/b.in | 4 ---- .../local_test/README.md | 13 ------------- .../local_test/build/imports/local_dep_1.aleo | 9 +++++++++ .../local_test/build/imports/nested.aleo | 12 ++++++++++++ .../build/imports/nested_example_layer_0.aleo | 10 ++++++++++ .../build/imports/nested_example_layer_1.aleo | 9 +++++++++ .../build/imports/nested_example_layer_2.aleo | 7 +++++++ .../local_test/build/main.aleo | 9 +++++++++ .../local_test/build/program.json | 18 ++++++++++++++++++ .../local_test/inputs/local_test.in | 4 ---- .../local_test/local_dep_1/README.md | 13 ------------- .../local_dep_1/build/imports/nested.aleo | 12 ++++++++++++ .../build/imports/nested_example_layer_0.aleo | 10 ++++++++++ .../build/imports/nested_example_layer_1.aleo | 9 +++++++++ .../build/imports/nested_example_layer_2.aleo | 7 +++++++ .../local_test/local_dep_1/build/main.aleo | 9 +++++++++ .../local_dep_1/inputs/local_dep_1.in | 4 ---- .../nested/README.md | 13 ------------- .../build/imports/nested_example_layer_0.aleo | 10 ++++++++++ .../build/imports/nested_example_layer_1.aleo | 9 +++++++++ .../build/imports/nested_example_layer_2.aleo | 7 +++++++ .../nested/build/main.aleo | 12 ++++++++++++ .../nested/inputs/nested.in | 4 ---- 30 files changed, 159 insertions(+), 119 deletions(-) delete mode 100644 utils/tests/build_nested_test/nested/README.md delete mode 100644 utils/tests/build_nested_test/nested/inputs/nested.in delete mode 100644 utils/tests/double_nested_program_run_test/grandparent/README.md delete mode 100644 utils/tests/double_nested_program_run_test/grandparent/inputs/import_example.in delete mode 100644 utils/tests/double_nested_program_run_test/grandparent/parent/README.md delete mode 100644 utils/tests/double_nested_program_run_test/grandparent/parent/child/README.md delete mode 100644 utils/tests/double_nested_program_run_test/grandparent/parent/child/inputs/a.in delete mode 100644 utils/tests/double_nested_program_run_test/grandparent/parent/inputs/b.in delete mode 100644 utils/tests/mixed_local_network_build_test/local_test/README.md create mode 100644 utils/tests/mixed_local_network_build_test/local_test/build/imports/local_dep_1.aleo create mode 100644 utils/tests/mixed_local_network_build_test/local_test/build/imports/nested.aleo create mode 100644 utils/tests/mixed_local_network_build_test/local_test/build/imports/nested_example_layer_0.aleo create mode 100644 utils/tests/mixed_local_network_build_test/local_test/build/imports/nested_example_layer_1.aleo create mode 100644 utils/tests/mixed_local_network_build_test/local_test/build/imports/nested_example_layer_2.aleo create mode 100644 utils/tests/mixed_local_network_build_test/local_test/build/main.aleo create mode 100644 utils/tests/mixed_local_network_build_test/local_test/build/program.json delete mode 100644 utils/tests/mixed_local_network_build_test/local_test/inputs/local_test.in delete mode 100644 utils/tests/mixed_local_network_build_test/local_test/local_dep_1/README.md create mode 100644 utils/tests/mixed_local_network_build_test/local_test/local_dep_1/build/imports/nested.aleo create mode 100644 utils/tests/mixed_local_network_build_test/local_test/local_dep_1/build/imports/nested_example_layer_0.aleo create mode 100644 utils/tests/mixed_local_network_build_test/local_test/local_dep_1/build/imports/nested_example_layer_1.aleo create mode 100644 utils/tests/mixed_local_network_build_test/local_test/local_dep_1/build/imports/nested_example_layer_2.aleo create mode 100644 utils/tests/mixed_local_network_build_test/local_test/local_dep_1/build/main.aleo delete mode 100644 utils/tests/mixed_local_network_build_test/local_test/local_dep_1/inputs/local_dep_1.in delete mode 100644 utils/tests/mixed_local_network_build_test/nested/README.md create mode 100644 utils/tests/mixed_local_network_build_test/nested/build/imports/nested_example_layer_0.aleo create mode 100644 utils/tests/mixed_local_network_build_test/nested/build/imports/nested_example_layer_1.aleo create mode 100644 utils/tests/mixed_local_network_build_test/nested/build/imports/nested_example_layer_2.aleo create mode 100644 utils/tests/mixed_local_network_build_test/nested/build/main.aleo delete mode 100644 utils/tests/mixed_local_network_build_test/nested/inputs/nested.in diff --git a/utils/tests/build_nested_test/nested/README.md b/utils/tests/build_nested_test/nested/README.md deleted file mode 100644 index 8bf41e3b4e..0000000000 --- a/utils/tests/build_nested_test/nested/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# nested.aleo - -## Build Guide - -To compile this Aleo program, run: -```bash -snarkvm build -``` - -To execute this Aleo program, run: -```bash -snarkvm run hello -``` diff --git a/utils/tests/build_nested_test/nested/inputs/nested.in b/utils/tests/build_nested_test/nested/inputs/nested.in deleted file mode 100644 index 4585af6c29..0000000000 --- a/utils/tests/build_nested_test/nested/inputs/nested.in +++ /dev/null @@ -1,4 +0,0 @@ -// The program input for nested/src/main.leo -[main] -public a: u32 = 1u32; -b: u32 = 2u32; diff --git a/utils/tests/double_nested_program_run_test/grandparent/README.md b/utils/tests/double_nested_program_run_test/grandparent/README.md deleted file mode 100644 index 66ab9d73cc..0000000000 --- a/utils/tests/double_nested_program_run_test/grandparent/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# import_example.aleo - -## Build Guide - -To compile this Aleo program, run: -```bash -snarkvm build -``` - -To execute this Aleo program, run: -```bash -snarkvm run hello -``` diff --git a/utils/tests/double_nested_program_run_test/grandparent/inputs/import_example.in b/utils/tests/double_nested_program_run_test/grandparent/inputs/import_example.in deleted file mode 100644 index 410e26eb54..0000000000 --- a/utils/tests/double_nested_program_run_test/grandparent/inputs/import_example.in +++ /dev/null @@ -1,4 +0,0 @@ -// The program input for import_example/src/main.leo -[main] -public a: u32 = 1u32; -b: u32 = 2u32; diff --git a/utils/tests/double_nested_program_run_test/grandparent/parent/README.md b/utils/tests/double_nested_program_run_test/grandparent/parent/README.md deleted file mode 100644 index 2972a57632..0000000000 --- a/utils/tests/double_nested_program_run_test/grandparent/parent/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# b.aleo - -## Build Guide - -To compile this Aleo program, run: -```bash -snarkvm build -``` - -To execute this Aleo program, run: -```bash -snarkvm run hello -``` diff --git a/utils/tests/double_nested_program_run_test/grandparent/parent/child/README.md b/utils/tests/double_nested_program_run_test/grandparent/parent/child/README.md deleted file mode 100644 index 1d165faf5d..0000000000 --- a/utils/tests/double_nested_program_run_test/grandparent/parent/child/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# a.aleo - -## Build Guide - -To compile this Aleo program, run: -```bash -snarkvm build -``` - -To execute this Aleo program, run: -```bash -snarkvm run hello -``` diff --git a/utils/tests/double_nested_program_run_test/grandparent/parent/child/inputs/a.in b/utils/tests/double_nested_program_run_test/grandparent/parent/child/inputs/a.in deleted file mode 100644 index edc7be126e..0000000000 --- a/utils/tests/double_nested_program_run_test/grandparent/parent/child/inputs/a.in +++ /dev/null @@ -1,4 +0,0 @@ -// The program input for a/src/main.leo -[main] -public a: u32 = 1u32; -b: u32 = 2u32; diff --git a/utils/tests/double_nested_program_run_test/grandparent/parent/inputs/b.in b/utils/tests/double_nested_program_run_test/grandparent/parent/inputs/b.in deleted file mode 100644 index 64b61b9994..0000000000 --- a/utils/tests/double_nested_program_run_test/grandparent/parent/inputs/b.in +++ /dev/null @@ -1,4 +0,0 @@ -// The program input for b/src/main.leo -[main] -public a: u32 = 1u32; -b: u32 = 2u32; diff --git a/utils/tests/mixed_local_network_build_test/local_test/README.md b/utils/tests/mixed_local_network_build_test/local_test/README.md deleted file mode 100644 index 7048fbab75..0000000000 --- a/utils/tests/mixed_local_network_build_test/local_test/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# local_test.aleo - -## Build Guide - -To compile this Aleo program, run: -```bash -snarkvm build -``` - -To execute this Aleo program, run: -```bash -snarkvm run hello -``` diff --git a/utils/tests/mixed_local_network_build_test/local_test/build/imports/local_dep_1.aleo b/utils/tests/mixed_local_network_build_test/local_test/build/imports/local_dep_1.aleo new file mode 100644 index 0000000000..fbf2116373 --- /dev/null +++ b/utils/tests/mixed_local_network_build_test/local_test/build/imports/local_dep_1.aleo @@ -0,0 +1,9 @@ +program local_dep_1.aleo; + + + +function main: + input r0 as u32.public; + input r1 as u32.private; + add r0 r1 into r2; + output r2 as u32.private; diff --git a/utils/tests/mixed_local_network_build_test/local_test/build/imports/nested.aleo b/utils/tests/mixed_local_network_build_test/local_test/build/imports/nested.aleo new file mode 100644 index 0000000000..e2e063b232 --- /dev/null +++ b/utils/tests/mixed_local_network_build_test/local_test/build/imports/nested.aleo @@ -0,0 +1,12 @@ +import nested_example_layer_2.aleo; +import nested_example_layer_1.aleo; +import nested_example_layer_0.aleo; +program nested.aleo; + + + +function example: + input r0 as u32.public; + input r1 as u32.private; + call nested_example_layer_0.aleo/main r0 r1 into r2; + output r2 as u32.private; diff --git a/utils/tests/mixed_local_network_build_test/local_test/build/imports/nested_example_layer_0.aleo b/utils/tests/mixed_local_network_build_test/local_test/build/imports/nested_example_layer_0.aleo new file mode 100644 index 0000000000..c1532ce30a --- /dev/null +++ b/utils/tests/mixed_local_network_build_test/local_test/build/imports/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/utils/tests/mixed_local_network_build_test/local_test/build/imports/nested_example_layer_1.aleo b/utils/tests/mixed_local_network_build_test/local_test/build/imports/nested_example_layer_1.aleo new file mode 100644 index 0000000000..4efaf63929 --- /dev/null +++ b/utils/tests/mixed_local_network_build_test/local_test/build/imports/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/utils/tests/mixed_local_network_build_test/local_test/build/imports/nested_example_layer_2.aleo b/utils/tests/mixed_local_network_build_test/local_test/build/imports/nested_example_layer_2.aleo new file mode 100644 index 0000000000..459b896b67 --- /dev/null +++ b/utils/tests/mixed_local_network_build_test/local_test/build/imports/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/tests/mixed_local_network_build_test/local_test/build/main.aleo b/utils/tests/mixed_local_network_build_test/local_test/build/main.aleo new file mode 100644 index 0000000000..50e47d72fd --- /dev/null +++ b/utils/tests/mixed_local_network_build_test/local_test/build/main.aleo @@ -0,0 +1,9 @@ +program local_test.aleo; + + + +function main: + input r0 as u32.public; + input r1 as u32.private; + add r0 r1 into r2; + output r2 as u32.private; diff --git a/utils/tests/mixed_local_network_build_test/local_test/build/program.json b/utils/tests/mixed_local_network_build_test/local_test/build/program.json new file mode 100644 index 0000000000..aaca657237 --- /dev/null +++ b/utils/tests/mixed_local_network_build_test/local_test/build/program.json @@ -0,0 +1,18 @@ +{ + "program": "local_test.aleo", + "version": "0.0.0", + "description": "", + "license": "MIT", + "dependencies" : [ + { + "name": "local_dep_1.aleo", + "location": "local", + "path": "local_dep_1" + }, + { + "name": "nested.aleo", + "location": "local", + "path": "../nested" + } + ] +} diff --git a/utils/tests/mixed_local_network_build_test/local_test/inputs/local_test.in b/utils/tests/mixed_local_network_build_test/local_test/inputs/local_test.in deleted file mode 100644 index 8b6c059614..0000000000 --- a/utils/tests/mixed_local_network_build_test/local_test/inputs/local_test.in +++ /dev/null @@ -1,4 +0,0 @@ -// The program input for local_test/src/main.leo -[main] -public a: u32 = 1u32; -b: u32 = 2u32; diff --git a/utils/tests/mixed_local_network_build_test/local_test/local_dep_1/README.md b/utils/tests/mixed_local_network_build_test/local_test/local_dep_1/README.md deleted file mode 100644 index 083946fd1b..0000000000 --- a/utils/tests/mixed_local_network_build_test/local_test/local_dep_1/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# local_dep_1.aleo - -## Build Guide - -To compile this Aleo program, run: -```bash -snarkvm build -``` - -To execute this Aleo program, run: -```bash -snarkvm run hello -``` diff --git a/utils/tests/mixed_local_network_build_test/local_test/local_dep_1/build/imports/nested.aleo b/utils/tests/mixed_local_network_build_test/local_test/local_dep_1/build/imports/nested.aleo new file mode 100644 index 0000000000..e2e063b232 --- /dev/null +++ b/utils/tests/mixed_local_network_build_test/local_test/local_dep_1/build/imports/nested.aleo @@ -0,0 +1,12 @@ +import nested_example_layer_2.aleo; +import nested_example_layer_1.aleo; +import nested_example_layer_0.aleo; +program nested.aleo; + + + +function example: + input r0 as u32.public; + input r1 as u32.private; + call nested_example_layer_0.aleo/main r0 r1 into r2; + output r2 as u32.private; diff --git a/utils/tests/mixed_local_network_build_test/local_test/local_dep_1/build/imports/nested_example_layer_0.aleo b/utils/tests/mixed_local_network_build_test/local_test/local_dep_1/build/imports/nested_example_layer_0.aleo new file mode 100644 index 0000000000..c1532ce30a --- /dev/null +++ b/utils/tests/mixed_local_network_build_test/local_test/local_dep_1/build/imports/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/utils/tests/mixed_local_network_build_test/local_test/local_dep_1/build/imports/nested_example_layer_1.aleo b/utils/tests/mixed_local_network_build_test/local_test/local_dep_1/build/imports/nested_example_layer_1.aleo new file mode 100644 index 0000000000..4efaf63929 --- /dev/null +++ b/utils/tests/mixed_local_network_build_test/local_test/local_dep_1/build/imports/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/utils/tests/mixed_local_network_build_test/local_test/local_dep_1/build/imports/nested_example_layer_2.aleo b/utils/tests/mixed_local_network_build_test/local_test/local_dep_1/build/imports/nested_example_layer_2.aleo new file mode 100644 index 0000000000..459b896b67 --- /dev/null +++ b/utils/tests/mixed_local_network_build_test/local_test/local_dep_1/build/imports/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/tests/mixed_local_network_build_test/local_test/local_dep_1/build/main.aleo b/utils/tests/mixed_local_network_build_test/local_test/local_dep_1/build/main.aleo new file mode 100644 index 0000000000..fbf2116373 --- /dev/null +++ b/utils/tests/mixed_local_network_build_test/local_test/local_dep_1/build/main.aleo @@ -0,0 +1,9 @@ +program local_dep_1.aleo; + + + +function main: + input r0 as u32.public; + input r1 as u32.private; + add r0 r1 into r2; + output r2 as u32.private; diff --git a/utils/tests/mixed_local_network_build_test/local_test/local_dep_1/inputs/local_dep_1.in b/utils/tests/mixed_local_network_build_test/local_test/local_dep_1/inputs/local_dep_1.in deleted file mode 100644 index cfb45dc95d..0000000000 --- a/utils/tests/mixed_local_network_build_test/local_test/local_dep_1/inputs/local_dep_1.in +++ /dev/null @@ -1,4 +0,0 @@ -// The program input for local_dep_1/src/main.leo -[main] -public a: u32 = 1u32; -b: u32 = 2u32; diff --git a/utils/tests/mixed_local_network_build_test/nested/README.md b/utils/tests/mixed_local_network_build_test/nested/README.md deleted file mode 100644 index 8bf41e3b4e..0000000000 --- a/utils/tests/mixed_local_network_build_test/nested/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# nested.aleo - -## Build Guide - -To compile this Aleo program, run: -```bash -snarkvm build -``` - -To execute this Aleo program, run: -```bash -snarkvm run hello -``` diff --git a/utils/tests/mixed_local_network_build_test/nested/build/imports/nested_example_layer_0.aleo b/utils/tests/mixed_local_network_build_test/nested/build/imports/nested_example_layer_0.aleo new file mode 100644 index 0000000000..c1532ce30a --- /dev/null +++ b/utils/tests/mixed_local_network_build_test/nested/build/imports/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/utils/tests/mixed_local_network_build_test/nested/build/imports/nested_example_layer_1.aleo b/utils/tests/mixed_local_network_build_test/nested/build/imports/nested_example_layer_1.aleo new file mode 100644 index 0000000000..4efaf63929 --- /dev/null +++ b/utils/tests/mixed_local_network_build_test/nested/build/imports/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/utils/tests/mixed_local_network_build_test/nested/build/imports/nested_example_layer_2.aleo b/utils/tests/mixed_local_network_build_test/nested/build/imports/nested_example_layer_2.aleo new file mode 100644 index 0000000000..459b896b67 --- /dev/null +++ b/utils/tests/mixed_local_network_build_test/nested/build/imports/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/tests/mixed_local_network_build_test/nested/build/main.aleo b/utils/tests/mixed_local_network_build_test/nested/build/main.aleo new file mode 100644 index 0000000000..e2e063b232 --- /dev/null +++ b/utils/tests/mixed_local_network_build_test/nested/build/main.aleo @@ -0,0 +1,12 @@ +import nested_example_layer_2.aleo; +import nested_example_layer_1.aleo; +import nested_example_layer_0.aleo; +program nested.aleo; + + + +function example: + input r0 as u32.public; + input r1 as u32.private; + call nested_example_layer_0.aleo/main r0 r1 into r2; + output r2 as u32.private; 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 deleted file mode 100644 index 4585af6c29..0000000000 --- a/utils/tests/mixed_local_network_build_test/nested/inputs/nested.in +++ /dev/null @@ -1,4 +0,0 @@ -// The program input for nested/src/main.leo -[main] -public a: u32 = 1u32; -b: u32 = 2u32;