20220616 run in rust (#89)

* Run with stage 2 (the 'chialisp' everyone uses) now invokes rust's launch_tool which emulates run. run -s0 does the same thing as brun, so porting it isn't as important (it just runs clvm) and -s1 runs clvm, but adds a 'bind' primitive that never appeared in mainline chialisp. * Ensure that we pass through --help to the rust code * Streamline change to clvm_tools_rs' run by deprecating stage_1 * Restore formatting * Bump after bug fixes
Chia-Network · Jul 8, 2022 · d7b1479 · d7b1479
1 parent dca2c8e
commit d7b1479
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 80 deletions.
diff --git a/clvm_tools/cmds.py b/clvm_tools/cmds.py
@@ -7,6 +7,7 @@
 import time
 
 from clvm import to_sexp_f, KEYWORD_FROM_ATOM, KEYWORD_TO_ATOM, SExp
+import clvm_tools_rs
 from clvm.EvalError import EvalError
 from clvm.serialize import sexp_from_stream, sexp_to_stream
 from clvm.operators import OP_REWRITE
@@ -97,7 +98,7 @@ def as_bin(streamer_f):
 
 
 def run(args=sys.argv):
-    return launch_tool(args, "run", default_stage=2)
+    sys.stdout.write(bytes(clvm_tools_rs.launch_tool("run", args, 2)).decode('utf8'))
 
 
 def brun(args=sys.argv):

diff --git a/setup.py b/setup.py
@@ -7,6 +7,7 @@
 
 dependencies = [
     "clvm>=0.9.2",
+    "clvm_tools_rs>=0.1.19"
 ]
 
 dev_dependencies = [

diff --git a/stages/stage_1.py b/stages/stage_1.py
diff --git a/tests/stage_1/bind-map.txt b/tests/stage_1/bind-map.txt
diff --git a/tests/stage_1/fact-1.txt b/tests/stage_1/fact-1.txt
diff --git a/tests/stage_1/fact-2.txt b/tests/stage_1/fact-2.txt