Distribute kelrond with kmultiversx (#232)

* Remove `kbuild` step * Remove `kwasm` * Move `kelrond` into Python package * Set Version: 0.1.32 * Set Version: 0.1.33 --------- Co-authored-by: devops <[email protected]>
runtimeverification · Apr 16, 2024 · b518fb3 · b518fb3
1 parent f5286f5
commit b518fb3
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 175 deletions.
diff --git a/Makefile b/Makefile
@@ -87,7 +87,7 @@ test: test-simple mandos-test test-elrond-contracts test-custom-contracts
 # Unit Tests
 # ----------
 
-TEST  := ./kelrond
+TEST  := $(POETRY) run -- kelrond
 CHECK := git --no-pager diff --no-index --ignore-all-space -R
 
 TEST_CONCRETE_BACKEND:= llvm

diff --git a/generate-claims.sh b/generate-claims.sh
@@ -8,7 +8,7 @@ poetry -C kmultiversx install
 
 sc-meta all build --path deps/mx-sdk-rs/contracts/examples/adder --wasm-symbols --no-wasm-opt
 sc-meta all build --path tests/contracts/foundrylike --wasm-symbols --no-wasm-opt
-K_OPTS="-Xmx8192m" kbuild kompile llvm-kasmer && poetry -C kmultiversx run -- kasmer --directory "tests/contracts/foundrylike" --gen-claims 2>&1 | tee kasmer.log
+poetry -C kmultiversx run -- kasmer --directory "tests/contracts/foundrylike" --gen-claims 2>&1 | tee kasmer.log
 
 # Coindrip
 
@@ -19,13 +19,13 @@ do
 done
 sc-meta all build --path deps/coindrip-protocol-sc --wasm-symbols --no-wasm-opt
 sc-meta all build --path tests/contracts/test_coindrip --wasm-symbols --no-wasm-opt
-K_OPTS="-Xmx8192m" kbuild kompile llvm-kasmer && poetry -C kmultiversx run -- kasmer --directory "tests/contracts/test_coindrip" --gen-claims 2>&1 | tee kasmer.log
+poetry -C kmultiversx run -- kasmer --directory "tests/contracts/test_coindrip" --gen-claims 2>&1 | tee kasmer.log
 
 # Crowdfunding
 
 sc-meta all build --path deps/mx-sdk-rs/contracts/examples/crowdfunding-esdt --wasm-symbols --no-wasm-opt
 sc-meta all build --path tests/contracts/test_crowdfunding-esdt --wasm-symbols --no-wasm-opt
-K_OPTS="-Xmx8192m" kbuild kompile llvm-kasmer && poetry -C kmultiversx run -- kasmer --directory "tests/contracts/test_crowdfunding-esdt" --gen-claims 2>&1 | tee kasmer.log
+poetry -C kmultiversx run -- kasmer --directory "tests/contracts/test_crowdfunding-esdt" --gen-claims 2>&1 | tee kasmer.log
 
 # Pair
 
@@ -37,4 +37,4 @@ K_OPTS="-Xmx8192m" kbuild kompile llvm-kasmer && poetry -C kmultiversx run -- ka
 
 sc-meta all build --path deps/mx-sdk-rs/contracts/examples/multisig --wasm-symbols --no-wasm-opt
 sc-meta all build --path tests/contracts/test_multisig --wasm-symbols --no-wasm-opt
-K_OPTS="-Xmx8192m" kbuild kompile llvm-kasmer && poetry -C kmultiversx run -- kasmer --directory "tests/contracts/test_multisig" --gen-claims 2>&1 | tee kasmer.log
+poetry -C kmultiversx run -- kasmer --directory "tests/contracts/test_multisig" --gen-claims 2>&1 | tee kasmer.log
diff --git a/kmultiversx/pyproject.toml b/kmultiversx/pyproject.toml
@@ -4,12 +4,17 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "kmultiversx"
-version = "0.1.32"
+version = "0.1.33"
 description = "Python tools for Elrond semantics"
 authors = [
     "Runtime Verification, Inc. <[email protected]>",
 ]
 
+[tool.poetry.scripts]
+mandos = "kmultiversx.scenario:run_tests"
+kasmer = "kmultiversx.kasmer:main"
+kelrond = "kmultiversx.scripts.kelrond:main"
+
 [tool.poetry.plugins.kdist]
 mx-semantics = "kmultiversx.kdist.plugin"
 
@@ -54,7 +59,3 @@ skip-string-normalization = true
 
 [tool.mypy]
 disallow_untyped_defs = true
-
-[tool.poetry.scripts]
-mandos = "kmultiversx.scenario:run_tests"
-kasmer = "kmultiversx.kasmer:main"
diff --git a/kmultiversx/src/kmultiversx/scripts/kelrond.py b/kmultiversx/src/kmultiversx/scripts/kelrond.py
@@ -0,0 +1,15 @@
+import sys
+from pathlib import Path
+
+from pyk.utils import run_process
+
+SCRIPT_FILE = Path(__file__).parent / 'kelrond.sh'
+
+
+def main() -> None:
+    proc_res = run_process(['bash', str(SCRIPT_FILE)] + sys.argv[1:], pipe_stdout=False, check=False)
+    sys.exit(proc_res.returncode)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/kelrond → ...iversx/src/kmultiversx/scripts/kelrond.sh b/kelrond → ...iversx/src/kmultiversx/scripts/kelrond.sh
@@ -1,18 +1,12 @@
-#!/usr/bin/env bash
-
 set -euo pipefail
 shopt -s extglob
 
 notif() { echo "== $@" >&2 ; }
 fatal() { echo "[FATAL] $@" ; exit 1 ; }
 
-kelrond_dir="${KELROND_DIR:-$(dirname $0)}"
-build_dir="$kelrond_dir/.build"
-kdist_dir="$(poetry -C kmultiversx run -- kdist which)"
+kdist_dir="$(kdist which)"
 defn_dir="${KELROND_DEFN_DIR:-$kdist_dir}/mx-semantics"
 
-kwasm_dir=$kelrond_dir/deps/wasm-semantics
-
 export K_OPTS="${K_OPTS:--Xmx16G -Xss512m}"
 
 # Utilities
@@ -24,7 +18,7 @@ preprocess() {
     tmp_dir="$(mktemp -d)"
     tmp_input="$tmp_dir/$(basename $run_file))"
     touch "$tmp_input"
-    poetry -C kmultiversx run kwasm-preprocess "$run_file" > "$tmp_input"
+    kwasm-preprocess "$run_file" > "$tmp_input"
     run_file="$tmp_input"
 }
 

diff --git a/kwasm b/kwasm
diff --git a/package/version b/package/version
@@ -1 +1 @@
-0.1.32
+0.1.33