diff --git a/.cruft.json b/.cruft.json index ee018f0..0034f71 100644 --- a/.cruft.json +++ b/.cruft.json @@ -4,9 +4,9 @@ "checkout": null, "context": { "cookiecutter": { - "project_name": "ksoroban", - "project_slug": "ksoroban", - "package_name": "ksoroban", + "project_name": "komet", + "project_slug": "komet", + "package_name": "komet", "version": "0.1.0", "description": "K tooling for the Soroban platform", "author_name": "Runtime Verification, Inc.", diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 72a3edc..4687587 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -51,7 +51,7 @@ jobs: name: 'Integration Tests' runs-on: [self-hosted, linux, normal] env: - CONTAINER: ksoroban-integration-${{ github.sha }} + CONTAINER: komet-integration-${{ github.sha }} steps: - name: 'Check out code' uses: actions/checkout@v3 @@ -61,7 +61,7 @@ jobs: uses: ./.github/actions/with-docker with: container-name: ${CONTAINER} - - name: 'Build ksoroban' + - name: 'Build komet' run: docker exec --user user ${CONTAINER} poetry install - name: 'Build semantics' run: docker exec --user user ${CONTAINER} make kdist-build diff --git a/Makefile b/Makefile index d8915b5..3113504 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ COV_ARGS := cov: cov-all -cov-%: TEST_ARGS += --cov=ksoroban --no-cov-on-fail --cov-branch --cov-report=term +cov-%: TEST_ARGS += --cov=komet --no-cov-on-fail --cov-branch --cov-report=term cov-all: TEST_ARGS += --cov-report=html:cov-all-html $(COV_ARGS) cov-all: test-all diff --git a/README.md b/README.md index 6ce2713..aa08f4b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ksoroban +# komet ## Installation diff --git a/flake.nix b/flake.nix index 3abb239..327c496 100644 --- a/flake.nix +++ b/flake.nix @@ -66,7 +66,7 @@ mkdir -p $out cp -r ./kdist-*/* $out/ - makeWrapper ${komet-pyk}/bin/ksoroban $out/bin/ksoroban --prefix PATH : ${ + makeWrapper ${komet-pyk}/bin/komet $out/bin/komet --prefix PATH : ${ prev.lib.makeBinPath [ k-framework.packages.${prev.system}.k ] } --set KDIST_DIR $out ''; diff --git a/package/version b/package/version index 001d752..5a48b6b 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.1.23 +0.1.24 diff --git a/pyproject.toml b/pyproject.toml index 3a8bfb1..a3f54a7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,18 +3,18 @@ requires = ["poetry-core"] build-backend = "poetry.core.masonry.api" [tool.poetry] -name = "ksoroban" -version = "0.1.23" +name = "komet" +version = "0.1.24" description = "K tooling for the Soroban platform" authors = [ "Runtime Verification, Inc. ", ] [tool.poetry.scripts] -ksoroban = "ksoroban.ksoroban:main" +komet = "komet.komet:main" [tool.poetry.plugins.kdist] -soroban-semantics = "ksoroban.kdist.plugin" +soroban-semantics = "komet.kdist.plugin" [tool.poetry.dependencies] python = "^3.10" diff --git a/src/ksoroban/__init__.py b/src/komet/__init__.py similarity index 100% rename from src/ksoroban/__init__.py rename to src/komet/__init__.py diff --git a/src/ksoroban/hello.py b/src/komet/hello.py similarity index 100% rename from src/ksoroban/hello.py rename to src/komet/hello.py diff --git a/src/ksoroban/kasmer.py b/src/komet/kasmer.py similarity index 99% rename from src/ksoroban/kasmer.py rename to src/komet/kasmer.py index 79342fa..e70e107 100644 --- a/src/ksoroban/kasmer.py +++ b/src/komet/kasmer.py @@ -119,7 +119,7 @@ def build_soroban_contract(self, contract_path: Path, out_dir: Path | None = Non contract_stem = self.contract_manifest(contract_path)['name'] contract_name = f'{contract_stem}.wasm' if out_dir is None: - out_dir = Path(mkdtemp(f'ksoroban_{str(contract_path.stem)}')) + out_dir = Path(mkdtemp(f'komet_{str(contract_path.stem)}')) run_process([str(self._soroban_bin), 'contract', 'build', '--out-dir', str(out_dir)], cwd=contract_path) diff --git a/src/ksoroban/kast/__init__.py b/src/komet/kast/__init__.py similarity index 100% rename from src/ksoroban/kast/__init__.py rename to src/komet/kast/__init__.py diff --git a/src/ksoroban/kast/syntax.py b/src/komet/kast/syntax.py similarity index 100% rename from src/ksoroban/kast/syntax.py rename to src/komet/kast/syntax.py diff --git a/src/ksoroban/kdist/__init__.py b/src/komet/kdist/__init__.py similarity index 100% rename from src/ksoroban/kdist/__init__.py rename to src/komet/kdist/__init__.py diff --git a/src/ksoroban/kdist/plugin.py b/src/komet/kdist/plugin.py similarity index 100% rename from src/ksoroban/kdist/plugin.py rename to src/komet/kdist/plugin.py diff --git a/src/ksoroban/kdist/soroban-semantics/auto-allocate.md b/src/komet/kdist/soroban-semantics/auto-allocate.md similarity index 100% rename from src/ksoroban/kdist/soroban-semantics/auto-allocate.md rename to src/komet/kdist/soroban-semantics/auto-allocate.md diff --git a/src/ksoroban/kdist/soroban-semantics/cheatcodes.md b/src/komet/kdist/soroban-semantics/cheatcodes.md similarity index 100% rename from src/ksoroban/kdist/soroban-semantics/cheatcodes.md rename to src/komet/kdist/soroban-semantics/cheatcodes.md diff --git a/src/ksoroban/kdist/soroban-semantics/configuration.md b/src/komet/kdist/soroban-semantics/configuration.md similarity index 100% rename from src/ksoroban/kdist/soroban-semantics/configuration.md rename to src/komet/kdist/soroban-semantics/configuration.md diff --git a/src/ksoroban/kdist/soroban-semantics/data.md b/src/komet/kdist/soroban-semantics/data.md similarity index 100% rename from src/ksoroban/kdist/soroban-semantics/data.md rename to src/komet/kdist/soroban-semantics/data.md diff --git a/src/ksoroban/kdist/soroban-semantics/errors.md b/src/komet/kdist/soroban-semantics/errors.md similarity index 100% rename from src/ksoroban/kdist/soroban-semantics/errors.md rename to src/komet/kdist/soroban-semantics/errors.md diff --git a/src/ksoroban/kdist/soroban-semantics/host/address.md b/src/komet/kdist/soroban-semantics/host/address.md similarity index 100% rename from src/ksoroban/kdist/soroban-semantics/host/address.md rename to src/komet/kdist/soroban-semantics/host/address.md diff --git a/src/ksoroban/kdist/soroban-semantics/host/buffer.md b/src/komet/kdist/soroban-semantics/host/buffer.md similarity index 100% rename from src/ksoroban/kdist/soroban-semantics/host/buffer.md rename to src/komet/kdist/soroban-semantics/host/buffer.md diff --git a/src/ksoroban/kdist/soroban-semantics/host/call.md b/src/komet/kdist/soroban-semantics/host/call.md similarity index 100% rename from src/ksoroban/kdist/soroban-semantics/host/call.md rename to src/komet/kdist/soroban-semantics/host/call.md diff --git a/src/ksoroban/kdist/soroban-semantics/host/context.md b/src/komet/kdist/soroban-semantics/host/context.md similarity index 100% rename from src/ksoroban/kdist/soroban-semantics/host/context.md rename to src/komet/kdist/soroban-semantics/host/context.md diff --git a/src/ksoroban/kdist/soroban-semantics/host/hostfuns.md b/src/komet/kdist/soroban-semantics/host/hostfuns.md similarity index 100% rename from src/ksoroban/kdist/soroban-semantics/host/hostfuns.md rename to src/komet/kdist/soroban-semantics/host/hostfuns.md diff --git a/src/ksoroban/kdist/soroban-semantics/host/integer.md b/src/komet/kdist/soroban-semantics/host/integer.md similarity index 100% rename from src/ksoroban/kdist/soroban-semantics/host/integer.md rename to src/komet/kdist/soroban-semantics/host/integer.md diff --git a/src/ksoroban/kdist/soroban-semantics/host/ledger.md b/src/komet/kdist/soroban-semantics/host/ledger.md similarity index 100% rename from src/ksoroban/kdist/soroban-semantics/host/ledger.md rename to src/komet/kdist/soroban-semantics/host/ledger.md diff --git a/src/ksoroban/kdist/soroban-semantics/host/map.md b/src/komet/kdist/soroban-semantics/host/map.md similarity index 100% rename from src/ksoroban/kdist/soroban-semantics/host/map.md rename to src/komet/kdist/soroban-semantics/host/map.md diff --git a/src/ksoroban/kdist/soroban-semantics/host/symbol.md b/src/komet/kdist/soroban-semantics/host/symbol.md similarity index 100% rename from src/ksoroban/kdist/soroban-semantics/host/symbol.md rename to src/komet/kdist/soroban-semantics/host/symbol.md diff --git a/src/ksoroban/kdist/soroban-semantics/host/vector.md b/src/komet/kdist/soroban-semantics/host/vector.md similarity index 100% rename from src/ksoroban/kdist/soroban-semantics/host/vector.md rename to src/komet/kdist/soroban-semantics/host/vector.md diff --git a/src/ksoroban/kdist/soroban-semantics/kasmer.md b/src/komet/kdist/soroban-semantics/kasmer.md similarity index 99% rename from src/ksoroban/kdist/soroban-semantics/kasmer.md rename to src/komet/kdist/soroban-semantics/kasmer.md index 378eb8a..a538b19 100644 --- a/src/ksoroban/kdist/soroban-semantics/kasmer.md +++ b/src/komet/kdist/soroban-semantics/kasmer.md @@ -2,7 +2,7 @@ ```k requires "soroban.md" requires "cheatcodes.md" -requires "ksoroban-lemmas.md" +requires "komet-lemmas.md" module KASMER-SYNTAX imports WASM-TEXT-SYNTAX diff --git a/src/ksoroban/kdist/soroban-semantics/ksoroban-lemmas.md b/src/komet/kdist/soroban-semantics/komet-lemmas.md similarity index 100% rename from src/ksoroban/kdist/soroban-semantics/ksoroban-lemmas.md rename to src/komet/kdist/soroban-semantics/komet-lemmas.md diff --git a/src/ksoroban/kdist/soroban-semantics/soroban.md b/src/komet/kdist/soroban-semantics/soroban.md similarity index 100% rename from src/ksoroban/kdist/soroban-semantics/soroban.md rename to src/komet/kdist/soroban-semantics/soroban.md diff --git a/src/ksoroban/kdist/soroban-semantics/switch.md b/src/komet/kdist/soroban-semantics/switch.md similarity index 100% rename from src/ksoroban/kdist/soroban-semantics/switch.md rename to src/komet/kdist/soroban-semantics/switch.md diff --git a/src/ksoroban/kdist/soroban-semantics/wasm-ops.md b/src/komet/kdist/soroban-semantics/wasm-ops.md similarity index 100% rename from src/ksoroban/kdist/soroban-semantics/wasm-ops.md rename to src/komet/kdist/soroban-semantics/wasm-ops.md diff --git a/src/ksoroban/ksoroban.py b/src/komet/komet.py similarity index 99% rename from src/ksoroban/ksoroban.py rename to src/komet/komet.py index fedd157..b0b834a 100644 --- a/src/ksoroban/ksoroban.py +++ b/src/komet/komet.py @@ -127,7 +127,7 @@ def _exit_with_output(cp: CompletedProcess) -> None: def _argument_parser() -> ArgumentParser: - parser = ArgumentParser(prog='ksoroban') + parser = ArgumentParser(prog='komet') command_parser = parser.add_subparsers(dest='command', required=True) run_parser = command_parser.add_parser('run', help='run a concrete test') diff --git a/src/ksoroban/proof.py b/src/komet/proof.py similarity index 100% rename from src/ksoroban/proof.py rename to src/komet/proof.py diff --git a/src/ksoroban/py.typed b/src/komet/py.typed similarity index 100% rename from src/ksoroban/py.typed rename to src/komet/py.typed diff --git a/src/ksoroban/scval.py b/src/komet/scval.py similarity index 100% rename from src/ksoroban/scval.py rename to src/komet/scval.py diff --git a/src/ksoroban/utils.py b/src/komet/utils.py similarity index 100% rename from src/ksoroban/utils.py rename to src/komet/utils.py diff --git a/src/tests/integration/data/soroban/contracts/test_adder/README.md b/src/tests/integration/data/soroban/contracts/test_adder/README.md index 1ee6586..542d395 100644 --- a/src/tests/integration/data/soroban/contracts/test_adder/README.md +++ b/src/tests/integration/data/soroban/contracts/test_adder/README.md @@ -1,4 +1,4 @@ -A quick example of a contract that can be ran with `ksoroban test` +A quick example of a contract that can be ran with `komet test` You will need to have the stellar cli utils installed: https://developers.stellar.org/docs/build/smart-contracts/getting-started/setup @@ -12,7 +12,7 @@ And then (from this directory): ```sh soroban contract build --out-dir output -ksoroban test output/test_adder.wasm +komet test output/test_adder.wasm ``` -`ksoroban test` should exit successfully +`komet test` should exit successfully diff --git a/src/tests/integration/data/soroban/contracts/test_storage/README.md b/src/tests/integration/data/soroban/contracts/test_storage/README.md index e6fe26b..f7c26b1 100644 --- a/src/tests/integration/data/soroban/contracts/test_storage/README.md +++ b/src/tests/integration/data/soroban/contracts/test_storage/README.md @@ -1,4 +1,4 @@ -A quick example of a contract that can be ran with `ksoroban test` +A quick example of a contract that can be ran with `komet test` You will need to have the stellar cli utils installed: https://developers.stellar.org/docs/build/smart-contracts/getting-started/setup @@ -12,7 +12,7 @@ And then (from this directory): ```sh soroban contract build --out-dir output -ksoroban test output/test_storage.wasm +komet test output/test_storage.wasm ``` -`ksoroban test` should exit successfully +`komet test` should exit successfully diff --git a/src/tests/integration/data/soroban/contracts/test_ttl/README.md b/src/tests/integration/data/soroban/contracts/test_ttl/README.md index 1ee6586..542d395 100644 --- a/src/tests/integration/data/soroban/contracts/test_ttl/README.md +++ b/src/tests/integration/data/soroban/contracts/test_ttl/README.md @@ -1,4 +1,4 @@ -A quick example of a contract that can be ran with `ksoroban test` +A quick example of a contract that can be ran with `komet test` You will need to have the stellar cli utils installed: https://developers.stellar.org/docs/build/smart-contracts/getting-started/setup @@ -12,7 +12,7 @@ And then (from this directory): ```sh soroban contract build --out-dir output -ksoroban test output/test_adder.wasm +komet test output/test_adder.wasm ``` -`ksoroban test` should exit successfully +`komet test` should exit successfully diff --git a/src/tests/integration/test_integration.py b/src/tests/integration/test_integration.py index ad5425a..0d1250b 100644 --- a/src/tests/integration/test_integration.py +++ b/src/tests/integration/test_integration.py @@ -5,8 +5,8 @@ from pyk.kdist import kdist from pyk.ktool.krun import _krun -from ksoroban.kasmer import Kasmer -from ksoroban.utils import concrete_definition, symbolic_definition +from komet.kasmer import Kasmer +from komet.utils import concrete_definition, symbolic_definition TEST_DATA = (Path(__file__).parent / 'data').resolve(strict=True) TEST_FILES = TEST_DATA.glob('*.wast') @@ -33,7 +33,7 @@ def test_run(program: Path, tmp_path: Path) -> None: @pytest.mark.parametrize('contract_path', SOROBAN_TEST_CONTRACTS, ids=lambda p: str(p.stem)) -def test_ksoroban(contract_path: Path, tmp_path: Path, concrete_kasmer: Kasmer) -> None: +def test_komet(contract_path: Path, tmp_path: Path, concrete_kasmer: Kasmer) -> None: # Given contract_wasm = concrete_kasmer.build_soroban_contract(contract_path, tmp_path) diff --git a/src/tests/unit/test_unit.py b/src/tests/unit/test_unit.py index dc58335..0d3313a 100644 --- a/src/tests/unit/test_unit.py +++ b/src/tests/unit/test_unit.py @@ -1,4 +1,4 @@ -from ksoroban.hello import hello +from komet.hello import hello def test_hello() -> None: