🧽 Chore ➾ Remove Unused Config Files and Skipped Tests that Depend on…

… Them (#1459) * removed unused config files and skipped tests depending on them * removed skipped tests or refactored them if still valid. Removed a bunch of config.json files as well * removed single thread for testing * added logging for transfer test * logging for account listing * removing deleted files which I accidentally merged back in during update from main * updated to use modern config.json files * updated bad URL tests * updated network name test * WIP for storage string test json * completed modernizing storage string json * low tez test refactor * pinning node version in main.yml and updated to modern taquito test json * slight node version bump * trying to update to v18 for node * trying to rebuild before running all other commands * added git clean to setup script * more testing for CI * removed CI stuff * checking NPM registry for CI job * removed logging * added docker build back to caching * updated ports in each file to be sequential * updated tests for config changes * making CI use the 20000 port for taquito flextesa tests * updated help for correct port number * logging for CI debugging * added logging to see what ports are in use on the machine when the test runs * more verbose logging for docker * adding more logging for docker containers * more logging * adding wait for containers to start up * more logging for scaffold flextesa image * added logging to see what is on port 20000 * seeing all ports * removed chunking from tests * removed lsof call in test * updated scaffold sandbox to have scaffold in name to help with identification * updated test with param to actually test something * logging for images in new test * updated util method to get all container IDs * updated test to use unique sandbox name * removed long name * removed only from test * logging for scaffold tests * added logging for setup * upped the timeout time for scaffold tests * added ports to taquito flextesa to prevent collisions * putting chunks back in * mac mini update, I undo'd too far * updated env var in test * removing final check to see if container stopped since it can give a false fail in CI * moving away from local to local-tf for uniqueness checking in tests * made sandbox name into localTF for taquito-flextesa * upped test timeout to 10 minutes * removing logging for testing * put single worker back in * going back to parallel workers * removed unused variable * removing update to the timeout limit * logging for taquito flextesa tests * added max workers=2 * putting max workers back to 1 * Refactored scaffold task to resolve memory leaks. However, there are still some present * Committing work thus far * Fixed problem with memory leaks for the scaffold task * updated test command to not use detect commands and not use CI flag * added wait for stopping flextesa container * logging for CI * upped timeout and making tests not verbose * added waiting for flextesa sandbox to finish booting up * removing all console.log messages in tests due to popular demand https://ecadlabs.slack.com/archives/C021J32T05B/p1669155878414139 * upped the test timeout * removing bad assertiong that has no point * cleaning up unused variable Co-authored-by: Houston <32914364+hu3man@users.noreply.github.com> Co-authored-by: Michael Weichert <mweichert@gmail.com>
TezosTaqueria · Nov 23, 2022 · bc8c440 · bc8c440
1 parent 3c678d3
commit bc8c440
Show file tree

Hide file tree

Showing 30 changed files with 291 additions and 849 deletions.
diff --git a/deno-lock.json b/deno-lock.json
@@ -70,6 +70,22 @@
   "https://deno.land/std@0.128.0/io/buffer.ts": "bd0c4bf53db4b4be916ca5963e454bddfd3fcd45039041ea161dbf826817822b",
   "https://deno.land/std@0.128.0/io/types.d.ts": "01f60ae7ec02675b5dbed150d258fc184a78dfe5c209ef53ba4422b46b58822c",
   "https://deno.land/std@0.128.0/streams/conversion.ts": "712585bfa0172a97fb68dd46e784ae8ad59d11b88079d6a4ab098ff42e697d21",
+  "https://deno.land/std@0.141.0/_util/assert.ts": "e94f2eb37cebd7f199952e242c77654e43333c1ac4c5c700e929ea3aa5489f74",
+  "https://deno.land/std@0.141.0/_util/os.ts": "3b4c6e27febd119d36a416d7a97bd3b0251b77c88942c8f16ee5953ea13e2e49",
+  "https://deno.land/std@0.141.0/fmt/colors.ts": "30455035d6d728394781c10755351742dd731e3db6771b1843f9b9e490104d37",
+  "https://deno.land/std@0.141.0/fmt/printf.ts": "e2c0f72146aed1efecf0c39ab928b26ae493a2278f670a871a0fbdcf36ff3379",
+  "https://deno.land/std@0.141.0/path/_constants.ts": "df1db3ffa6dd6d1252cc9617e5d72165cd2483df90e93833e13580687b6083c3",
+  "https://deno.land/std@0.141.0/path/_interface.ts": "ee3b431a336b80cf445441109d089b70d87d5e248f4f90ff906820889ecf8d09",
+  "https://deno.land/std@0.141.0/path/_util.ts": "c1e9686d0164e29f7d880b2158971d805b6e0efc3110d0b3e24e4b8af2190d2b",
+  "https://deno.land/std@0.141.0/path/common.ts": "bee563630abd2d97f99d83c96c2fa0cca7cee103e8cb4e7699ec4d5db7bd2633",
+  "https://deno.land/std@0.141.0/path/glob.ts": "cb5255638de1048973c3e69e420c77dc04f75755524cb3b2e160fe9277d939ee",
+  "https://deno.land/std@0.141.0/path/mod.ts": "d3e68d0abb393fb0bf94a6d07c46ec31dc755b544b13144dee931d8d5f06a52d",
+  "https://deno.land/std@0.141.0/path/posix.ts": "293cdaec3ecccec0a9cc2b534302dfe308adb6f10861fa183275d6695faace44",
+  "https://deno.land/std@0.141.0/path/separator.ts": "fe1816cb765a8068afb3e8f13ad272351c85cbc739af56dacfc7d93d710fe0f9",
+  "https://deno.land/std@0.141.0/path/win32.ts": "31811536855e19ba37a999cd8d1b62078235548d67902ece4aa6b814596dd757",
+  "https://deno.land/std@0.141.0/testing/_diff.ts": "029a00560b0d534bc0046f1bce4bd36b3b41ada3f2a3178c85686eb2ff5f1413",
+  "https://deno.land/std@0.141.0/testing/_format.ts": "0d8dc79eab15b67cdc532826213bbe05bccfd276ca473a50a3fc7bbfb7260642",
+  "https://deno.land/std@0.141.0/testing/asserts.ts": "0346e6c8bc695d16ff6f975d0bc5f7e7d6dffd4e642d467539a443bcbb9dc4fa",
   "https://deno.land/std@0.85.0/async/deferred.ts": "f89ed49ba5e1dd0227c6bd5b23f017be46c3f92e4f0338dda08ff5aa54b9f6c9",
   "https://deno.land/std@0.85.0/async/delay.ts": "9de1d8d07d1927767ab7f82434b883f3d8294fb19cad819691a2ad81a728cf3d",
   "https://deno.land/std@0.85.0/async/mod.ts": "253b41c658d768613eacfb11caa0a9ca7148442f932018a45576f7f27554c853",
@@ -546,6 +562,25 @@
   "https://deno.land/x/zod@v3.14.4/index.ts": "035a7422d9f2be54daa0fe464254b69225b443000673e4794095d672471e8792",
   "https://deno.land/x/zod@v3.14.4/mod.ts": "64e55237cb4410e17d968cd08975566059f27638ebb0b86048031b987ba251c4",
   "https://deno.land/x/zod@v3.14.4/types.ts": "7829a9fe28910b928e13de4b1b7ae72798ab09934daf69f3ef9d7ce52d0d5663",
+<<<<<<< HEAD
+  "https://esm.sh/ts-pattern@3.3.5": "66e9bf036b8011bb8b1200cd1f77f20f3ca6c73a2a564bd4b1c670ab475bc3a4",
+  "https://esm.sh/v87/ts-pattern@3.3.5/deno/ts-pattern.js": "db969966eb9f3caeb4a8c277792abd498abc0bd2d01a34c0796c6aacdb601db0",
+  "https://esm.sh/v87/ts-pattern@3.3.5/lib/guards.d.ts": "23d3ac26c35d4ea250f4f6fa07b659bd29c927a9b2820538566b6cb4430b28c3",
+  "https://esm.sh/v87/ts-pattern@3.3.5/lib/index.d.ts": "9be090eb63ebe134cd5016ce8619bec07146219443604c34232a548303f262d8",
+  "https://esm.sh/v87/ts-pattern@3.3.5/lib/symbols.d.ts": "98319b603cf3f3a8b5b2c41de042cde79d84b690f26c0b4685e4e672df8ca404",
+  "https://esm.sh/v87/ts-pattern@3.3.5/lib/types/BuildMany.d.ts": "3674e53f36e6e41ba02338325facde0d9a955de5d7fd688498f587782db88093",
+  "https://esm.sh/v87/ts-pattern@3.3.5/lib/types/DeepExclude.d.ts": "5c60171c7dd994fe164c8bbf3fc8ea24c38e59b28d591f5aabeff38ec88c6412",
+  "https://esm.sh/v87/ts-pattern@3.3.5/lib/types/DistributeUnions.d.ts": "ea6d9a52a1dcafa3e3b00638585ab474f1ee12742047df8650f2dafda2e7b23e",
+  "https://esm.sh/v87/ts-pattern@3.3.5/lib/types/ExtractPreciseValue.d.ts": "9e1e400b20494dfc0b76dbb958fbeb4d1ab1d466ede399d68cf0f48f0fb8c739",
+  "https://esm.sh/v87/ts-pattern@3.3.5/lib/types/FindSelected.d.ts": "566c9855f7664544a79da7c90fa5f7d9d56410984e7fed1692860df71c121ebb",
+  "https://esm.sh/v87/ts-pattern@3.3.5/lib/types/InvertPattern.d.ts": "02923619121da147c587d07cf4fe44cff411ff30f1f73c73e75d7649ff680407",
+  "https://esm.sh/v87/ts-pattern@3.3.5/lib/types/IsMatching.d.ts": "cec8189326776ce185aaec51fca5e7614febfd698371250fe5f05ce839ace71e",
+  "https://esm.sh/v87/ts-pattern@3.3.5/lib/types/Match.d.ts": "63e07e40910e6e8d4c4f08027aca1e7397aa31673a9dbfed50c9442b0800995b",
+  "https://esm.sh/v87/ts-pattern@3.3.5/lib/types/Pattern.d.ts": "f30e3728c2943012603e55ab32cf3553ecf62a4cb90702169bddd8028aee7a35",
+  "https://esm.sh/v87/ts-pattern@3.3.5/lib/types/helpers.d.ts": "93e97f7a2715e8391e59ffd02e23773fdd9184c041719cb4e52821501b3995d0",
+  "https://esm.sh/v87/ts-pattern@3.3.5/lib/wildcards.d.ts": "c1bfcc56d4e49285e3254b407a36325dd2f099dba94fe7dee68d992d1fc35429",
+=======
   "https://esm.sh/ts-pattern@3.3.5": "68b836c71a4de8d4b55fd8469d517ab80bb4cc7969a8db6ad25f9fe5b15815bf",
+>>>>>>> main
   "https://raw.githubusercontent.com/mweichert/clipboard/master/mod.ts": "6368780ee65d9f034a23b7d525229947e02f141a16f1678f2b25735f391a2c6e"
 }
