From af0a8919c63b560491f60362575dbfd3f7abb6cf Mon Sep 17 00:00:00 2001 From: Milton Date: Wed, 9 Nov 2022 16:31:36 -0300 Subject: [PATCH 1/6] Integration tests for prepare_os_context --- tests/prepare_os_context.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 tests/prepare_os_context.py diff --git a/tests/prepare_os_context.py b/tests/prepare_os_context.py new file mode 100644 index 00000000..a33387a5 --- /dev/null +++ b/tests/prepare_os_context.py @@ -0,0 +1,17 @@ +import cairo_rs_py + +def init_runner(program_name): + return cairo_rs_py.CairoRunner(f"cairo_programs/{program_name}.json", "main", "small", False) + + +def prepare_os_context(runner): + syscall_segment = runner.add_segment() + os_context = [syscall_segment] + os_context.extend(runner.get_builtins_initial_stack()) + return os_context + + +if __name__ == "__main__": + runner = init_runner("get_builtins_initial_stack") + context = prepare_os_context(runner) + assert str(context) == str([(0,0)]) \ No newline at end of file From cca703b16736384677b1580156a63975efd53a42 Mon Sep 17 00:00:00 2001 From: Milton Date: Wed, 9 Nov 2022 16:56:04 -0300 Subject: [PATCH 2/6] Add script to run tests --- Makefile | 3 +-- tests/get_builtins_initial_stack.py | 21 +++++++++++++++++++++ tests/prepare_os_context.py | 3 ++- 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 tests/get_builtins_initial_stack.py diff --git a/Makefile b/Makefile index 8f1a5ab4..1529c2a1 100644 --- a/Makefile +++ b/Makefile @@ -55,8 +55,7 @@ clean: run-python-test: $(COMPILED_TESTS) PYENV_VERSION=pypy3.7-7.3.9 . cairo-rs-py-env/bin/activate && \ maturin develop && \ - python3 hints_tests.py && \ - python3 get_builtins_initial_stack.py && \ + ./run_tests.sh && \ deactivate full-test: test run-python-test diff --git a/tests/get_builtins_initial_stack.py b/tests/get_builtins_initial_stack.py new file mode 100644 index 00000000..af32f1ed --- /dev/null +++ b/tests/get_builtins_initial_stack.py @@ -0,0 +1,21 @@ +import cairo_rs_py + +def new_runner(program_name: str): + return cairo_rs_py.CairoRunner(f"cairo_programs/{program_name}.json", "main", "all", False) + +def test_program(program_name: str): + runner = new_runner(program_name) + + builtins_initial_stack = runner.get_builtins_initial_stack() + assert builtins_initial_stack == [], 'Initial stack should be empty.' + + runner.cairo_run(False) + + builtins_final_stack = runner.get_builtins_initial_stack() + + expected_output = [('range_check', [(2, 0)])] + assert str(builtins_final_stack) == str(expected_output) + +if __name__ == "__main__": + test_program("get_builtins_initial_stack") + print("\nget_builtins_initial_stack test passed.") diff --git a/tests/prepare_os_context.py b/tests/prepare_os_context.py index a33387a5..c857f44d 100644 --- a/tests/prepare_os_context.py +++ b/tests/prepare_os_context.py @@ -14,4 +14,5 @@ def prepare_os_context(runner): if __name__ == "__main__": runner = init_runner("get_builtins_initial_stack") context = prepare_os_context(runner) - assert str(context) == str([(0,0)]) \ No newline at end of file + assert str(context) == str([(0,0)]) + print("prepare_os_context test passed") \ No newline at end of file From 95367ec1aff90c102cae73688b0570bac13cda57 Mon Sep 17 00:00:00 2001 From: Milton Date: Wed, 9 Nov 2022 17:12:36 -0300 Subject: [PATCH 3/6] upload run_test.sh --- run_tests.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 run_tests.sh diff --git a/run_tests.sh b/run_tests.sh new file mode 100755 index 00000000..7a386d0c --- /dev/null +++ b/run_tests.sh @@ -0,0 +1,7 @@ +#!/bin/bash +echo "Running hint tests" +python3 hints_tests.py +python3 tests/get_builtins_initial_stack.py + +echo "Running prepare_os_context integration tests" +python3 tests/prepare_os_context.py \ No newline at end of file From 53051182301c01ca011378743b68fd240ca399c3 Mon Sep 17 00:00:00 2001 From: Milton Date: Thu, 10 Nov 2022 11:49:04 -0300 Subject: [PATCH 4/6] Add two tests to prepare os --- tests/prepare_os_context.py | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/tests/prepare_os_context.py b/tests/prepare_os_context.py index c857f44d..b451efaf 100644 --- a/tests/prepare_os_context.py +++ b/tests/prepare_os_context.py @@ -1,18 +1,34 @@ import cairo_rs_py def init_runner(program_name): - return cairo_rs_py.CairoRunner(f"cairo_programs/{program_name}.json", "main", "small", False) + with open(f"cairo_programs/{program_name}.json") as file: + return cairo_rs_py.CairoRunner(file.read(), "main", "small", False) -def prepare_os_context(runner): +def prepare_os_context_without_builtins(runner): syscall_segment = runner.add_segment() os_context = [syscall_segment] os_context.extend(runner.get_builtins_initial_stack()) return os_context +def prepare_os_context_with_builtins(runner): + syscall_segment = runner.add_segment() + os_context = [syscall_segment] + runner.initialize_function_runner() + os_context.extend(runner.get_builtins_initial_stack()) + return os_context + if __name__ == "__main__": runner = init_runner("get_builtins_initial_stack") - context = prepare_os_context(runner) - assert str(context) == str([(0,0)]) - print("prepare_os_context test passed") \ No newline at end of file + print("initialize no builtin") + expected_output = [(0,0)] + context = prepare_os_context_without_builtins(runner) + assert str(context) == str(expected_output) + + print("initialize builtins") + runner = init_runner("get_builtins_initial_stack") + context = prepare_os_context_with_builtins(runner) + expected_output = [(0, 0), ('output', [(3, 0)]), ('pedersen', [(4, 0)]), ('range_check', [(5, 0)]), ('bitwise', [(6, 0)]), ('ec_op', [(7, 0)])] + assert str(context) == str(expected_output) + print("prepare_os_context tests passed") \ No newline at end of file From d12c8fffcb15a460d5b150eaddb4af6177173aae Mon Sep 17 00:00:00 2001 From: Milton Date: Thu, 10 Nov 2022 12:01:15 -0300 Subject: [PATCH 5/6] Move python tests to tests/ folder --- get_builtins_initial_stack.py | 22 ---------------------- run_tests.sh | 2 +- tests/get_builtins_initial_stack.py | 5 +++-- hints_tests.py => tests/hints_tests.py | 0 4 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 get_builtins_initial_stack.py rename hints_tests.py => tests/hints_tests.py (100%) diff --git a/get_builtins_initial_stack.py b/get_builtins_initial_stack.py deleted file mode 100644 index cc8fda70..00000000 --- a/get_builtins_initial_stack.py +++ /dev/null @@ -1,22 +0,0 @@ -import cairo_rs_py - -def new_runner(program_name: str): - with open(f"cairo_programs/{program_name}.json") as file: - return cairo_rs_py.CairoRunner(file.read(), "main", "all", False) - -def test_program(program_name: str): - runner = new_runner(program_name) - - builtins_initial_stack = runner.get_builtins_initial_stack() - assert builtins_initial_stack == [], 'Initial stack should be empty.' - - runner.cairo_run(False) - - builtins_final_stack = runner.get_builtins_initial_stack() - - expected_output = [('range_check', [(2, 0)])] - assert str(builtins_final_stack) == str(expected_output) - -if __name__ == "__main__": - test_program("get_builtins_initial_stack") - print("\nget_builtins_initial_stack test passed.") diff --git a/run_tests.sh b/run_tests.sh index 7a386d0c..07786867 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -1,6 +1,6 @@ #!/bin/bash echo "Running hint tests" -python3 hints_tests.py +python3 tests/hints_tests.py python3 tests/get_builtins_initial_stack.py echo "Running prepare_os_context integration tests" diff --git a/tests/get_builtins_initial_stack.py b/tests/get_builtins_initial_stack.py index af32f1ed..ad46dc04 100644 --- a/tests/get_builtins_initial_stack.py +++ b/tests/get_builtins_initial_stack.py @@ -1,8 +1,9 @@ import cairo_rs_py def new_runner(program_name: str): - return cairo_rs_py.CairoRunner(f"cairo_programs/{program_name}.json", "main", "all", False) - + with open(f"cairo_programs/{program_name}.json") as file: + return cairo_rs_py.CairoRunner(file.read(), "main", "all", False) + def test_program(program_name: str): runner = new_runner(program_name) diff --git a/hints_tests.py b/tests/hints_tests.py similarity index 100% rename from hints_tests.py rename to tests/hints_tests.py From 63c47efb3c8a2507dfb98a7b03f22f22ccabaf08 Mon Sep 17 00:00:00 2001 From: Milton Date: Thu, 10 Nov 2022 13:33:54 -0300 Subject: [PATCH 6/6] add newlines at end of file, rename script to run_python_tests.sh --- Makefile | 2 +- run_tests.sh => run_python_tests.sh | 2 +- tests/prepare_os_context.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename run_tests.sh => run_python_tests.sh (81%) diff --git a/Makefile b/Makefile index 1529c2a1..0a068943 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ clean: run-python-test: $(COMPILED_TESTS) PYENV_VERSION=pypy3.7-7.3.9 . cairo-rs-py-env/bin/activate && \ maturin develop && \ - ./run_tests.sh && \ + ./run_python_tests.sh && \ deactivate full-test: test run-python-test diff --git a/run_tests.sh b/run_python_tests.sh similarity index 81% rename from run_tests.sh rename to run_python_tests.sh index 07786867..00a79f73 100755 --- a/run_tests.sh +++ b/run_python_tests.sh @@ -4,4 +4,4 @@ python3 tests/hints_tests.py python3 tests/get_builtins_initial_stack.py echo "Running prepare_os_context integration tests" -python3 tests/prepare_os_context.py \ No newline at end of file +python3 tests/prepare_os_context.py diff --git a/tests/prepare_os_context.py b/tests/prepare_os_context.py index b451efaf..a5bb77d0 100644 --- a/tests/prepare_os_context.py +++ b/tests/prepare_os_context.py @@ -31,4 +31,4 @@ def prepare_os_context_with_builtins(runner): context = prepare_os_context_with_builtins(runner) expected_output = [(0, 0), ('output', [(3, 0)]), ('pedersen', [(4, 0)]), ('range_check', [(5, 0)]), ('bitwise', [(6, 0)]), ('ec_op', [(7, 0)])] assert str(context) == str(expected_output) - print("prepare_os_context tests passed") \ No newline at end of file + print("prepare_os_context tests passed")