Merge pull request #64 from multiversx/new-sdk-path

Handle SDK renaming: elrondsdk -> multiversx-sdk, erdpy -> mxpy

README.md

@@ -30,18 +30,18 @@ MultiversX IDE can be installed from the Visual Studio Code Marketplace.
  - **Windows** is not supported yet
  - **MacOS** is supported
 
-If you experience any issues, please let us know [on Github](https://github.com/multiversx/mx-ide-vscode/issues) or [on Telegram](https://t.me/MultiversXDevelopers).
+If you experience any issues, please let us know [on Github](https://github.com/multiversx/mx-ide-vscode/issues), on [Discord](http://discord.gg/MultiversXBuilders) or [on Telegram](https://t.me/MultiversXDevelopers).
 
-### [erdpy](https://github.com/multiversx/mx-sdk-erdpy)
+### [mxpy](https://github.com/multiversx/mx-sdk-py-cli)
 
-**erdpy** is the backend of the Visual Studio Code extension. **erdpy** is **required** by the MultiversX IDE. In order to install it, please follow [these steps](https://docs.multiversx.com/sdk-and-tools/erdpy/installing-erdpy).
+**mxpy** is the backend of the Visual Studio Code extension. **mxpy** is **required** by the MultiversX IDE. In order to install it, please follow [these steps](https://docs.multiversx.com/sdk-and-tools/sdk-py/installing-mxpy).
 
 ### Other dependencies
 
-The extension, via `erdpy`, will automatically download its external dependencies, so you do not have to worry much about setting up the development environment. These automatically installed dependencies include:
+The extension, via `mxpy`, will automatically download its external dependencies, so you do not have to worry much about setting up the development environment. These automatically installed dependencies include:
 
 * `RUST` buildchain
-* `VM Tools` (e.g. Mandos framework)
+* `VM Tools` (e.g. tests / scenarios framework)
 * `LLVM (clang, llc, wasm-ld etc.)`
 
 ## Extension Commands
@@ -51,7 +51,7 @@ This extension contributes the following commands (`Ctrl+Shift+P`):
 * `newFromTemplate`
 * `buildContract`
 * `cleanContract`
-* `runMandosTests`
+* `runScenarios`
 * `runContractSnippet`
 
 ## Installing the rust debugger pretty printer script

package.json

@@ -2,7 +2,7 @@
 	"name": "vscode-elrond-ide",
 	"displayName": "MultiversX IDE",
 	"description": "MultiversX IDE for developing Smart Contracts",
-	"version": "0.14.1",
+	"version": "0.15.0",
 	"publisher": "Elrond",
 	"repository": {
 		"type": "git",
@@ -21,7 +21,7 @@
 	"activationEvents": [
 		"onCommand:multiversx.setupWorkspace",
 		"onCommand:multiversx.installRustDebuggerPrettyPrinterScript",
-		"workspaceContains:**/elrond.workspace.json"
+		"workspaceContains:**/multiversx.workspace.json"
 	],
 	"main": "./out/extension.js",
 	"contributes": {
@@ -85,8 +85,8 @@
 				"category": "multiversx"
 			},
 			{
-				"command": "multiversx.runMandosTests",
-				"title": "Run Mandos Tests",
+				"command": "multiversx.runScenarios",
+				"title": "Run Scenarios",
 				"category": "multiversx"
 			},
 			{
@@ -110,16 +110,16 @@
 				"category": "multiversx"
 			},
 			{
-				"command": "multiversx.setupErdjsSnippets",
-				"title": "Setup erdjs-snippets",
+				"command": "multiversx.setupJavaScriptSnippets",
+				"title": "Setup JavaScript snippets",
 				"category": "multiversx"
 			}
 		],
 		"menus": {
 			"explorer/context": [
 				{
 					"command": "multiversx.buildContract",
-					"when": "explorerResourceIsFolder && resourceFilename != output && resourceFilename != debug && resourceFilename != target && resourceFilename != erdjs-snippets && resourceFilename != interaction",
+					"when": "explorerResourceIsFolder && resourceFilename != output && resourceFilename != debug && resourceFilename != target && resourceFilename != js-snippets && resourceFilename != interaction",
 					"group": "multiversx"
 				},
 				{
@@ -129,7 +129,7 @@
 				},
 				{
 					"command": "multiversx.cleanContract",
-					"when": "explorerResourceIsFolder && resourceFilename != output && resourceFilename != debug && resourceFilename != target && resourceFilename != erdjs-snippets && resourceFilename != interaction",
+					"when": "explorerResourceIsFolder && resourceFilename != output && resourceFilename != debug && resourceFilename != target && resourceFilename != js-snippets && resourceFilename != interaction",
 					"group": "multiversx"
 				},
 				{
@@ -139,7 +139,7 @@
 				},
 				{
 					"command": "multiversx.runContractSnippet",
-					"when": "explorerResourceIsFolder && resourceFilename != output && resourceFilename != debug && resourceFilename != target && resourceFilename != erdjs-snippets",
+					"when": "explorerResourceIsFolder && resourceFilename != output && resourceFilename != debug && resourceFilename != target && resourceFilename != js-snippets",
 					"group": "multiversx"
 				},
 				{
@@ -148,13 +148,13 @@
 					"group": "multiversx"
 				},
 				{
-					"command": "multiversx.runMandosTests",
+					"command": "multiversx.runScenarios",
 					"when": "resourceFilename =~ /.scen.json/",
 					"group": "multiversx"
 				},
 				{
-					"command": "multiversx.runMandosTests",
-					"when": "explorerResourceIsFolder && resourceFilename != output && resourceFilename != debug && resourceFilename != target && resourceFilename != erdjs-snippets && resourceFilename != interaction",
+					"command": "multiversx.runScenarios",
+					"when": "explorerResourceIsFolder && resourceFilename != output && resourceFilename != debug && resourceFilename != target && resourceFilename != js-snippets && resourceFilename != interaction",
 					"group": "multiversx"
 				},
 				{
@@ -199,7 +199,7 @@
 					"when": "false"
 				},
 				{
-					"command": "multiversx.runMandosTests",
+					"command": "multiversx.runScenarios",
 					"when": "false"
 				},
 				{
@@ -246,7 +246,7 @@
 					"when": "view == smartContracts && viewItem == contract"
 				},
 				{
-					"command": "multiversx.runMandosTests",
+					"command": "multiversx.runScenarios",
 					"when": "view == smartContracts && viewItem == contract"
 				},
 				{
@@ -263,9 +263,9 @@
 		"configuration": {
 			"title": "vscode-elrond-ide",
 			"properties": {
-				"multiversx.elrondsdk": {
+				"multiversx.sdkPath": {
 					"type": "string",
-					"default": "~/elrondsdk"
+					"default": "~/multiversx-sdk"
 				}
 			}
 		},

src/environment.ts

@@ -9,9 +9,9 @@ export class Environment {
             Environment.saveOld();
         }
 
-        let sdkPath = MySettings.getElrondSdk();
-        let erdpyEnvFolder = path.join(sdkPath, "erdpy-venv");
-        let erdpyBinFolder = path.join(erdpyEnvFolder, "bin");
+        let sdkPath = MySettings.getSdkPath();
+        let mxpyVenvFolder = path.join(sdkPath, "mxpy-venv");
+        let mxpyBinFolder = path.join(mxpyVenvFolder, "bin");
         let vmToolsFolder = path.join(sdkPath, "vmtools");
         let rustFolder = path.join(sdkPath, "vendor-rust");
         let rustBinFolder = path.join(rustFolder, "bin");
@@ -20,34 +20,34 @@ export class Environment {
 
         // This is required for other VS Code extensions to work well and use the custom (Rust) environment.
         delete process.env["PYTHONHOME"];
-        process.env["PATH"] = `${rustBinFolder}:${erdpyBinFolder}:${vmToolsFolder}:${nodeJsBinFolder}:${process.env["PATH"]}`;
-        process.env["VIRTUAL_ENV"] = erdpyEnvFolder;
+        process.env["PATH"] = `${rustBinFolder}:${mxpyBinFolder}:${vmToolsFolder}:${nodeJsBinFolder}:${process.env["PATH"]}`;
+        process.env["VIRTUAL_ENV"] = mxpyVenvFolder;
         process.env["RUSTUP_HOME"] = rustFolder;
         process.env["CARGO_HOME"] = rustFolder;
     }
 
     static getForVsCodeFiles(): any {
-        let sdkPath = path.join("${env:HOME}", MySettings.getElrondSdkRelativeToHome());
-        let erdpyEnvFolder = path.join(sdkPath, "erdpy-venv");
-        let erdpyBinFolder = path.join(erdpyEnvFolder, "bin");
+        let sdkPath = path.join("${env:HOME}", MySettings.getSdkPathRelativeToHome());
+        let mxpyVenvFolder = path.join(sdkPath, "mxpy-venv");
+        let mxpyBinFolder = path.join(mxpyVenvFolder, "bin");
         let vmToolsFolder = path.join(sdkPath, "vmtools");
         let rustFolder = path.join(sdkPath, "vendor-rust");
         let rustBinFolder = path.join(rustFolder, "bin");
         let nodeJsFolder = path.join(sdkPath, "nodejs", "latest");
         let nodeJsBinFolder = path.join(nodeJsFolder, "bin");
 
         return {
-            "PATH": `${rustBinFolder}:${erdpyBinFolder}:${vmToolsFolder}:${nodeJsBinFolder}:\${env:PATH}`,
-            "VIRTUAL_ENV": erdpyEnvFolder,
+            "PATH": `${rustBinFolder}:${mxpyBinFolder}:${vmToolsFolder}:${nodeJsBinFolder}:\${env:PATH}`,
+            "VIRTUAL_ENV": mxpyVenvFolder,
             "RUSTUP_HOME": rustFolder,
             "CARGO_HOME": rustFolder
         };
     }
 
     static getForTerminal(): any {
-        let sdkPath = path.join("${env:HOME}", MySettings.getElrondSdkRelativeToHome());
-        let erdpyEnvFolder = path.join(sdkPath, "erdpy-venv");
-        let erdpyBinFolder = path.join(erdpyEnvFolder, "bin");
+        let sdkPath = path.join("${env:HOME}", MySettings.getSdkPathRelativeToHome());
+        let mxpyVenvFolder = path.join(sdkPath, "mxpy-venv");
+        let mxpyBinFolder = path.join(mxpyVenvFolder, "bin");
         let vmToolsFolder = path.join(sdkPath, "vmtools");
         let rustFolder = path.join(sdkPath, "vendor-rust");
         let rustBinFolder = path.join(rustFolder, "bin");
@@ -56,8 +56,8 @@ export class Environment {
 
         return {
             "PYTHONHOME": null,
-            "PATH": `${rustBinFolder}:${erdpyBinFolder}:${vmToolsFolder}:${nodeJsBinFolder}:${process.env["PATH"]}`,
-            "VIRTUAL_ENV": erdpyEnvFolder,
+            "PATH": `${rustBinFolder}:${mxpyBinFolder}:${vmToolsFolder}:${nodeJsBinFolder}:${process.env["PATH"]}`,
+            "VIRTUAL_ENV": mxpyVenvFolder,
             "RUSTUP_HOME": rustFolder,
             "CARGO_HOME": rustFolder
         };

src/extension.ts

@@ -1,16 +1,16 @@
 import * as vscode from 'vscode';
-import { Root } from './root';
-import { Feedback } from './feedback';
-import * as sdk from "./sdk";
-import { TemplatesViewModel as TemplatesViewModel, ContractTemplate } from './templates';
-import * as workspace from "./workspace";
-import * as erdjsSnippets from "./erdjsSnippets";
-import * as presenter from "./presenter";
+import { Uri } from 'vscode';
+import { SmartContract, SmartContractsViewModel } from './contracts';
 import { Environment } from './environment';
+import * as javaScriptSnippets from "./javaScriptSnippets";
 import * as errors from './errors';
+import { Feedback } from './feedback';
+import * as presenter from "./presenter";
+import { Root } from './root';
+import * as sdk from "./sdk";
 import * as snippets from './snippets';
-import { SmartContractsViewModel, SmartContract } from './contracts';
-import { Uri } from 'vscode';
+import { ContractTemplate, TemplatesViewModel } from './templates';
+import * as workspace from "./workspace";
 import path = require("path");
 
 
@@ -31,7 +31,7 @@ export async function activate(context: vscode.ExtensionContext) {
 	vscode.commands.registerCommand("multiversx.gotoContract", gotoContract);
 	vscode.commands.registerCommand("multiversx.buildContract", buildContract);
 	vscode.commands.registerCommand("multiversx.runContractSnippet", runContractSnippet);
-	vscode.commands.registerCommand("multiversx.runMandosTests", runMandosTests);
+	vscode.commands.registerCommand("multiversx.runScenarios", runScenarios);
 	vscode.commands.registerCommand("multiversx.runFreshTestnet", runFreshTestnet);
 	vscode.commands.registerCommand("multiversx.resumeExistingTestnet", resumeExistingTestnet);
 	vscode.commands.registerCommand("multiversx.stopTestnet", stopTestnet);
@@ -41,7 +41,7 @@ export async function activate(context: vscode.ExtensionContext) {
 	vscode.commands.registerCommand("multiversx.newFromTemplate", newFromTemplate);
 	vscode.commands.registerCommand("multiversx.refreshContracts", async () => await refreshViewModel(contractsViewModel));
 
-	vscode.commands.registerCommand("multiversx.setupErdjsSnippets", setupErdjsSnippets);
+	vscode.commands.registerCommand("multiversx.setupJavaScriptSnippets", setupJavaScriptSnippets);
 
 	Environment.set();
 }
@@ -150,7 +150,7 @@ async function runContractSnippet(contract: any) {
 function getContractFolder(contract: any): string {
 	if (contract instanceof Uri) {
 		let fsPath = contract.fsPath;
-		if (fsPath.includes("elrond.json")) {
+		if (fsPath.includes("multiversx.json")) {
 			return path.dirname(fsPath);
 		} else if (fsPath.includes("snippets.sh")) {
 			return path.dirname(fsPath);
@@ -162,12 +162,12 @@ function getContractFolder(contract: any): string {
 	return (contract as SmartContract).getPath();
 }
 
-async function runMandosTests(item: any) {
+async function runScenarios(item: any) {
 	try {
 		if (item instanceof Uri) {
-			await sdk.runMandosTests(item.fsPath);
+			await sdk.runScenarios(item.fsPath);
 		} else {
-			await sdk.runMandosTests((item as SmartContract).getPath());
+			await sdk.runScenarios((item as SmartContract).getPath());
 		}
 	} catch (error) {
 		errors.caughtTopLevel(error);
@@ -203,9 +203,9 @@ async function ensureInstalledBuildchains() {
 	await sdk.ensureInstalledBuildchains(languages);
 }
 
-async function setupErdjsSnippets() {
-	let destinationFolder = await presenter.askOpenFolder(`Please select a destination for "erdjs-snippets":`);
+async function setupJavaScriptSnippets() {
+	let destinationFolder = await presenter.askOpenFolder(`Please select a destination for "js-snippets":`);
 	if (destinationFolder) {
-		await erdjsSnippets.setup(destinationFolder);
+		await javaScriptSnippets.setup(destinationFolder);
 	}
 }

src/presenter.ts

@@ -32,18 +32,18 @@ For a better experience when debugging Smart Contracts, we recommed allowing thi
     return answer;
 }
 
-export async function askInstallErdpy(requiredVersion: Version): Promise<boolean> {
-    let answer = await askYesNo(`MultiversX IDE requires erdpy ${requiredVersion}, which isn't available in your environment.
+export async function askInstallMxpy(requiredVersion: Version): Promise<boolean> {
+    let answer = await askYesNo(`MultiversX IDE requires mxpy ${requiredVersion}, which isn't available in your environment.
 Do you agree to install it?`);
     return answer;
 }
 
-export async function askErdpyVersion(defaultVersion: Version): Promise<Version> {
+export async function askMxpyVersion(defaultVersion: Version): Promise<Version> {
     const result = await vscode.window.showInputBox({
-        prompt: "Enter the erdpy version to install",
+        prompt: "Enter the mxpy version to install",
         value: defaultVersion.toString(),
         ignoreFocusOut: true,
-        placeHolder: "For example: 1.0.0",
+        placeHolder: "For example: 5.6.7",
         validateInput: text => {
             return text.length > 0 ? null : "Should not be empty.";
         }
@@ -56,8 +56,8 @@ export async function askErdpyVersion(defaultVersion: Version): Promise<Version>
     return Version.parse(result);
 }
 
-export async function askInstallErdpyGroup(group: string): Promise<boolean> {
-    let answer = await askYesNo(`It seems that your workspace requires the dependency group "${group}", which isn't available in your erdpy environment.
+export async function askInstallMxpyGroup(group: string): Promise<boolean> {
+    let answer = await askYesNo(`It seems that your workspace requires the dependency group "${group}", which isn't available in your environment.
 Do you agree to install it?`);
     return answer;
 }