diff --git a/tests/e2e/data/config-flextesa-test-sandbox.json b/tests/e2e/data/config-flextesa-test-sandbox.json
@@ -1,47 +1,67 @@
 {
 	"language": "en",
 	"plugins": [
+		{
+			"name": "@taqueria/plugin-core",
+			"type": "npm"
+		},
 		{
 			"name": "@taqueria/plugin-flextesa",
 			"type": "npm"
 		}
 	],
 	"contractsDir": "contracts",
-	"testsDir": "tests",
 	"artifactsDir": "artifacts",
 	"environment": {
 		"default": "development",
 		"development": {
 			"networks": [],
 			"sandboxes": [
 				"local",
-				"test"
+				"test",
+				"override"
 			]
 		}
 	},
 	"sandbox": {
 		"local": {
 			"label": "Local Tezos Sandbox",
-			"protocol": "Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A",
-			"rpcUrl": "http://localhost:20010",
+			"protocol": "PtKathmankSpLLDALzWw7CGD2j2MtyveTwboEYokqUCP4a1LxMg",
+			"rpcUrl": "http://localhost:20020",
 			"tzkt": {
 				"disableAutostartWithSandbox": false,
-				"postgresqlPort": 5462,
-				"apiPort": 5030
+				"postgresqlPort":5432,
+				"apiPort": 5000
 			}
 		},
 		"test": {
 			"label": "Test Tezos Sandbox",
-			"protocol": "Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A",
-			"rpcUrl": "http://localhost:20020",
+			"protocol": "PtKathmankSpLLDALzWw7CGD2j2MtyveTwboEYokqUCP4a1LxMg",
+			"rpcUrl": "http://localhost:20010",
 			"tzkt": {
 				"disableAutostartWithSandbox": false,
-				"postgresqlPort": 5472,
-				"apiPort": 5040
+				"postgresqlPort": 5442,
+				"apiPort": 5010
 			}
+		},
+		"override": {
+			"label": "Test Tezos Sandbox",
+			"protocol": "PtKathmankSpLLDALzWw7CGD2j2MtyveTwboEYokqUCP4a1LxMg",
+			"rpcUrl": "http://localhost:20100",
+			"tzkt": {
+				"disableAutostartWithSandbox": false,
+				"postgresqlPort": 5532,
+				"apiPort": 5100
+			}
+		}
+	},
+	"network": {
+		"ghostnet": {
+			"label": "ghostnet",
+			"rpcUrl": "https://ghostnet.ecadinfra.com",
+			"protocol": "PtKathmankSpLLDALzWw7CGD2j2MtyveTwboEYokqUCP4a1LxMg"
 		}
 	},
-	"network": {},
 	"accounts": {
 		"bob": "3_000_000_000",
 		"alice": "3_000_000_000",

diff --git a/tests/e2e/data/config-flextesa-updated-sandbox.json b/tests/e2e/data/config-flextesa-updated-sandbox.json
diff --git a/tests/e2e/data/config-taquito-flextesa-local-sandbox-test-environment.json b/tests/e2e/data/config-taquito-flextesa-local-sandbox-test-environment.json
@@ -1,6 +1,10 @@
 {
 	"language": "en",
 	"plugins": [
+		{
+			"name": "@taqueria/plugin-core",
+			"type": "npm"
+		},
 		{
 			"name": "@taqueria/plugin-taquito",
 			"type": "npm"
@@ -11,33 +15,25 @@
 		}
 	],
 	"contractsDir": "contracts",
-	"testsDir": "tests",
 	"artifactsDir": "artifacts",
 	"environment": {
 		"default": "development",
 		"development": {
 			"networks": [],
 			"sandboxes": [
-				"local"
-			],
-			"accounts": {
-				"bob": "3_000_000_000",
-				"alice": "3_000_000_000",
-				"john": "3_000_000_000",
-				"jane": "3_000_000_000",
-				"joe": "3_000_000_000"
-			}
+				"localTF"
+			]
 		}
 	},
 	"sandbox": {
-		"local": {
-			"label": "Local Ithaca Tezos Sandbox",
-			"protocol": "PtJakart2xVj7pYXJBXrqHgd82rdkLey5ZeeGwDgPp9rhQUbSqY",
-			"rpcUrl": "http://localhost:20040",
+		"localTF": {
+			"label": "Local Tezos Sandbox",
+			"rpcUrl": "http://localhost:20000",
+			"protocol": "PtKathmankSpLLDALzWw7CGD2j2MtyveTwboEYokqUCP4a1LxMg",
 			"tzkt": {
 				"disableAutostartWithSandbox": false,
-				"postgresqlPort": 5442,
-				"apiPort": 5010
+				"postgresqlPort":5492,
+				"apiPort": 5090
 			}
 		}
 	},

diff --git a/tests/e2e/data/config-taquito-test-environment-invalid-config-network-url.json b/tests/e2e/data/config-taquito-test-environment-invalid-config-network-url.json
@@ -1,13 +1,16 @@
 {
 	"language": "en",
 	"plugins": [
+		{
+			"name": "@taqueria/plugin-core",
+			"type": "npm"
+		},
 		{
 			"name": "@taqueria/plugin-taquito",
 			"type": "npm"
 		}
 	],
 	"contractsDir": "contracts",
-	"testsDir": "tests",
 	"artifactsDir": "artifacts",
 	"environment": {
 		"default": "development",
@@ -17,61 +20,39 @@
 				"local"
 			]
 		},
-		"test": {
-			"networks": ["ithacanet"],
+		"testing": {
+			"networks": [
+				"ghostnet"
+			],
 			"sandboxes": []
 		}
 	},
 	"sandbox": {
 		"local": {
 			"label": "Local Tezos Sandbox",
-			"protocol": "Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A",
-			"rpcUrl": "http://localhost:20050"
+			"protocol": "PtKathmankSpLLDALzWw7CGD2j2MtyveTwboEYokqUCP4a1LxMg",
+			"rpcUrl": "http://localhost:20030"
 		}
 	},
 	"network": {
-		"ithacanet": {
-			"label": "ithacanet",
-			"rpcUrl": "https://invalid.test",
-			"protocol": "Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A",
+		"ghostnet": {
+			"label": "ghostnet",
+			"rpcUrl": "https://ghostnetbet.ecadinfrastructure.com",
+			"protocol": "PtKathmankSpLLDALzWw7CGD2j2MtyveTwboEYokqUCP4a1LxMg",
 			"accounts": {
 				"taqOperatorAccount": {
 					"publicKey": "p2pk666TYDPwRzgE2emHyTM4RSLbypvhHwhk6RwEtasA5arSBgf6bAq",
 					"publicKeyHash": "tz3P5zrUYGJnryVfZ5JFeLMMojdjQFGLUFiK",
 					"privateKey": "p2sk2sF7GEUMB11cmzpLBpXh7F1Asru5sNCneUjWDMqxpoCZA3DLNf"
 				}
-			},
-			"faucet": {
-				"pkh": "tz1c2fnjgqPLLpi868v1JEEkTCSpvGCHwAB4",
-				"mnemonic": [
-					"cute",
-					"will",
-					"core",
-					"industry",
-					"much",
-					"carbon",
-					"piano",
-					"truth",
-					"grunt",
-					"twist",
-					"wage",
-					"marble",
-					"profit",
-					"text",
-					"cradle"
-				],
-				"email": "koylsfnp.nhwyqepc@teztnets.xyz",
-				"password": "uFP1Ep650w",
-				"amount": "166703139463",
-				"activation_code": "409bcde89e7946e51b7c19da994d0997276e676f"
 			}
 		}
 	},
 	"accounts": {
-		"bob": "3000000000",
-		"alice": "2000000000",
-		"john": "4000000000",
-		"jane": "5000000000",
-		"joe": "1000000000"
+		"bob": "3_000_000_000",
+		"alice": "3_000_000_000",
+		"john": "3_000_000_000",
+		"jane": "3_000_000_000",
+		"joe": "3_000_000_000"
 	}
 }