Install rust globally

.github/workflows/build-windows.yml

@@ -5,13 +5,13 @@ name: build
 
 on:
   pull_request:
-    branches: [ main, feat/* ]
+    branches: [main, feat/*]
   workflow_dispatch:
 
 jobs:
   build:
     name: Build and Test mxpy for ${{ matrix.os }}, python ${{ matrix.python-version }}
-    
+
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -20,39 +20,39 @@ jobs:
         python-version: [3.8]
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      shell: bash
-      run: |
-        python3 -m pip install --upgrade pip
-        pip3 install -r requirements.txt
-        pip3 install pytest
-    - name: Set github_api_token
-      shell: bash
-      run: |
-        mkdir ~/multiversx-sdk
-        export PYTHONPATH=.
-        python3 -m multiversx_sdk_cli.cli config new test
-        python3 -m multiversx_sdk_cli.cli config set github_api_token ${{ secrets.GITHUB_TOKEN }}
-    - name: Setup test dependencies
-      shell: bash
-      run: |
-        python3 -m multiversx_sdk_cli.cli deps install testwallets
-    - name: Run unit tests
-      shell: bash
-      run: |
-        export PYTHONPATH=.
-        pytest -m "not skip_on_windows" .
-    - name: Run CLI tests
-      shell: bash
-      run: |
-        export PROXY=https://testnet-gateway.multiversx.com
-        export CHAIN_ID=T
-        cd ./multiversx_sdk_cli/tests
-        source ./test_cli_tx.sh && testAll || return 1
-        source ./test_cli_dns.sh && testOffline || return 1
-        source ./test_cli_validators.sh && testAll || return 1
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        shell: bash
+        run: |
+          python3 -m pip install --upgrade pip
+          pip3 install -r requirements.txt
+          pip3 install pytest
+      - name: Set github_api_token
+        shell: bash
+        run: |
+          mkdir ~/multiversx-sdk
+          export PYTHONPATH=.
+          python3 -m multiversx_sdk_cli.cli config new test
+          python3 -m multiversx_sdk_cli.cli config set github_api_token ${{ secrets.GITHUB_TOKEN }}
+      - name: Setup test dependencies
+        shell: bash
+        run: |
+          python3 -m multiversx_sdk_cli.cli deps install testwallets
+      - name: Run unit tests
+        shell: bash
+        run: |
+          export PYTHONPATH=.
+          pytest -m "not skip_on_windows" .
+      - name: Run CLI tests
+        shell: bash
+        run: |
+          export PROXY=https://testnet-gateway.multiversx.com
+          export CHAIN_ID=T
+          cd ./multiversx_sdk_cli/tests
+          source ./test_cli_tx.sh && testAll || return 1
+          source ./test_cli_dns.sh && testOffline || return 1
+          source ./test_cli_validators.sh && testAll || return 1

.github/workflows/build.yml

@@ -46,7 +46,6 @@ jobs:
           python3 -m multiversx_sdk_cli.cli deps install testwallets
           python3 -m multiversx_sdk_cli.cli deps install wasm-opt
           python3 -m multiversx_sdk_cli.cli deps install rust --overwrite
-          cargo install multiversx-sc-meta
       - name: Run unit tests
         run: |
           export PYTHONPATH=.

multiversx_sdk_cli/dependencies/modules.py

@@ -9,6 +9,7 @@
                                 myprocess, utils, workstation)
 from multiversx_sdk_cli.dependencies.resolution import (
     DependencyResolution, get_dependency_resolution)
+from multiversx_sdk_cli.ux import show_warning
 
 logger = logging.getLogger("modules")
 
@@ -34,7 +35,6 @@
             logger.info("Already exists. Skip install.")
             return
 
-        self._guard_cannot_install_on_host()
         self.uninstall(tag)
         self._do_install(tag)
 
@@ -66,10 +66,6 @@
     def get_resolution(self) -> DependencyResolution:
         return get_dependency_resolution(self.key)
 
-    def _guard_cannot_install_on_host(self):
-        if self.get_resolution() == DependencyResolution.Host:
-            raise errors.KnownError(f"Installation of {self.key} on the host machine is not supported. Perhaps set 'dependencies.{self.key}.resolution' to 'SDK' in config?")
-
 
 class StandaloneModule(DependencyModule):
     def __init__(self,
@@ -256,6 +252,29 @@
 
 
 class Rust(DependencyModule):
+    def is_installed(self, tag: str) -> bool:
+        which_rustc = shutil.which("rustc")
+        which_cargo = shutil.which("cargo")
+        logger.info(f"which rustc: {which_rustc}")
+        logger.info(f"which cargo: {which_cargo}")
+
+        return which_rustc is not None and which_cargo is not None
+
+    def install(self, tag: str, overwrite: bool) -> None:
+        # Fallback to default tag if not provided
+        tag = tag or config.get_dependency_tag(self.key)
+
+        logger.info(f"install: key={self.key}, tag={tag}, overwrite={overwrite}")
+
+        if overwrite:
+            logger.info("Overwriting the current rust version...")
+        elif self._is_installed_and_set_to_nightly():
+            return
+
+        self._do_install(tag)
+        self._install_sc_meta()
+        self._post_install(tag)
+
     def _do_install(self, tag: str) -> None:
         installer_url = self._get_installer_url()
         installer_path = self._get_installer_path()
@@ -273,6 +292,11 @@
 
         myprocess.run_process(args)
 
+    def _install_sc_meta(self):
+        logger.info("Installing multiversx-sc-meta")
+        args = ["cargo", "install", "multiversx-sc-meta"]
+        myprocess.run_process(args)
+
     def _get_installer_url(self) -> str:
         if workstation.is_windows():
             return "https://win.rustup.rs"
@@ -290,13 +314,20 @@
         if os.path.isdir(directory):
             shutil.rmtree(directory)
 
-    def is_installed(self, tag: str) -> bool:
-        which_rustc = shutil.which("rustc")
-        which_cargo = shutil.which("cargo")
-        logger.info(f"which rustc: {which_rustc}")
-        logger.info(f"which cargo: {which_cargo}")
+    def _is_installed_and_set_to_nightly(self) -> bool:
+        # the method parameter is not used in this specific module
+        is_rust_installed = self.is_installed("")
 
-        return which_rustc is not None and which_cargo is not None
+        if not is_rust_installed:
+            return is_rust_installed
+        else:
+            self._recommend_default_rust_version()
+            return True
+
+    def _recommend_default_rust_version(self):
+        module = dependencies.get_module_by_key("rust")
+        default_tag: str = config.get_dependency_tag(module.key)
+        show_warning(f"We recommend using rust {default_tag}. If you'd like to overwrite your current version please run `mxpy deps install rust --overwrite`.")
 
     def get_directory(self, tag: str) -> Path:
         tools_folder = workstation.get_tools_folder()

multiversx_sdk_cli/tests/shared.sh

@@ -16,7 +16,7 @@ PROXY="${PROXY:-http://localhost:7950}"
 CHAIN_ID="${CHAIN_ID:-localnet}"
 TestUser=./testdata/testUser.pem
 TestUser2=./testdata/testUser2.pem
-RUST_VERSION="nightly-2023-04-24"
+RUST_VERSION="nightly-2023-05-26"
 
 cleanSandbox() {
     rm -rf ${SANDBOX}

multiversx_sdk_cli/tests/test_cli_deps.py

@@ -0,0 +1,50 @@
+import shutil
+
+import pytest
+
+from multiversx_sdk_cli.cli import main
+from multiversx_sdk_cli.config import get_dependency_tag
+
+
+def test_deps_install_rust():
+    default_tag = get_dependency_tag("rust")
+    return_code = main(["deps", "install", "rust", "--tag", default_tag, "--overwrite"])
+    if return_code:
+        assert False
+    else:
+        assert True
+
+
+@pytest.mark.skip_on_windows
+def test_deps_install_vmtools():
+    return_code = main(["deps", "install", "vmtools"])
+    if return_code:
+        assert False
+    else:
+        assert True
+
+
+def test_deps_check_rust():
+    return_code = main(["deps", "check", "rust"])
+    if return_code:
+        assert False
+    else:
+        assert True
+
+
+@pytest.mark.skip_on_windows
+def test_check_sc_meta():
+    which_sc_meta = shutil.which("sc-meta")
+    if which_sc_meta:
+        assert True
+    elif which_sc_meta is None:
+        assert False
+
+
+@pytest.mark.skip_on_windows
+def test_deps_check_vmtools():
+    return_code = main(["deps", "check", "vmtools"])
+    if return_code:
+        assert False
+    else:
+        assert True