drop dependency on clvm_tools

.github/workflows/benchmark.yml

@@ -51,8 +51,6 @@ jobs:
         python -m venv venv
         . .\venv\Scripts\Activate.ps1
         ln -s venv\Scripts\Activate.ps1 activate
-        git clone https://github.com/Chia-Network/clvm_tools.git --branch=main --single-branch
-        python -m pip install ./clvm_tools
         python -m pip install colorama
         maturin develop -m wheel/Cargo.toml --release
 
@@ -70,8 +68,6 @@ jobs:
         python -m venv venv
         ln -s venv/bin/activate
         . ./activate
-        git clone https://github.com/Chia-Network/clvm_tools.git --branch=main --single-branch
-        python -m pip install ./clvm_tools
         python -m pip install colorama
         maturin develop -m wheel/Cargo.toml --release --features=openssl
 
@@ -116,8 +112,6 @@ jobs:
         python -m venv venv
         ln -s venv/bin/activate
         . ./activate
-        git clone https://github.com/Chia-Network/clvm_tools.git --branch=main --single-branch
-        python -m pip install ./clvm_tools
         python -m pip install colorama
         maturin develop -m wheel/Cargo.toml --release --features=openssl
 

.github/workflows/build-m1-wheel.yml

@@ -55,35 +55,6 @@ jobs:
         arch -arm64 python -m pip install pytest
         arch -arm64 python -m pip install blspy
 
-    - name: install clvm & clvm_tools
-      run: |
-        . ./venv/bin/activate
-        arch -arm64 git clone https://github.com/Chia-Network/clvm.git --branch=main --single-branch
-        arch -arm64 python -m pip install ./clvm
-
-        arch -arm64 git clone https://github.com/Chia-Network/clvm_tools.git --branch=main --single-branch
-        arch -arm64 python -m pip install ./clvm_tools
-
-    - name: Ensure clvm, clvm_rs, clvm_tools are installed
-      run: |
-        . ./venv/bin/activate
-        arch -arm64 python -c 'import clvm'
-        arch -arm64 python -c 'import clvm; print(clvm.__file__)'
-        arch -arm64 python -c 'import clvm_rs; print(clvm_rs.__file__)'
-        arch -arm64 python -c 'import clvm_tools; print(clvm_tools.__file__)'
-
-    - name: Run tests from clvm
-      run: |
-        . ./venv/bin/activate
-        cd clvm
-        arch -arm64 pytest tests
-
-    - name: Run tests from clvm_tools
-      run: |
-        . ./venv/bin/activate
-        cd clvm_tools
-        arch -arm64 pytest tests
-
     - name: Run tests from wheel
       run: |
         . ./venv/bin/activate

.github/workflows/build-test.yml

@@ -114,6 +114,11 @@ jobs:
         python -m pip install pytest
         python -m pip install blspy
 
+    # we need this for brun and opc
+    - name: install clvm_tools
+      run: |
+        cargo install clvm_tools_rs
+
     - name: Run tests from wheel
       run: |
         . ./activate
@@ -272,8 +277,6 @@ jobs:
           cargo test --release --workspace
           python -m venv venv
           source venv/bin/activate
-          git clone https://github.com/Chia-Network/clvm_tools.git --branch=main --single-branch
-          pip install ./clvm_tools
           pip install colorama maturin pytest pytest-cov
           maturin develop --release -m wheel/Cargo.toml --features=openssl
           (cd tests && python generate-programs.py && python run-programs.py) || true

benchmark/run-benchmark.py

@@ -6,7 +6,7 @@
 import os
 import time
 import random
-from clvm_rs import Program
+from clvm_rs import run_serialized_chia_program
 from colorama import init, Fore, Style
 
 init()
@@ -201,11 +201,12 @@ def need_update(file_path, mtime):
         else:
             if "-v" in sys.argv:
                 print(fn)
-            program = Program.fromhex(open(fn, 'r').read())
-            env = Program.fromhex(open(env_fn, 'r').read())
+            program = bytes.fromhex(open(fn, 'r').read())
+            env = bytes.fromhex(open(env_fn, 'r').read())
 
             time_start = time.perf_counter()
-            cost, result = program.run_with_cost(
+            cost, result = run_serialized_chia_program(
+                program,
                 env,
                 max_cost,
                 flags,