From 3514b95caf22bdaaaa3b92f7cca83a7e3a0cdc1b Mon Sep 17 00:00:00 2001 From: Michael Weichert Date: Thu, 5 Oct 2023 14:01:49 -0400 Subject: [PATCH] Ensure that LIGO tests pass for legacy plugin. Related to #1909 --- lerna.json | 2 +- package-lock.json | 98 ++++++------ package.json | 2 +- taqueria-analytics/package.json | 4 +- taqueria-lib-ligo/package.json | 4 +- taqueria-plugin-archetype/package.json | 4 +- taqueria-plugin-contract-types/package.json | 4 +- taqueria-plugin-core/package.json | 4 +- taqueria-plugin-flextesa/package.json | 6 +- taqueria-plugin-ipfs-pinata/package.json | 4 +- taqueria-plugin-jest/package.json | 6 +- taqueria-plugin-ligo-legacy/package.json | 6 +- taqueria-plugin-ligo/package.json | 6 +- taqueria-plugin-metadata/package.json | 6 +- taqueria-plugin-mock/package.json | 4 +- taqueria-plugin-octez-client/package.json | 4 +- taqueria-plugin-smartpy-legacy/package.json | 4 +- taqueria-plugin-smartpy/package.json | 4 +- taqueria-plugin-taquito/package.json | 4 +- taqueria-protocol/package.json | 2 +- taqueria-sdk/package.json | 4 +- taqueria-toolkit/package.json | 4 +- taqueria-vscode-extension-web-ui/package.json | 2 +- taqueria-vscode-extension/package.json | 6 +- tests/e2e/cli-e2e-smoke-tests.spec.ts | 4 +- .../cli-persistent-state-e2e-tests.spec.ts | 8 +- .../contract-types-plugin-e2e-tests.spec.ts | 8 +- .../C.parameterList.mligo | 0 .../C.storageList.mligo | 0 .../Counter.parameterList.mligo | 0 .../Counter.storageList.mligo | 0 .../IncDec.jsligo | 0 .../IncDec.parameterList.jsligo | 0 .../IncDec.storageList.jsligo | 0 .../{ligo-data => ligo-legacy-data}/IncDec.tz | 0 .../MultipleContracts.mligo | 0 .../counter-main.mligo | 0 .../counter-main.parameterList.mligo | 0 .../counter-main.storageList.mligo | 0 .../counter-module-main.mligo | 0 .../counter.storageList.mligo | 0 .../entry-module.mligo | 0 .../entry.jsligo | 0 .../entry.parameterList.jsligo | 0 .../entry.storageList.jsligo | 0 .../expected-Counter.parameterList.mligo | 0 .../expected-IncDec.parameterList.jsligo | 0 .../expected-counter-main.parameterList.mligo | 0 .../expected-entry.parameterList.jsligo | 0 .../hello-tacos-invalid-tests.mligo | 0 .../hello-tacos-tests.mligo | 0 .../hello-tacos.mligo | 0 .../hello-tacos.parameters.mligo | 0 .../importer.mligo | 0 .../increment.jsligo | 0 .../invalid-contract.mligo | 0 .../math-helpers.mligo | 0 .../pokeGame.jsligo | 0 ...okeGame.parameterList-with-comments.jsligo | 0 .../pokeGame.parameterList.jsligo | 0 .../pokeGame.storageList-with-comments.jsligo | 0 .../pokeGame.storageList.jsligo | 0 .../unit_pokeGame.jsligo | 0 ...s => ligo-legacy-plugin-e2e-tests.spec.ts} | 149 +++++++++--------- .../marigold-training-e2e-smoke-test.spec.ts | 14 +- tests/e2e/metadata-plugin-e2e-tests.spec.ts | 6 +- tests/package.json | 2 +- 67 files changed, 195 insertions(+), 190 deletions(-) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/C.parameterList.mligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/C.storageList.mligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/Counter.parameterList.mligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/Counter.storageList.mligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/IncDec.jsligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/IncDec.parameterList.jsligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/IncDec.storageList.jsligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/IncDec.tz (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/MultipleContracts.mligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/counter-main.mligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/counter-main.parameterList.mligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/counter-main.storageList.mligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/counter-module-main.mligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/counter.storageList.mligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/entry-module.mligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/entry.jsligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/entry.parameterList.jsligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/entry.storageList.jsligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/expected-Counter.parameterList.mligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/expected-IncDec.parameterList.jsligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/expected-counter-main.parameterList.mligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/expected-entry.parameterList.jsligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/hello-tacos-invalid-tests.mligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/hello-tacos-tests.mligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/hello-tacos.mligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/hello-tacos.parameters.mligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/importer.mligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/increment.jsligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/invalid-contract.mligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/math-helpers.mligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/pokeGame.jsligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/pokeGame.parameterList-with-comments.jsligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/pokeGame.parameterList.jsligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/pokeGame.storageList-with-comments.jsligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/pokeGame.storageList.jsligo (100%) rename tests/e2e/data/{ligo-data => ligo-legacy-data}/unit_pokeGame.jsligo (100%) rename tests/e2e/{ligo-plugin-e2e-tests.spec.ts => ligo-legacy-plugin-e2e-tests.spec.ts} (90%) diff --git a/lerna.json b/lerna.json index 5bd400b1e..94d7b796a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "0.40.12", + "version": "0.40.13", "packages": [ "taqueria-protocol", "taqueria-lib*", diff --git a/package-lock.json b/package-lock.json index ad4780552..55d81f3a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@taqueria/root", - "version": "0.40.12", + "version": "0.40.13", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@taqueria/root", - "version": "0.40.12", + "version": "0.40.13", "license": "Apache-2.0", "workspaces": [ "./taqueria-protocol", @@ -23108,10 +23108,10 @@ }, "taqueria-analytics": { "name": "@taqueria/analytics", - "version": "0.40.12", + "version": "0.40.13", "license": "Apache-2.0", "dependencies": { - "@taqueria/protocol": "^0.40.12", + "@taqueria/protocol": "^0.40.13", "node-machine-id-xz": "^1.0.2" }, "devDependencies": { @@ -23121,10 +23121,10 @@ }, "taqueria-lib-ligo": { "name": "@taqueria/lib-ligo", - "version": "0.40.12", + "version": "0.40.13", "license": "Apache-2.0", "dependencies": { - "@taqueria/node-sdk": "^0.40.12", + "@taqueria/node-sdk": "^0.40.13", "fast-glob": "^3.3.1" }, "devDependencies": { @@ -23134,10 +23134,10 @@ }, "taqueria-plugin-archetype": { "name": "@taqueria/plugin-archetype", - "version": "0.40.12", + "version": "0.40.13", "license": "Apache-2.0", "dependencies": { - "@taqueria/node-sdk": "^0.40.12", + "@taqueria/node-sdk": "^0.40.13", "fast-glob": "^3.3.1", "ts-pattern": "^5.0.5" }, @@ -23148,10 +23148,10 @@ }, "taqueria-plugin-contract-types": { "name": "@taqueria/plugin-contract-types", - "version": "0.40.12", + "version": "0.40.13", "license": "ISC", "dependencies": { - "@taqueria/node-sdk": "^0.40.12", + "@taqueria/node-sdk": "^0.40.13", "@taquito/michel-codec": "^17.3.1", "@taquito/signer": "^17.3.1", "@taquito/taquito": "^17.3.1", @@ -23252,10 +23252,10 @@ }, "taqueria-plugin-core": { "name": "@taqueria/plugin-core", - "version": "0.40.12", + "version": "0.40.13", "license": "Apache-2.0", "dependencies": { - "@taqueria/node-sdk": "^0.40.12" + "@taqueria/node-sdk": "^0.40.13" }, "devDependencies": { "tsup": "^7.2.0", @@ -23267,11 +23267,11 @@ }, "taqueria-plugin-flextesa": { "name": "@taqueria/plugin-flextesa", - "version": "0.40.12", + "version": "0.40.13", "license": "Apache-2.0", "dependencies": { - "@taqueria/node-sdk": "^0.40.12", - "@taqueria/protocol": "^0.40.12", + "@taqueria/node-sdk": "^0.40.13", + "@taqueria/protocol": "^0.40.13", "async-retry": "^1.3.3", "fast-glob": "^3.2.12", "portfinder": "^1.0.32", @@ -23285,11 +23285,11 @@ }, "taqueria-plugin-ipfs-pinata": { "name": "@taqueria/plugin-ipfs-pinata", - "version": "0.40.12", + "version": "0.40.13", "license": "Apache-2.0", "dependencies": { "@helia/unixfs": "^1.4.2", - "@taqueria/node-sdk": "^0.40.12", + "@taqueria/node-sdk": "^0.40.13", "dotenv": "^16.3.1", "form-data": "^4.0.0", "helia": "^2.0.3", @@ -23303,11 +23303,11 @@ }, "taqueria-plugin-jest": { "name": "@taqueria/plugin-jest", - "version": "0.40.12", + "version": "0.40.13", "license": "Apache-2.0", "dependencies": { - "@taqueria/node-sdk": "^0.40.12", - "@taqueria/plugin-contract-types": "^0.40.12", + "@taqueria/node-sdk": "^0.40.13", + "@taqueria/plugin-contract-types": "^0.40.13", "@taquito/signer": "^17.3.1", "@taquito/taquito": "^17.3.1", "@taquito/utils": "^17.3.1", @@ -23408,11 +23408,11 @@ }, "taqueria-plugin-ligo": { "name": "@taqueria/plugin-ligo", - "version": "0.40.12", + "version": "0.40.13", "license": "Apache-2.0", "dependencies": { - "@taqueria/lib-ligo": "^0.40.12", - "@taqueria/node-sdk": "^0.40.12", + "@taqueria/lib-ligo": "^0.40.13", + "@taqueria/node-sdk": "^0.40.13", "fast-glob": "^3.3.1" }, "devDependencies": { @@ -23422,11 +23422,11 @@ }, "taqueria-plugin-ligo-legacy": { "name": "@taqueria/plugin-ligo-legacy", - "version": "0.40.12", + "version": "0.40.13", "license": "Apache-2.0", "dependencies": { - "@taqueria/lib-ligo": "^0.40.12", - "@taqueria/node-sdk": "^0.40.12", + "@taqueria/lib-ligo": "^0.40.13", + "@taqueria/node-sdk": "^0.40.13", "fast-glob": "^3.3.1" }, "devDependencies": { @@ -23436,11 +23436,11 @@ }, "taqueria-plugin-metadata": { "name": "@taqueria/plugin-metadata", - "version": "0.40.12", + "version": "0.40.13", "license": "Apache-2.0", "dependencies": { - "@taqueria/node-sdk": "^0.40.12", - "@taqueria/protocol": "^0.40.12", + "@taqueria/node-sdk": "^0.40.13", + "@taqueria/protocol": "^0.40.13", "prompts": "^2.4.2" }, "devDependencies": { @@ -23451,18 +23451,18 @@ }, "taqueria-plugin-mock": { "name": "@taqueria/plugin-mock", - "version": "0.40.12", + "version": "0.40.13", "license": "Apache-2.0", "dependencies": { - "@taqueria/node-sdk": "^0.40.12" + "@taqueria/node-sdk": "^0.40.13" } }, "taqueria-plugin-octez-client": { "name": "@taqueria/plugin-octez-client", - "version": "0.40.12", + "version": "0.40.13", "license": "Apache-2.0", "dependencies": { - "@taqueria/node-sdk": "^0.40.12", + "@taqueria/node-sdk": "^0.40.13", "fast-glob": "^3.3.1" }, "devDependencies": { @@ -23475,10 +23475,10 @@ }, "taqueria-plugin-smartpy": { "name": "@taqueria/plugin-smartpy", - "version": "0.40.12", + "version": "0.40.13", "license": "Apache-2.0", "dependencies": { - "@taqueria/node-sdk": "^0.40.12", + "@taqueria/node-sdk": "^0.40.13", "fast-glob": "^3.3.1" }, "devDependencies": { @@ -23491,10 +23491,10 @@ }, "taqueria-plugin-smartpy-legacy": { "name": "@taqueria/plugin-smartpy-legacy", - "version": "0.40.12", + "version": "0.40.13", "license": "Apache-2.0", "dependencies": { - "@taqueria/node-sdk": "^0.40.12", + "@taqueria/node-sdk": "^0.40.13", "fast-glob": "^3.3.1" }, "devDependencies": { @@ -23507,10 +23507,10 @@ }, "taqueria-plugin-taquito": { "name": "@taqueria/plugin-taquito", - "version": "0.40.12", + "version": "0.40.13", "license": "Apache-2.0", "dependencies": { - "@taqueria/node-sdk": "^0.40.12", + "@taqueria/node-sdk": "^0.40.13", "@taquito/michel-codec": "^17.3.1", "@taquito/signer": "^17.3.1", "@taquito/taquito": "^17.3.1", @@ -23608,7 +23608,7 @@ }, "taqueria-protocol": { "name": "@taqueria/protocol", - "version": "0.40.12", + "version": "0.40.13", "license": "Apache-2.0", "dependencies": { "@peculiar/webcrypto": "^1.4.3", @@ -23633,10 +23633,10 @@ }, "taqueria-sdk": { "name": "@taqueria/node-sdk", - "version": "0.40.12", + "version": "0.40.13", "license": "Apache-2.0", "dependencies": { - "@taqueria/protocol": "^0.40.12", + "@taqueria/protocol": "^0.40.13", "@taquito/signer": "^17.3.1", "@taquito/taquito": "^17.3.1", "@taquito/utils": "^17.3.1", @@ -23746,10 +23746,10 @@ }, "taqueria-toolkit": { "name": "@taqueria/toolkit", - "version": "0.40.12", + "version": "0.40.13", "license": "Apache-2.0", "dependencies": { - "@taqueria/protocol": "^0.40.12", + "@taqueria/protocol": "^0.40.13", "cross-spawn": "^7.0.3", "yargs": "^17.7.2" }, @@ -23766,12 +23766,12 @@ }, "taqueria-vscode-extension": { "name": "taqueria", - "version": "0.40.12", + "version": "0.40.13", "license": "Apache-2.0", "dependencies": { "@microsoft/signalr": "^6.0.18", - "@taqueria/analytics": "^0.40.12", - "@taqueria/protocol": "^0.40.12", + "@taqueria/analytics": "^0.40.13", + "@taqueria/protocol": "^0.40.13", "cli-table3": "^0.6.3", "comment-json": "^4.2.3", "eventsource": "^2.0.2", @@ -23803,7 +23803,7 @@ } }, "taqueria-vscode-extension-web-ui": { - "version": "0.40.12", + "version": "0.40.13", "dependencies": { "@taquito/michel-codec": "^17.3.1", "@taquito/michelson-encoder": "^17.3.1", @@ -23890,7 +23890,7 @@ }, "tests": { "name": "@taqueria/tests", - "version": "0.40.12", + "version": "0.40.13", "license": "MIT", "devDependencies": { "@gmrchk/cli-testing-library": "^0.1.2", diff --git a/package.json b/package.json index e2dc8268a..93d0f5076 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@taqueria/root", - "version": "0.40.12", + "version": "0.40.13", "description": "An easy to use opinionated tool for building, testing, and deploying Tezos software", "main": "index.ts", "directories": { diff --git a/taqueria-analytics/package.json b/taqueria-analytics/package.json index c8d68dbc4..ce8d5852c 100644 --- a/taqueria-analytics/package.json +++ b/taqueria-analytics/package.json @@ -1,6 +1,6 @@ { "name": "@taqueria/analytics", - "version": "0.40.12", + "version": "0.40.13", "description": "A TypeScript SDK submitting events for Taqueria activity", "main": "./index.js", "source": "./index.ts", @@ -35,7 +35,7 @@ }, "homepage": "https://github.com/pinnacle-labs/taqueria#readme", "dependencies": { - "@taqueria/protocol": "^0.40.12", + "@taqueria/protocol": "^0.40.13", "node-machine-id-xz": "^1.0.2" }, "devDependencies": { diff --git a/taqueria-lib-ligo/package.json b/taqueria-lib-ligo/package.json index 1e8ba75f2..9ec52027b 100644 --- a/taqueria-lib-ligo/package.json +++ b/taqueria-lib-ligo/package.json @@ -1,6 +1,6 @@ { "name": "@taqueria/lib-ligo", - "version": "0.40.12", + "version": "0.40.13", "description": "A taqueria library which provides common functionality for the LIGO and LIGO Legacy Plugins", "targets": { "default": { @@ -41,7 +41,7 @@ }, "homepage": "https://github.com/pinnacle-labs/taqueria#readme", "dependencies": { - "@taqueria/node-sdk": "^0.40.12", + "@taqueria/node-sdk": "^0.40.13", "fast-glob": "^3.3.1" }, "devDependencies": { diff --git a/taqueria-plugin-archetype/package.json b/taqueria-plugin-archetype/package.json index 3ae5ef16d..f5b933cc9 100644 --- a/taqueria-plugin-archetype/package.json +++ b/taqueria-plugin-archetype/package.json @@ -1,6 +1,6 @@ { "name": "@taqueria/plugin-archetype", - "version": "0.40.12", + "version": "0.40.13", "description": "A taqueria plugin for compiling Archetype smart contracts", "targets": { "default": { @@ -40,7 +40,7 @@ }, "homepage": "https://github.com/pinnacle-labs/taqueria#readme", "dependencies": { - "@taqueria/node-sdk": "^0.40.12", + "@taqueria/node-sdk": "^0.40.13", "fast-glob": "^3.3.1", "ts-pattern": "^5.0.5" }, diff --git a/taqueria-plugin-contract-types/package.json b/taqueria-plugin-contract-types/package.json index fa2752128..ada0200c4 100644 --- a/taqueria-plugin-contract-types/package.json +++ b/taqueria-plugin-contract-types/package.json @@ -1,6 +1,6 @@ { "name": "@taqueria/plugin-contract-types", - "version": "0.40.12", + "version": "0.40.13", "main": "index.cjs", "module": "index.js", "source": "index.ts", @@ -34,7 +34,7 @@ "typescript": "^5.2.2" }, "dependencies": { - "@taqueria/node-sdk": "^0.40.12", + "@taqueria/node-sdk": "^0.40.13", "@taquito/michel-codec": "^17.3.1", "@taquito/signer": "^17.3.1", "@taquito/taquito": "^17.3.1", diff --git a/taqueria-plugin-core/package.json b/taqueria-plugin-core/package.json index bd0e1cc78..ea20e907b 100644 --- a/taqueria-plugin-core/package.json +++ b/taqueria-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@taqueria/plugin-core", - "version": "0.40.12", + "version": "0.40.13", "description": "A taqueria plugin for core tasks", "targets": { "default": { @@ -43,7 +43,7 @@ "typescript": "^5.2.2" }, "dependencies": { - "@taqueria/node-sdk": "^0.40.12" + "@taqueria/node-sdk": "^0.40.13" }, "tsup": { "entry": [ diff --git a/taqueria-plugin-flextesa/package.json b/taqueria-plugin-flextesa/package.json index 925171d9e..e98ec7a8d 100644 --- a/taqueria-plugin-flextesa/package.json +++ b/taqueria-plugin-flextesa/package.json @@ -1,6 +1,6 @@ { "name": "@taqueria/plugin-flextesa", - "version": "0.40.12", + "version": "0.40.13", "description": "A plugin for Taqueria providing local sandbox capabilities built on Flextesa", "keywords": [ "taqueria", @@ -34,8 +34,8 @@ "directory": "taqueria-plugin-flextesa" }, "dependencies": { - "@taqueria/node-sdk": "^0.40.12", - "@taqueria/protocol": "^0.40.12", + "@taqueria/node-sdk": "^0.40.13", + "@taqueria/protocol": "^0.40.13", "async-retry": "^1.3.3", "fast-glob": "^3.2.12", "portfinder": "^1.0.32", diff --git a/taqueria-plugin-ipfs-pinata/package.json b/taqueria-plugin-ipfs-pinata/package.json index 6ba6d39c1..674729de6 100644 --- a/taqueria-plugin-ipfs-pinata/package.json +++ b/taqueria-plugin-ipfs-pinata/package.json @@ -1,6 +1,6 @@ { "name": "@taqueria/plugin-ipfs-pinata", - "version": "0.40.12", + "version": "0.40.13", "description": "A plugin for Taqueria providing ipfs publishing and pinning using the Pinata service", "keywords": [ "taqueria", @@ -34,7 +34,7 @@ }, "dependencies": { "@helia/unixfs": "^1.4.2", - "@taqueria/node-sdk": "^0.40.12", + "@taqueria/node-sdk": "^0.40.13", "dotenv": "^16.3.1", "form-data": "^4.0.0", "helia": "^2.0.3", diff --git a/taqueria-plugin-jest/package.json b/taqueria-plugin-jest/package.json index a4653f320..b81736e1b 100644 --- a/taqueria-plugin-jest/package.json +++ b/taqueria-plugin-jest/package.json @@ -1,6 +1,6 @@ { "name": "@taqueria/plugin-jest", - "version": "0.40.12", + "version": "0.40.13", "main": "index.cjs", "module": "index.js", "source": "index.ts", @@ -27,8 +27,8 @@ "directory": "taqueria-plugin-jest" }, "dependencies": { - "@taqueria/node-sdk": "^0.40.12", - "@taqueria/plugin-contract-types": "^0.40.12", + "@taqueria/node-sdk": "^0.40.13", + "@taqueria/plugin-contract-types": "^0.40.13", "@taquito/signer": "^17.3.1", "@taquito/taquito": "^17.3.1", "@taquito/utils": "^17.3.1", diff --git a/taqueria-plugin-ligo-legacy/package.json b/taqueria-plugin-ligo-legacy/package.json index a2cf5b1c4..892d2dd88 100644 --- a/taqueria-plugin-ligo-legacy/package.json +++ b/taqueria-plugin-ligo-legacy/package.json @@ -1,6 +1,6 @@ { "name": "@taqueria/plugin-ligo-legacy", - "version": "0.40.12", + "version": "0.40.13", "description": "A taqueria plugin for compiling LIGO smart contracts that target LIGO v0.73.0 and earlier.", "targets": { "default": { @@ -41,8 +41,8 @@ }, "homepage": "https://github.com/pinnacle-labs/taqueria#readme", "dependencies": { - "@taqueria/lib-ligo": "^0.40.12", - "@taqueria/node-sdk": "^0.40.12", + "@taqueria/lib-ligo": "^0.40.13", + "@taqueria/node-sdk": "^0.40.13", "fast-glob": "^3.3.1" }, "devDependencies": { diff --git a/taqueria-plugin-ligo/package.json b/taqueria-plugin-ligo/package.json index 1e1d44d81..f91c4b79d 100644 --- a/taqueria-plugin-ligo/package.json +++ b/taqueria-plugin-ligo/package.json @@ -1,6 +1,6 @@ { "name": "@taqueria/plugin-ligo", - "version": "0.40.12", + "version": "0.40.13", "description": "A taqueria plugin for compiling LIGO smart contracts", "targets": { "default": { @@ -41,8 +41,8 @@ }, "homepage": "https://github.com/pinnacle-labs/taqueria#readme", "dependencies": { - "@taqueria/lib-ligo": "^0.40.12", - "@taqueria/node-sdk": "^0.40.12", + "@taqueria/lib-ligo": "^0.40.13", + "@taqueria/node-sdk": "^0.40.13", "fast-glob": "^3.3.1" }, "devDependencies": { diff --git a/taqueria-plugin-metadata/package.json b/taqueria-plugin-metadata/package.json index 67464c0ee..2e132cdd4 100644 --- a/taqueria-plugin-metadata/package.json +++ b/taqueria-plugin-metadata/package.json @@ -1,6 +1,6 @@ { "name": "@taqueria/plugin-metadata", - "version": "0.40.12", + "version": "0.40.13", "description": "A plugin for Taqueria providing metadata creation and validation.", "keywords": [ "taqueria", @@ -31,8 +31,8 @@ "directory": "taqueria-plugin-metadata" }, "dependencies": { - "@taqueria/node-sdk": "^0.40.12", - "@taqueria/protocol": "^0.40.12", + "@taqueria/node-sdk": "^0.40.13", + "@taqueria/protocol": "^0.40.13", "prompts": "^2.4.2" }, "devDependencies": { diff --git a/taqueria-plugin-mock/package.json b/taqueria-plugin-mock/package.json index 699c60929..d5fbb2d98 100644 --- a/taqueria-plugin-mock/package.json +++ b/taqueria-plugin-mock/package.json @@ -1,6 +1,6 @@ { "name": "@taqueria/plugin-mock", - "version": "0.40.12", + "version": "0.40.13", "description": "A plugin used to test Taqueria", "private": true, "scripts": { @@ -23,6 +23,6 @@ }, "homepage": "https://github.com/pinnacle-labs/taqueria#readme", "dependencies": { - "@taqueria/node-sdk": "^0.40.12" + "@taqueria/node-sdk": "^0.40.13" } } diff --git a/taqueria-plugin-octez-client/package.json b/taqueria-plugin-octez-client/package.json index 314d38313..646fa4e86 100644 --- a/taqueria-plugin-octez-client/package.json +++ b/taqueria-plugin-octez-client/package.json @@ -1,6 +1,6 @@ { "name": "@taqueria/plugin-octez-client", - "version": "0.40.12", + "version": "0.40.13", "description": "A taqueria plugin for utilizing octez-client", "targets": { "default": { @@ -41,7 +41,7 @@ }, "homepage": "https://github.com/pinnacle-labs/taqueria#readme", "dependencies": { - "@taqueria/node-sdk": "^0.40.12", + "@taqueria/node-sdk": "^0.40.13", "fast-glob": "^3.3.1" }, "devDependencies": { diff --git a/taqueria-plugin-smartpy-legacy/package.json b/taqueria-plugin-smartpy-legacy/package.json index 1528091b7..1e6c026a5 100644 --- a/taqueria-plugin-smartpy-legacy/package.json +++ b/taqueria-plugin-smartpy-legacy/package.json @@ -1,6 +1,6 @@ { "name": "@taqueria/plugin-smartpy-legacy", - "version": "0.40.12", + "version": "0.40.13", "description": "A taqueria plugin for compiling SmartPy smart contracts using SmartPy v0.16 (legacy syntax).", "targets": { "default": { @@ -51,7 +51,7 @@ }, "homepage": "https://github.com/pinnacle-labs/taqueria#readme", "dependencies": { - "@taqueria/node-sdk": "^0.40.12", + "@taqueria/node-sdk": "^0.40.13", "fast-glob": "^3.3.1" }, "devDependencies": { diff --git a/taqueria-plugin-smartpy/package.json b/taqueria-plugin-smartpy/package.json index 025d73a59..c5d420ebd 100644 --- a/taqueria-plugin-smartpy/package.json +++ b/taqueria-plugin-smartpy/package.json @@ -1,6 +1,6 @@ { "name": "@taqueria/plugin-smartpy", - "version": "0.40.12", + "version": "0.40.13", "description": "A taqueria plugin used to test and compile smart contracts written in SmartPy.", "main": "index.js", "tag": "next", @@ -43,7 +43,7 @@ }, "homepage": "https://github.com/pinnacle-labs/taqueria#readme", "dependencies": { - "@taqueria/node-sdk": "^0.40.12", + "@taqueria/node-sdk": "^0.40.13", "fast-glob": "^3.3.1" }, "devDependencies": { diff --git a/taqueria-plugin-taquito/package.json b/taqueria-plugin-taquito/package.json index 24761a75b..3326daf9b 100644 --- a/taqueria-plugin-taquito/package.json +++ b/taqueria-plugin-taquito/package.json @@ -1,6 +1,6 @@ { "name": "@taqueria/plugin-taquito", - "version": "0.40.12", + "version": "0.40.13", "description": "A taqueria plugin for originating smart contracts using Taquito", "targets": { "default": { @@ -42,7 +42,7 @@ }, "homepage": "https://github.com/pinnacle-labs/taqueria#readme", "dependencies": { - "@taqueria/node-sdk": "^0.40.12", + "@taqueria/node-sdk": "^0.40.13", "@taquito/michel-codec": "^17.3.1", "@taquito/signer": "^17.3.1", "@taquito/taquito": "^17.3.1", diff --git a/taqueria-protocol/package.json b/taqueria-protocol/package.json index d796e6428..4a2bd4a80 100644 --- a/taqueria-protocol/package.json +++ b/taqueria-protocol/package.json @@ -1,6 +1,6 @@ { "name": "@taqueria/protocol", - "version": "0.40.12", + "version": "0.40.13", "description": "A TypeScript package which contains types that are to be shared between @taqueria/node-sdk and @taqueria/taqueria.", "main": "index.js", "scripts": { diff --git a/taqueria-sdk/package.json b/taqueria-sdk/package.json index 4f9fb87f1..8d7364a52 100644 --- a/taqueria-sdk/package.json +++ b/taqueria-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@taqueria/node-sdk", - "version": "0.40.12", + "version": "0.40.13", "description": "A TypeScript SDK for NodeJS used for Taqueria plugin development.", "main": "./index.js", "source": "./index.ts", @@ -34,7 +34,7 @@ }, "homepage": "https://github.com/pinnacle-labs/taqueria#readme", "dependencies": { - "@taqueria/protocol": "^0.40.12", + "@taqueria/protocol": "^0.40.13", "@taquito/signer": "^17.3.1", "@taquito/taquito": "^17.3.1", "@taquito/utils": "^17.3.1", diff --git a/taqueria-toolkit/package.json b/taqueria-toolkit/package.json index 23aaabdd0..29f801d72 100644 --- a/taqueria-toolkit/package.json +++ b/taqueria-toolkit/package.json @@ -1,6 +1,6 @@ { "name": "@taqueria/toolkit", - "version": "0.40.12", + "version": "0.40.13", "description": "A TypeScript library for NodeJS to work with Taqueria projects", "source": "./index.ts", "main": "./index.js", @@ -37,7 +37,7 @@ "typescript": "^5.2.2" }, "dependencies": { - "@taqueria/protocol": "^0.40.12", + "@taqueria/protocol": "^0.40.13", "cross-spawn": "^7.0.3", "yargs": "^17.7.2" }, diff --git a/taqueria-vscode-extension-web-ui/package.json b/taqueria-vscode-extension-web-ui/package.json index eba3ea9c1..09ec78914 100644 --- a/taqueria-vscode-extension-web-ui/package.json +++ b/taqueria-vscode-extension-web-ui/package.json @@ -1,7 +1,7 @@ { "name": "taqueria-vscode-extension-web-ui", "private": true, - "version": "0.40.12", + "version": "0.40.13", "type": "module", "scripts": { "dev": "vite", diff --git a/taqueria-vscode-extension/package.json b/taqueria-vscode-extension/package.json index 4b8298b97..59abaa0eb 100644 --- a/taqueria-vscode-extension/package.json +++ b/taqueria-vscode-extension/package.json @@ -3,7 +3,7 @@ "displayName": "Taqueria (by Pinnacle Labs)", "description": "A better way to build on Tezos", "publisher": "PinnacleLabs", - "version": "0.40.12", + "version": "0.40.13", "private": true, "engines": { "vscode": "^1.82.0" @@ -726,8 +726,8 @@ }, "dependencies": { "@microsoft/signalr": "^6.0.18", - "@taqueria/analytics": "^0.40.12", - "@taqueria/protocol": "^0.40.12", + "@taqueria/analytics": "^0.40.13", + "@taqueria/protocol": "^0.40.13", "cli-table3": "^0.6.3", "comment-json": "^4.2.3", "eventsource": "^2.0.2", diff --git a/tests/e2e/cli-e2e-smoke-tests.spec.ts b/tests/e2e/cli-e2e-smoke-tests.spec.ts index 67f5d425e..e6504dcc7 100644 --- a/tests/e2e/cli-e2e-smoke-tests.spec.ts +++ b/tests/e2e/cli-e2e-smoke-tests.spec.ts @@ -73,9 +73,9 @@ describe('Smoke Test E2E Testing for Taqueria CLI,', () => { const { stdout: stdout1 } = await execute('taq', 'install ../taqueria-plugin-jest', './test-project'); expect(stdout1).toEqual(expect.arrayContaining(['Plugin installed successfully'])); - const mligo_file = await (await exec('cat e2e/data/ligo-data/hello-tacos.mligo')).stdout; + const mligo_file = await (await exec('cat e2e/data/ligo-legacy-data/hello-tacos.mligo')).stdout; await writeFile('./test-project/contracts/hello-tacos.mligo', mligo_file); - const tests_file = await (await exec('cat e2e/data/ligo-data/hello-tacos-tests.mligo')).stdout; + const tests_file = await (await exec('cat e2e/data/ligo-legacy-data/hello-tacos-tests.mligo')).stdout; await writeFile('./test-project/contracts/hello-tacos-tests.mligo', tests_file); const { stderr } = await execute('taq', 'test hello-tacos-tests.mligo', './test-project/'); diff --git a/tests/e2e/cli-persistent-state-e2e-tests.spec.ts b/tests/e2e/cli-persistent-state-e2e-tests.spec.ts index af52a5c5a..a174002ab 100644 --- a/tests/e2e/cli-persistent-state-e2e-tests.spec.ts +++ b/tests/e2e/cli-persistent-state-e2e-tests.spec.ts @@ -11,7 +11,7 @@ describe('Persistent State E2E Tests for Taqueria CLI', () => { const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); expect(stdout).toContain('Plugin installed successfully'); - const mligo_file = await (await exec('cat e2e/data/ligo-data/hello-tacos.mligo')).stdout; + const mligo_file = await (await exec('cat e2e/data/ligo-legacy-data/hello-tacos.mligo')).stdout; writeFile('./test-project/contracts/hello-tacos.mligo', mligo_file); await execute('taq', 'compile hello-tacos.mligo', './test-project'); @@ -30,7 +30,7 @@ describe('Persistent State E2E Tests for Taqueria CLI', () => { const config_file = await (await exec('cat e2e/data/config-data/config-without-default-environment.json')).stdout; writeFile('./test-project/.taq/config.json', config_file); - const mligo_file = await (await exec('cat e2e/data/ligo-data/hello-tacos.mligo')).stdout; + const mligo_file = await (await exec('cat e2e/data/ligo-legacy-data/hello-tacos.mligo')).stdout; writeFile('./test-project/contracts/hello-tacos.mligo', mligo_file); await execute('taq', 'compile hello-tacos.mligo', './test-project'); @@ -49,7 +49,7 @@ describe('Persistent State E2E Tests for Taqueria CLI', () => { const config_file = await (await exec('cat e2e/data/config-data/config-default-environment-testing.json')).stdout; writeFile('./test-project/.taq/config.json', config_file); - const mligo_file = await (await exec('cat e2e/data/ligo-data/hello-tacos.mligo')).stdout; + const mligo_file = await (await exec('cat e2e/data/ligo-legacy-data/hello-tacos.mligo')).stdout; writeFile('./test-project/contracts/hello-tacos.mligo', mligo_file); await execute('taq', 'compile hello-tacos.mligo', './test-project'); @@ -67,7 +67,7 @@ describe('Persistent State E2E Tests for Taqueria CLI', () => { const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); expect(stdout).toContain('Plugin installed successfully'); - const mligo_file = await (await exec('cat e2e/data/ligo-data/hello-tacos.mligo')).stdout; + const mligo_file = await (await exec('cat e2e/data/ligo-legacy-data/hello-tacos.mligo')).stdout; writeFile('./test-project/contracts/hello-tacos.mligo', mligo_file); await execute('taq', 'compile -e testing hello-tacos.mligo', './test-project'); diff --git a/tests/e2e/contract-types-plugin-e2e-tests.spec.ts b/tests/e2e/contract-types-plugin-e2e-tests.spec.ts index 96fa5518c..223185ca8 100644 --- a/tests/e2e/contract-types-plugin-e2e-tests.spec.ts +++ b/tests/e2e/contract-types-plugin-e2e-tests.spec.ts @@ -74,7 +74,7 @@ describe('Contract Types Plugin E2E Testing for Taqueria CLI', () => { const { stdout: stdout1 } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); expect(stdout1).toContain('Plugin installed successfully'); - const jsligo_file = await (await exec(`cat e2e/data/ligo-data/increment.jsligo`)).stdout; + const jsligo_file = await (await exec(`cat e2e/data/ligo-legacy-data/increment.jsligo`)).stdout; await writeFile('./test-project/contracts/increment.jsligo', jsligo_file); await execute('taq', 'compile increment.jsligo', './test-project'); @@ -108,7 +108,7 @@ describe('Contract Types Plugin E2E Testing for Taqueria CLI', () => { const { stdout: stdout1 } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); expect(stdout1).toContain('Plugin installed successfully'); - const jsligo_file = await (await exec(`cat e2e/data/ligo-data/increment.jsligo`)).stdout; + const jsligo_file = await (await exec(`cat e2e/data/ligo-legacy-data/increment.jsligo`)).stdout; await writeFile('./test-project/contracts/increment.jsligo', jsligo_file); await execute('taq', 'compile increment.jsligo', './test-project'); @@ -142,7 +142,7 @@ describe('Contract Types Plugin E2E Testing for Taqueria CLI', () => { const { stdout: stdout1 } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); expect(stdout1).toContain('Plugin installed successfully'); - const jsligo_file = await (await exec(`cat e2e/data/ligo-data/increment.jsligo`)).stdout; + const jsligo_file = await (await exec(`cat e2e/data/ligo-legacy-data/increment.jsligo`)).stdout; await writeFile('./test-project/contracts/increment.jsligo', jsligo_file); await execute('taq', 'compile increment.jsligo', './test-project'); @@ -176,7 +176,7 @@ describe('Contract Types Plugin E2E Testing for Taqueria CLI', () => { const { stdout: stdout1 } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); expect(stdout1).toContain('Plugin installed successfully'); - const jsligo_file = await (await exec(`cat e2e/data/ligo-data/increment.jsligo`)).stdout; + const jsligo_file = await (await exec(`cat e2e/data/ligo-legacy-data/increment.jsligo`)).stdout; await writeFile('./test-project/contracts/increment.jsligo', jsligo_file); await execute('taq', 'compile increment.jsligo', './test-project'); diff --git a/tests/e2e/data/ligo-data/C.parameterList.mligo b/tests/e2e/data/ligo-legacy-data/C.parameterList.mligo similarity index 100% rename from tests/e2e/data/ligo-data/C.parameterList.mligo rename to tests/e2e/data/ligo-legacy-data/C.parameterList.mligo diff --git a/tests/e2e/data/ligo-data/C.storageList.mligo b/tests/e2e/data/ligo-legacy-data/C.storageList.mligo similarity index 100% rename from tests/e2e/data/ligo-data/C.storageList.mligo rename to tests/e2e/data/ligo-legacy-data/C.storageList.mligo diff --git a/tests/e2e/data/ligo-data/Counter.parameterList.mligo b/tests/e2e/data/ligo-legacy-data/Counter.parameterList.mligo similarity index 100% rename from tests/e2e/data/ligo-data/Counter.parameterList.mligo rename to tests/e2e/data/ligo-legacy-data/Counter.parameterList.mligo diff --git a/tests/e2e/data/ligo-data/Counter.storageList.mligo b/tests/e2e/data/ligo-legacy-data/Counter.storageList.mligo similarity index 100% rename from tests/e2e/data/ligo-data/Counter.storageList.mligo rename to tests/e2e/data/ligo-legacy-data/Counter.storageList.mligo diff --git a/tests/e2e/data/ligo-data/IncDec.jsligo b/tests/e2e/data/ligo-legacy-data/IncDec.jsligo similarity index 100% rename from tests/e2e/data/ligo-data/IncDec.jsligo rename to tests/e2e/data/ligo-legacy-data/IncDec.jsligo diff --git a/tests/e2e/data/ligo-data/IncDec.parameterList.jsligo b/tests/e2e/data/ligo-legacy-data/IncDec.parameterList.jsligo similarity index 100% rename from tests/e2e/data/ligo-data/IncDec.parameterList.jsligo rename to tests/e2e/data/ligo-legacy-data/IncDec.parameterList.jsligo diff --git a/tests/e2e/data/ligo-data/IncDec.storageList.jsligo b/tests/e2e/data/ligo-legacy-data/IncDec.storageList.jsligo similarity index 100% rename from tests/e2e/data/ligo-data/IncDec.storageList.jsligo rename to tests/e2e/data/ligo-legacy-data/IncDec.storageList.jsligo diff --git a/tests/e2e/data/ligo-data/IncDec.tz b/tests/e2e/data/ligo-legacy-data/IncDec.tz similarity index 100% rename from tests/e2e/data/ligo-data/IncDec.tz rename to tests/e2e/data/ligo-legacy-data/IncDec.tz diff --git a/tests/e2e/data/ligo-data/MultipleContracts.mligo b/tests/e2e/data/ligo-legacy-data/MultipleContracts.mligo similarity index 100% rename from tests/e2e/data/ligo-data/MultipleContracts.mligo rename to tests/e2e/data/ligo-legacy-data/MultipleContracts.mligo diff --git a/tests/e2e/data/ligo-data/counter-main.mligo b/tests/e2e/data/ligo-legacy-data/counter-main.mligo similarity index 100% rename from tests/e2e/data/ligo-data/counter-main.mligo rename to tests/e2e/data/ligo-legacy-data/counter-main.mligo diff --git a/tests/e2e/data/ligo-data/counter-main.parameterList.mligo b/tests/e2e/data/ligo-legacy-data/counter-main.parameterList.mligo similarity index 100% rename from tests/e2e/data/ligo-data/counter-main.parameterList.mligo rename to tests/e2e/data/ligo-legacy-data/counter-main.parameterList.mligo diff --git a/tests/e2e/data/ligo-data/counter-main.storageList.mligo b/tests/e2e/data/ligo-legacy-data/counter-main.storageList.mligo similarity index 100% rename from tests/e2e/data/ligo-data/counter-main.storageList.mligo rename to tests/e2e/data/ligo-legacy-data/counter-main.storageList.mligo diff --git a/tests/e2e/data/ligo-data/counter-module-main.mligo b/tests/e2e/data/ligo-legacy-data/counter-module-main.mligo similarity index 100% rename from tests/e2e/data/ligo-data/counter-module-main.mligo rename to tests/e2e/data/ligo-legacy-data/counter-module-main.mligo diff --git a/tests/e2e/data/ligo-data/counter.storageList.mligo b/tests/e2e/data/ligo-legacy-data/counter.storageList.mligo similarity index 100% rename from tests/e2e/data/ligo-data/counter.storageList.mligo rename to tests/e2e/data/ligo-legacy-data/counter.storageList.mligo diff --git a/tests/e2e/data/ligo-data/entry-module.mligo b/tests/e2e/data/ligo-legacy-data/entry-module.mligo similarity index 100% rename from tests/e2e/data/ligo-data/entry-module.mligo rename to tests/e2e/data/ligo-legacy-data/entry-module.mligo diff --git a/tests/e2e/data/ligo-data/entry.jsligo b/tests/e2e/data/ligo-legacy-data/entry.jsligo similarity index 100% rename from tests/e2e/data/ligo-data/entry.jsligo rename to tests/e2e/data/ligo-legacy-data/entry.jsligo diff --git a/tests/e2e/data/ligo-data/entry.parameterList.jsligo b/tests/e2e/data/ligo-legacy-data/entry.parameterList.jsligo similarity index 100% rename from tests/e2e/data/ligo-data/entry.parameterList.jsligo rename to tests/e2e/data/ligo-legacy-data/entry.parameterList.jsligo diff --git a/tests/e2e/data/ligo-data/entry.storageList.jsligo b/tests/e2e/data/ligo-legacy-data/entry.storageList.jsligo similarity index 100% rename from tests/e2e/data/ligo-data/entry.storageList.jsligo rename to tests/e2e/data/ligo-legacy-data/entry.storageList.jsligo diff --git a/tests/e2e/data/ligo-data/expected-Counter.parameterList.mligo b/tests/e2e/data/ligo-legacy-data/expected-Counter.parameterList.mligo similarity index 100% rename from tests/e2e/data/ligo-data/expected-Counter.parameterList.mligo rename to tests/e2e/data/ligo-legacy-data/expected-Counter.parameterList.mligo diff --git a/tests/e2e/data/ligo-data/expected-IncDec.parameterList.jsligo b/tests/e2e/data/ligo-legacy-data/expected-IncDec.parameterList.jsligo similarity index 100% rename from tests/e2e/data/ligo-data/expected-IncDec.parameterList.jsligo rename to tests/e2e/data/ligo-legacy-data/expected-IncDec.parameterList.jsligo diff --git a/tests/e2e/data/ligo-data/expected-counter-main.parameterList.mligo b/tests/e2e/data/ligo-legacy-data/expected-counter-main.parameterList.mligo similarity index 100% rename from tests/e2e/data/ligo-data/expected-counter-main.parameterList.mligo rename to tests/e2e/data/ligo-legacy-data/expected-counter-main.parameterList.mligo diff --git a/tests/e2e/data/ligo-data/expected-entry.parameterList.jsligo b/tests/e2e/data/ligo-legacy-data/expected-entry.parameterList.jsligo similarity index 100% rename from tests/e2e/data/ligo-data/expected-entry.parameterList.jsligo rename to tests/e2e/data/ligo-legacy-data/expected-entry.parameterList.jsligo diff --git a/tests/e2e/data/ligo-data/hello-tacos-invalid-tests.mligo b/tests/e2e/data/ligo-legacy-data/hello-tacos-invalid-tests.mligo similarity index 100% rename from tests/e2e/data/ligo-data/hello-tacos-invalid-tests.mligo rename to tests/e2e/data/ligo-legacy-data/hello-tacos-invalid-tests.mligo diff --git a/tests/e2e/data/ligo-data/hello-tacos-tests.mligo b/tests/e2e/data/ligo-legacy-data/hello-tacos-tests.mligo similarity index 100% rename from tests/e2e/data/ligo-data/hello-tacos-tests.mligo rename to tests/e2e/data/ligo-legacy-data/hello-tacos-tests.mligo diff --git a/tests/e2e/data/ligo-data/hello-tacos.mligo b/tests/e2e/data/ligo-legacy-data/hello-tacos.mligo similarity index 100% rename from tests/e2e/data/ligo-data/hello-tacos.mligo rename to tests/e2e/data/ligo-legacy-data/hello-tacos.mligo diff --git a/tests/e2e/data/ligo-data/hello-tacos.parameters.mligo b/tests/e2e/data/ligo-legacy-data/hello-tacos.parameters.mligo similarity index 100% rename from tests/e2e/data/ligo-data/hello-tacos.parameters.mligo rename to tests/e2e/data/ligo-legacy-data/hello-tacos.parameters.mligo diff --git a/tests/e2e/data/ligo-data/importer.mligo b/tests/e2e/data/ligo-legacy-data/importer.mligo similarity index 100% rename from tests/e2e/data/ligo-data/importer.mligo rename to tests/e2e/data/ligo-legacy-data/importer.mligo diff --git a/tests/e2e/data/ligo-data/increment.jsligo b/tests/e2e/data/ligo-legacy-data/increment.jsligo similarity index 100% rename from tests/e2e/data/ligo-data/increment.jsligo rename to tests/e2e/data/ligo-legacy-data/increment.jsligo diff --git a/tests/e2e/data/ligo-data/invalid-contract.mligo b/tests/e2e/data/ligo-legacy-data/invalid-contract.mligo similarity index 100% rename from tests/e2e/data/ligo-data/invalid-contract.mligo rename to tests/e2e/data/ligo-legacy-data/invalid-contract.mligo diff --git a/tests/e2e/data/ligo-data/math-helpers.mligo b/tests/e2e/data/ligo-legacy-data/math-helpers.mligo similarity index 100% rename from tests/e2e/data/ligo-data/math-helpers.mligo rename to tests/e2e/data/ligo-legacy-data/math-helpers.mligo diff --git a/tests/e2e/data/ligo-data/pokeGame.jsligo b/tests/e2e/data/ligo-legacy-data/pokeGame.jsligo similarity index 100% rename from tests/e2e/data/ligo-data/pokeGame.jsligo rename to tests/e2e/data/ligo-legacy-data/pokeGame.jsligo diff --git a/tests/e2e/data/ligo-data/pokeGame.parameterList-with-comments.jsligo b/tests/e2e/data/ligo-legacy-data/pokeGame.parameterList-with-comments.jsligo similarity index 100% rename from tests/e2e/data/ligo-data/pokeGame.parameterList-with-comments.jsligo rename to tests/e2e/data/ligo-legacy-data/pokeGame.parameterList-with-comments.jsligo diff --git a/tests/e2e/data/ligo-data/pokeGame.parameterList.jsligo b/tests/e2e/data/ligo-legacy-data/pokeGame.parameterList.jsligo similarity index 100% rename from tests/e2e/data/ligo-data/pokeGame.parameterList.jsligo rename to tests/e2e/data/ligo-legacy-data/pokeGame.parameterList.jsligo diff --git a/tests/e2e/data/ligo-data/pokeGame.storageList-with-comments.jsligo b/tests/e2e/data/ligo-legacy-data/pokeGame.storageList-with-comments.jsligo similarity index 100% rename from tests/e2e/data/ligo-data/pokeGame.storageList-with-comments.jsligo rename to tests/e2e/data/ligo-legacy-data/pokeGame.storageList-with-comments.jsligo diff --git a/tests/e2e/data/ligo-data/pokeGame.storageList.jsligo b/tests/e2e/data/ligo-legacy-data/pokeGame.storageList.jsligo similarity index 100% rename from tests/e2e/data/ligo-data/pokeGame.storageList.jsligo rename to tests/e2e/data/ligo-legacy-data/pokeGame.storageList.jsligo diff --git a/tests/e2e/data/ligo-data/unit_pokeGame.jsligo b/tests/e2e/data/ligo-legacy-data/unit_pokeGame.jsligo similarity index 100% rename from tests/e2e/data/ligo-data/unit_pokeGame.jsligo rename to tests/e2e/data/ligo-legacy-data/unit_pokeGame.jsligo diff --git a/tests/e2e/ligo-plugin-e2e-tests.spec.ts b/tests/e2e/ligo-legacy-plugin-e2e-tests.spec.ts similarity index 90% rename from tests/e2e/ligo-plugin-e2e-tests.spec.ts rename to tests/e2e/ligo-legacy-plugin-e2e-tests.spec.ts index 4758ef38f..a7cbdb887 100644 --- a/tests/e2e/ligo-plugin-e2e-tests.spec.ts +++ b/tests/e2e/ligo-legacy-plugin-e2e-tests.spec.ts @@ -12,7 +12,7 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { const { waitForText } = await spawn('taq', 'init test-project --debug'); await waitForText("Project taq'ified!"); - const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); expect(stdout).toContain('Plugin installed successfully'); const { stdout: stdout2 } = await execute('taq', '--help', './test-project'); @@ -25,7 +25,7 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { const { execute, cleanup, spawn } = await prepareEnvironment(); const { waitForText } = await spawn('taq', 'init test-project --debug'); await waitForText("Project taq'ified!"); - const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); expect(stdout).toContain('Plugin installed successfully'); const { stdout: stdout2 } = await execute('taq', 'compile --help', './test-project'); @@ -41,7 +41,7 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { const { waitForText } = await spawn('taq', 'init test-project --debug'); await waitForText("Project taq'ified!"); - const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); expect(stdout).toContain('Plugin installed successfully'); const { stderr: compileErr } = await execute('taq', 'compile', './test-project'); @@ -56,7 +56,7 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { const { waitForText } = await spawn('taq', 'init test-project'); await waitForText("Project taq'ified!"); - const { stdout, stderr } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout, stderr } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); expect(stdout).toContain('Plugin installed successfully'); expect(stdout.join('\n')).toContain('LIGO collects anonymous usage data'); @@ -69,7 +69,7 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { const { waitForText } = await spawn('taq', 'init test-project'); await waitForText("Project taq'ified!"); - const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); expect(stdout).toContain('Plugin installed successfully'); const { stdout: imageOutput } = await execute('taq', 'get-image --plugin ligo', './test-project'); @@ -89,19 +89,19 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { await waitForText("Project taq'ified!"); // Install the plugin - const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); expect(stdout).toContain('Plugin installed successfully'); // Write the contract to the test project - const contract = await (await exec(`cat e2e/data/ligo-data/counter-main.mligo`)).stdout; + const contract = await (await exec(`cat e2e/data/ligo-legacy-data/counter-main.mligo`)).stdout; await writeFile('./test-project/contracts/counter-main.mligo', contract); // Write the parameter file for the contract - const parameterFile = await (await exec(`cat e2e/data/ligo-data/counter-main.parameterList.mligo`)).stdout; + const parameterFile = await (await exec(`cat e2e/data/ligo-legacy-data/counter-main.parameterList.mligo`)).stdout; await writeFile('./test-project/contracts/counter-main.parameterList.mligo', parameterFile); // Write the storage file for the contract - const storageFile = await (await exec(`cat e2e/data/ligo-data/counter-main.storageList.mligo`)).stdout; + const storageFile = await (await exec(`cat e2e/data/ligo-legacy-data/counter-main.storageList.mligo`)).stdout; await writeFile('./test-project/contracts/counter-main.storageList.mligo', storageFile); // Compile using the `compile` task @@ -153,15 +153,15 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { await waitForText("Project taq'ified!"); // Install the plugin - const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); expect(stdout).toContain('Plugin installed successfully'); // Write the contract to the test project - const contract = await (await exec(`cat e2e/data/ligo-data/counter-main.mligo`)).stdout; + const contract = await (await exec(`cat e2e/data/ligo-legacy-data/counter-main.mligo`)).stdout; await writeFile('./test-project/contracts/counter-main.mligo', contract); // Write the storage file for the contract - const storageFile = await (await exec(`cat e2e/data/ligo-data/counter-main.storageList.mligo`)).stdout; + const storageFile = await (await exec(`cat e2e/data/ligo-legacy-data/counter-main.storageList.mligo`)).stdout; await writeFile('./test-project/contracts/counter-main.storageList.mligo', storageFile); // Compile using the `compile` task @@ -193,7 +193,7 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { // Expect the parameterList file to have the correct contents const parameterFile = await readFile('./test-project/contracts/counter-main.parameterList.mligo'); const expectedParameterFile = - await (await exec(`cat e2e/data/ligo-data/expected-counter-main.parameterList.mligo`)).stdout; + await (await exec(`cat e2e/data/ligo-legacy-data/expected-counter-main.parameterList.mligo`)).stdout; expect(parameterFile).toEqual(expectedParameterFile); // Cleanup @@ -211,19 +211,19 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { await waitForText("Project taq'ified!"); // Install the plugin - const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); expect(stdout).toContain('Plugin installed successfully'); // Write the contract to the test project - const contract = await (await exec(`cat e2e/data/ligo-data/counter-module-main.mligo`)).stdout; + const contract = await (await exec(`cat e2e/data/ligo-legacy-data/counter-module-main.mligo`)).stdout; await writeFile('./test-project/contracts/counter-module-main.mligo', contract); // Write the parameter file for the contract - const parameterFile = await (await exec(`cat e2e/data/ligo-data/Counter.parameterList.mligo`)).stdout; + const parameterFile = await (await exec(`cat e2e/data/ligo-legacy-data/Counter.parameterList.mligo`)).stdout; await writeFile('./test-project/contracts/Counter.parameterList.mligo', parameterFile); // Write the storage file for the contract - const storageFile = await (await exec(`cat e2e/data/ligo-data/Counter.storageList.mligo`)).stdout; + const storageFile = await (await exec(`cat e2e/data/ligo-legacy-data/Counter.storageList.mligo`)).stdout; await writeFile('./test-project/contracts/Counter.storageList.mligo', storageFile); // Compile using the `compile` task @@ -268,15 +268,15 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { await waitForText("Project taq'ified!"); // Install the plugin - const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); expect(stdout).toContain('Plugin installed successfully'); // Write the contract to the test project - const contract = await (await exec(`cat e2e/data/ligo-data/counter-module-main.mligo`)).stdout; + const contract = await (await exec(`cat e2e/data/ligo-legacy-data/counter-module-main.mligo`)).stdout; await writeFile('./test-project/contracts/counter-module-main.mligo', contract); // Write the storage file for the contract - const storageFile = await (await exec(`cat e2e/data/ligo-data/Counter.storageList.mligo`)).stdout; + const storageFile = await (await exec(`cat e2e/data/ligo-legacy-data/Counter.storageList.mligo`)).stdout; await writeFile('./test-project/contracts/Counter.storageList.mligo', storageFile); // Compile using the `compile` task @@ -307,8 +307,9 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { // Expect the parameterList file to have the correct contents const parameterFile = await readFile('./test-project/contracts/Counter.parameterList.mligo'); - const expectedParameterFile = await (await exec(`cat e2e/data/ligo-data/expected-Counter.parameterList.mligo`)) - .stdout; + const expectedParameterFile = + await (await exec(`cat e2e/data/ligo-legacy-data/expected-Counter.parameterList.mligo`)) + .stdout; expect(parameterFile).toEqual(expectedParameterFile); // Cleanup @@ -326,19 +327,19 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { await waitForText("Project taq'ified!"); // Install the plugin - const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); expect(stdout).toContain('Plugin installed successfully'); // Write the contract to the test project - const contract = await (await exec(`cat e2e/data/ligo-data/entry.jsligo`)).stdout; + const contract = await (await exec(`cat e2e/data/ligo-legacy-data/entry.jsligo`)).stdout; await writeFile('./test-project/contracts/entry.jsligo', contract); // Write the parameter file for the contract - const parameterFile = await (await exec(`cat e2e/data/ligo-data/entry.parameterList.jsligo`)).stdout; + const parameterFile = await (await exec(`cat e2e/data/ligo-legacy-data/entry.parameterList.jsligo`)).stdout; await writeFile('./test-project/contracts/entry.parameterList.jsligo', parameterFile); // Write the storage file for the contract - const storageFile = await (await exec(`cat e2e/data/ligo-data/entry.storageList.jsligo`)).stdout; + const storageFile = await (await exec(`cat e2e/data/ligo-legacy-data/entry.storageList.jsligo`)).stdout; await writeFile('./test-project/contracts/entry.storageList.jsligo', storageFile); // Compile using the `compile` task @@ -381,15 +382,15 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { await waitForText("Project taq'ified!"); // Install the plugin - const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); expect(stdout).toContain('Plugin installed successfully'); // Write the contract to the test project - const contract = await (await exec(`cat e2e/data/ligo-data/entry.jsligo`)).stdout; + const contract = await (await exec(`cat e2e/data/ligo-legacy-data/entry.jsligo`)).stdout; await writeFile('./test-project/contracts/entry.jsligo', contract); // Write the storage file for the contract - const storageFile = await (await exec(`cat e2e/data/ligo-data/entry.storageList.jsligo`)).stdout; + const storageFile = await (await exec(`cat e2e/data/ligo-legacy-data/entry.storageList.jsligo`)).stdout; await writeFile('./test-project/contracts/entry.storageList.jsligo', storageFile); // Compile using the `compile` task @@ -420,8 +421,9 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { // Expect the parameterList file to have the correct contents const parameterFile = await readFile('./test-project/contracts/entry.parameterList.jsligo'); // console.log(parameterFile) - const expectedParameterFile = await (await exec(`cat e2e/data/ligo-data/expected-entry.parameterList.jsligo`)) - .stdout; + const expectedParameterFile = + await (await exec(`cat e2e/data/ligo-legacy-data/expected-entry.parameterList.jsligo`)) + .stdout; expect(parameterFile).toEqual(expectedParameterFile); // Cleanup @@ -439,19 +441,19 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { await waitForText("Project taq'ified!"); // Install the plugin - const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); expect(stdout).toContain('Plugin installed successfully'); // Write the contract to the test project - const contract = await (await exec(`cat e2e/data/ligo-data/IncDec.jsligo`)).stdout; + const contract = await (await exec(`cat e2e/data/ligo-legacy-data/IncDec.jsligo`)).stdout; await writeFile('./test-project/contracts/IncDec.jsligo', contract); // Write the parameter file for the contract - const parameterFile = await (await exec(`cat e2e/data/ligo-data/IncDec.parameterList.jsligo`)).stdout; + const parameterFile = await (await exec(`cat e2e/data/ligo-legacy-data/IncDec.parameterList.jsligo`)).stdout; await writeFile('./test-project/contracts/IncDec.parameterList.jsligo', parameterFile); // Write the storage file for the contract - const storageFile = await (await exec(`cat e2e/data/ligo-data/IncDec.storageList.jsligo`)).stdout; + const storageFile = await (await exec(`cat e2e/data/ligo-legacy-data/IncDec.storageList.jsligo`)).stdout; await writeFile('./test-project/contracts/IncDec.storageList.jsligo', storageFile); // Compile using the `compile` task @@ -496,15 +498,15 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { await waitForText("Project taq'ified!"); // Install the plugin - const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); expect(stdout).toContain('Plugin installed successfully'); // Write the contract to the test project - const contract = await (await exec(`cat e2e/data/ligo-data/IncDec.jsligo`)).stdout; + const contract = await (await exec(`cat e2e/data/ligo-legacy-data/IncDec.jsligo`)).stdout; await writeFile('./test-project/contracts/IncDec.jsligo', contract); // Write the storage file for the contract - const storageFile = await (await exec(`cat e2e/data/ligo-data/IncDec.storageList.jsligo`)).stdout; + const storageFile = await (await exec(`cat e2e/data/ligo-legacy-data/IncDec.storageList.jsligo`)).stdout; await writeFile('./test-project/contracts/IncDec.storageList.jsligo', storageFile); // Compile using the `compile` task @@ -535,8 +537,9 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { // Expect the parameterList file to have the correct contents const parameterFile = await readFile('./test-project/contracts/IncDec.parameterList.jsligo'); // console.log(parameterFile) - const expectedParameterFile = await (await exec(`cat e2e/data/ligo-data/expected-IncDec.parameterList.jsligo`)) - .stdout; + const expectedParameterFile = + await (await exec(`cat e2e/data/ligo-legacy-data/expected-IncDec.parameterList.jsligo`)) + .stdout; expect(parameterFile).toEqual(expectedParameterFile); // Cleanup @@ -552,11 +555,11 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { const { waitForText } = await spawn('taq', 'init test-project'); await waitForText("Project taq'ified!"); - const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); expect(stdout).toContain('Plugin installed successfully'); // Write the contract to the test project - const contract = await (await exec(`cat e2e/data/ligo-data/MultipleContracts.mligo`)).stdout; + const contract = await (await exec(`cat e2e/data/ligo-legacy-data/MultipleContracts.mligo`)).stdout; await writeFile('./test-project/contracts/MultipleContracts.mligo', contract); // Compile using the `compile` task @@ -588,10 +591,10 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { const { waitForText } = await spawn('taq', 'init test-project --debug'); await waitForText("Project taq'ified!"); - const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); expect(stdout).toContain('Plugin installed successfully'); - const mligo_file = await (await exec(`cat e2e/data/ligo-data/hello-tacos.mligo`)).stdout; + const mligo_file = await (await exec(`cat e2e/data/ligo-legacy-data/hello-tacos.mligo`)).stdout; await writeFile('./test-project/contracts/hello-tacos.mligo', mligo_file); await execute('taq', 'compile hello-tacos.mligo --json', './test-project'); @@ -610,16 +613,16 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { const { waitForText } = await spawn('taq', 'init test-project --debug'); await waitForText("Project taq'ified!"); - const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); expect(stdout).toContain('Plugin installed successfully'); const artifacts_list_before = await ls('./test-project/artifacts'); expect(artifacts_list_before).toEqual([]); - const mligo_file = await (await exec(`cat e2e/data/ligo-data/hello-tacos.mligo`)).stdout; + const mligo_file = await (await exec(`cat e2e/data/ligo-legacy-data/hello-tacos.mligo`)).stdout; await writeFile('./test-project/contracts/hello-tacos.mligo', mligo_file); - const jsligo_file = await (await exec(`cat e2e/data/ligo-data/increment.jsligo`)).stdout; + const jsligo_file = await (await exec(`cat e2e/data/ligo-legacy-data/increment.jsligo`)).stdout; await writeFile('./test-project/contracts/increment.jsligo', jsligo_file); await execute('taq', 'compile hello-tacos.mligo', './test-project'); @@ -634,7 +637,7 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { const { waitForText } = await spawn('taq', 'init test-project --debug'); await waitForText("Project taq'ified!"); - const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); expect(stdout).toContain('Plugin installed successfully'); const { stdout: compileOutput, stderr: compileErr } = await execute( @@ -659,12 +662,12 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { const { waitForText } = await spawn('taq', 'init test-project'); await waitForText("Project taq'ified!"); - const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); expect(stdout).toContain('Plugin installed successfully'); - const mligo_file = await (await exec('cat e2e/data/ligo-data/hello-tacos.mligo')).stdout; + const mligo_file = await (await exec('cat e2e/data/ligo-legacy-data/hello-tacos.mligo')).stdout; await writeFile('./test-project/contracts/hello-tacos.mligo', mligo_file); - const test_file = await (await exec('cat e2e/data/ligo-data/hello-tacos-tests.mligo')).stdout; + const test_file = await (await exec('cat e2e/data/ligo-legacy-data/hello-tacos-tests.mligo')).stdout; await writeFile('./test-project/contracts/hello-tacos-tests.mligo', test_file); const testResult = await execute( @@ -697,12 +700,13 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { const { waitForText } = await spawn('taq', 'init test-project --debug'); await waitForText("Project taq'ified!"); - const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); expect(stdout).toContain('Plugin installed successfully'); - const mligo_file = await (await exec('cat e2e/data/ligo-data/hello-tacos.mligo')).stdout; + const mligo_file = await (await exec('cat e2e/data/ligo-legacy-data/hello-tacos.mligo')).stdout; await writeFile('./test-project/contracts/hello-tacos.mligo', mligo_file); - const invalid_test_file = await (await exec('cat e2e/data/ligo-data/hello-tacos-invalid-tests.mligo')).stdout; + const invalid_test_file = await (await exec('cat e2e/data/ligo-legacy-data/hello-tacos-invalid-tests.mligo')) + .stdout; await writeFile('./test-project/contracts/hello-tacos-invalid-tests.mligo', invalid_test_file); const { stdout: testOutput, stderr: testErr } = await execute( @@ -723,7 +727,7 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { const { waitForText } = await spawn('taq', 'init test-project --debug'); await waitForText("Project taq'ified!"); - const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); expect(stdout).toContain('Plugin installed successfully'); const { stderr: testErr } = await execute('taq', 'test hello-tacos-test.mligo', './test-project'); @@ -738,7 +742,7 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { const { waitForText } = await spawn('taq', 'init test-project'); await waitForText("Project taq'ified!"); - const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); expect(stdout).toContain('Plugin installed successfully'); await execute('taq', 'create contract counter.mligo', './test-project'); @@ -759,12 +763,12 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { await execute('taq', 'init test-project'); await exists('./test-project/.taq/config.json'); - await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); await exists('./test-project/node_modules/@taqueria/plugin-ligo/index.js'); - const mligo_file = await (await exec(`cat e2e/data/ligo-data/hello-tacos.mligo`)).stdout; + const mligo_file = await (await exec(`cat e2e/data/ligo-legacy-data/hello-tacos.mligo`)).stdout; await writeFile('./test-project/contracts/hello-tacos.mligo', mligo_file); - const parameters_file = await (await exec(`cat e2e/data/ligo-data/hello-tacos.parameters.mligo`)).stdout; + const parameters_file = await (await exec(`cat e2e/data/ligo-legacy-data/hello-tacos.parameters.mligo`)).stdout; await writeFile('./test-project/contracts/hello-tacos.parameters.mligo', parameters_file); expect(await ls('./test-project/contracts')).toEqual( @@ -784,7 +788,7 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { test('ligo can create template (contract from the package registry) and the user owns the file', async () => { const { execute, cleanup, exists } = await prepareEnvironment(); await execute('taq', 'init test-project'); - await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); const result = await execute( 'taq', "ligo --command 'init contract --template shifumi-jsligo shifumiTemplate'", @@ -802,7 +806,7 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { test('ligo task with install command does not result in an error', async () => { const { execute, cleanup, exists } = await prepareEnvironment(); await execute('taq', 'init test-project'); - await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); const result = await execute('taq', 'ligo --command "install"', './test-project'); expect(result.stderr.join('').trim()).not.toContain('error'); await cleanup(); @@ -818,7 +822,7 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { const { waitForText } = await spawn('taq', 'init test-project'); await waitForText("Project taq'ified!"); - const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); expect(stdout).toContain('Plugin installed successfully'); // List of test files to copy to test project @@ -856,7 +860,7 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { // Copy the test files to the test project await Promise.all(testFiles.map(async file => { - const fileContents = await (await exec(`cat e2e/data/ligo-data/${file}`)).stdout; + const fileContents = await (await exec(`cat e2e/data/ligo-legacy-data/${file}`)).stdout; return await writeFile(`./test-project/contracts/${file}`, fileContents); })); @@ -925,14 +929,14 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { // set up the project await execute('taq', 'init test-project'); - await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); // copy jsligo files to contracts folder - const jligo_file = await (await exec(`cat e2e/data/ligo-data/pokeGame.jsligo`)).stdout; + const jligo_file = await (await exec(`cat e2e/data/ligo-legacy-data/pokeGame.jsligo`)).stdout; await writeFile('./test-project/contracts/pokeGame.jsligo', jligo_file); - const storage_file = await (await exec(`cat e2e/data/ligo-data/pokeGame.storageList.jsligo`)).stdout; + const storage_file = await (await exec(`cat e2e/data/ligo-legacy-data/pokeGame.storageList.jsligo`)).stdout; await writeFile('./test-project/contracts/pokeGame.storageList.jsligo', storage_file); - const parameters_file = await (await exec(`cat e2e/data/ligo-data/pokeGame.parameterList.jsligo`)).stdout; + const parameters_file = await (await exec(`cat e2e/data/ligo-legacy-data/pokeGame.parameterList.jsligo`)).stdout; await writeFile('./test-project/contracts/pokeGame.parameterList.jsligo', parameters_file); // compile the contract using compile-all task @@ -962,16 +966,17 @@ describe('Ligo Plugin E2E Testing for Taqueria CLI', () => { await waitForText("Project taq'ified!"); // Install the plugin - const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo', './test-project'); + const { stdout } = await execute('taq', 'install ../taqueria-plugin-ligo-legacy', './test-project'); // copy jsligo files to contracts folder - const jligo_file = await (await exec(`cat e2e/data/ligo-data/pokeGame.jsligo`)).stdout; + const jligo_file = await (await exec(`cat e2e/data/ligo-legacy-data/pokeGame.jsligo`)).stdout; await writeFile('./test-project/contracts/pokeGame.jsligo', jligo_file); - const storage_file = await (await exec(`cat e2e/data/ligo-data/pokeGame.storageList-with-comments.jsligo`)) + const storage_file = await (await exec(`cat e2e/data/ligo-legacy-data/pokeGame.storageList-with-comments.jsligo`)) .stdout; await writeFile('./test-project/contracts/pokeGame.storageList.jsligo', storage_file); - const parameters_file = await (await exec(`cat e2e/data/ligo-data/pokeGame.parameterList-with-comments.jsligo`)) - .stdout; + const parameters_file = + await (await exec(`cat e2e/data/ligo-legacy-data/pokeGame.parameterList-with-comments.jsligo`)) + .stdout; await writeFile('./test-project/contracts/pokeGame.parameterList.jsligo', parameters_file); // compile the contract using compile task diff --git a/tests/e2e/marigold-training-e2e-smoke-test.spec.ts b/tests/e2e/marigold-training-e2e-smoke-test.spec.ts index 44bc7fee2..e3ea3b10b 100644 --- a/tests/e2e/marigold-training-e2e-smoke-test.spec.ts +++ b/tests/e2e/marigold-training-e2e-smoke-test.spec.ts @@ -23,11 +23,11 @@ describe('Marigold Training E2E Smoke Test for Taqueria CLI', () => { await execute('taq', 'install ../taqueria-plugin-taquito', './test-project'); // copy jsligo files to contracts folder - const jligo_file = await readFile('e2e/data/ligo-data/pokeGame.jsligo', 'utf8'); + const jligo_file = await readFile('e2e/data/ligo-legacy-data/pokeGame.jsligo', 'utf8'); await writeFile('./test-project/contracts/pokeGame.jsligo', jligo_file); - const storage_file = await readFile('e2e/data/ligo-data/pokeGame.storageList.jsligo', 'utf8'); + const storage_file = await readFile('e2e/data/ligo-legacy-data/pokeGame.storageList.jsligo', 'utf8'); await writeFile('./test-project/contracts/pokeGame.storageList.jsligo', storage_file); - const parameters_file = await readFile('e2e/data/ligo-data/pokeGame.parameterList.jsligo', 'utf8'); + const parameters_file = await readFile('e2e/data/ligo-legacy-data/pokeGame.parameterList.jsligo', 'utf8'); await writeFile('./test-project/contracts/pokeGame.parameterList.jsligo', parameters_file); // compile the contract @@ -80,13 +80,13 @@ describe('Marigold Training E2E Smoke Test for Taqueria CLI', () => { await execute('taq', 'install ../taqueria-plugin-tezos-client', './test-project'); await execute('taq', 'install ../taqueria-plugin-taquito', './test-project'); - const jligo_file = await readFile('e2e/data/ligo-data/unit_pokeGame.jsligo', 'utf8'); + const jligo_file = await readFile('e2e/data/ligo-legacy-data/unit_pokeGame.jsligo', 'utf8'); await writeFile('./test-project/contracts/pokeGame.jsligo', jligo_file); - const storage_file = await readFile('e2e/data/ligo-data/pokeGame.storageList.jsligo', 'utf8'); + const storage_file = await readFile('e2e/data/ligo-legacy-data/pokeGame.storageList.jsligo', 'utf8'); await writeFile('./test-project/contracts/pokeGame.storageList.jsligo', storage_file); - const parameters_file = await readFile('e2e/data/ligo-data/pokeGame.parameterList.jsligo', 'utf8'); + const parameters_file = await readFile('e2e/data/ligo-legacy-data/pokeGame.parameterList.jsligo', 'utf8'); await writeFile('./test-project/contracts/pokeGame.parameterList.jsligo', parameters_file); - const unit_test_file = await readFile('e2e/data/ligo-data/unit_pokeGame.jsligo', 'utf8'); + const unit_test_file = await readFile('e2e/data/ligo-legacy-data/unit_pokeGame.jsligo', 'utf8'); await writeFile('./test-project/contracts/unit_pokeGame.jsligo', unit_test_file); const { stdout, stderr: _stderr } = await execute('taq', 'test unit_pokeGame.jsligo', './test-project'); diff --git a/tests/e2e/metadata-plugin-e2e-tests.spec.ts b/tests/e2e/metadata-plugin-e2e-tests.spec.ts index 31af88995..69ceea1e8 100644 --- a/tests/e2e/metadata-plugin-e2e-tests.spec.ts +++ b/tests/e2e/metadata-plugin-e2e-tests.spec.ts @@ -16,7 +16,7 @@ describe('Metadata Plugin E2E Testing for the Taqueria CLI', () => { const { stdout } = await execute('taq', 'install ../taqueria-plugin-metadata', './test-project'); expect(stdout).toContain('Plugin installed successfully'); - const mligo_file = await (await exec(`cat e2e/data/ligo-data/hello-tacos.mligo`)).stdout; + const mligo_file = await (await exec(`cat e2e/data/ligo-legacy-data/hello-tacos.mligo`)).stdout; await writeFile('./test-project/contracts/hello-tacos.mligo', mligo_file); const contracts_list = await ls('./test-project/contracts'); expect(contracts_list).toContain('hello-tacos.mligo'); @@ -76,7 +76,7 @@ describe('Metadata Plugin E2E Testing for the Taqueria CLI', () => { const { stdout } = await execute('taq', 'install ../taqueria-plugin-metadata', './test-project'); expect(stdout).toContain('Plugin installed successfully'); - const mligo_file = await (await exec(`cat e2e/data/ligo-data/hello-tacos.mligo`)).stdout; + const mligo_file = await (await exec(`cat e2e/data/ligo-legacy-data/hello-tacos.mligo`)).stdout; await writeFile('./test-project/contracts/hello-tacos.mligo', mligo_file); const contracts_list = await ls('./test-project/contracts'); expect(contracts_list).toContain('hello-tacos.mligo'); @@ -94,7 +94,7 @@ describe('Metadata Plugin E2E Testing for the Taqueria CLI', () => { const { stdout: stdout1 } = await execute('taq', 'install ../taqueria-plugin-metadata', './test-project'); expect(stdout1).toContain('Plugin installed successfully'); - const mligo_file = await (await exec(`cat e2e/data/ligo-data/hello-tacos.mligo`)).stdout; + const mligo_file = await (await exec(`cat e2e/data/ligo-legacy-data/hello-tacos.mligo`)).stdout; await writeFile('./test-project/contracts/hello-tacos.mligo', mligo_file); const contracts_list = await ls('./test-project/contracts'); expect(contracts_list).toContain('hello-tacos.mligo'); diff --git a/tests/package.json b/tests/package.json index 7fc10305b..fbfe92129 100644 --- a/tests/package.json +++ b/tests/package.json @@ -1,6 +1,6 @@ { "name": "@taqueria/tests", - "version": "0.40.12", + "version": "0.40.13", "type": "module", "private": true, "description": "This is Taqueria testing project includes unit, integration and e2e tests",