refactor: Moved tests out of folder short-circuit and removed the fol…

…der.

src/optimizer/test/__snapshots__/short-circuit-inits.spec.ts.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`constant-propagation constant-init-and should fail boolean short-circuiting during initialization 1`] = `
+exports[`short-circuit-initialization short-circuit-constant-init-and should fail boolean short-circuiting during initialization 1`] = `
 "<unknown>:4:35: Cannot evaluate expression to a constant: divisor expression must be non-zero
   3 | 
 > 4 | const A: Bool = true && exception(0);
@@ -9,7 +9,7 @@ exports[`constant-propagation constant-init-and should fail boolean short-circui
 "
 `;
 
-exports[`constant-propagation constant-init-or should fail boolean short-circuiting during initialization 1`] = `
+exports[`short-circuit-initialization short-circuit-constant-init-or should fail boolean short-circuiting during initialization 1`] = `
 "<unknown>:4:36: Cannot evaluate expression to a constant: divisor expression must be non-zero
   3 | 
 > 4 | const A: Bool = false || exception(0);
@@ -18,7 +18,7 @@ exports[`constant-propagation constant-init-or should fail boolean short-circuit
 "
 `;
 
-exports[`constant-propagation contract-constant-init-and should fail boolean short-circuiting during initialization 1`] = `
+exports[`short-circuit-initialization short-circuit-contract-constant-init-and should fail boolean short-circuiting during initialization 1`] = `
 "<unknown>:12:39: Cannot evaluate expression to a constant: divisor expression must be non-zero
   11 | contract CTest {
 > 12 |     const A: Bool = true && exception(0);
@@ -27,7 +27,7 @@ exports[`constant-propagation contract-constant-init-and should fail boolean sho
 "
 `;
 
-exports[`constant-propagation contract-constant-init-or should fail boolean short-circuiting during initialization 1`] = `
+exports[`short-circuit-initialization short-circuit-contract-constant-init-or should fail boolean short-circuiting during initialization 1`] = `
 "<unknown>:12:40: Cannot evaluate expression to a constant: divisor expression must be non-zero
   11 | contract CTest {
 > 12 |     const A: Bool = false || exception(0);
@@ -36,7 +36,7 @@ exports[`constant-propagation contract-constant-init-or should fail boolean shor
 "
 `;
 
-exports[`constant-propagation contract-init-and should fail boolean short-circuiting during initialization 1`] = `
+exports[`short-circuit-initialization short-circuit-contract-init-and should fail boolean short-circuiting during initialization 1`] = `
 "<unknown>:12:33: Cannot evaluate expression to a constant: divisor expression must be non-zero
   11 | contract CTest {
 > 12 |     A: Bool = true && exception(0);
@@ -45,7 +45,7 @@ exports[`constant-propagation contract-init-and should fail boolean short-circui
 "
 `;
 
-exports[`constant-propagation contract-init-or should fail boolean short-circuiting during initialization 1`] = `
+exports[`short-circuit-initialization short-circuit-contract-init-or should fail boolean short-circuiting during initialization 1`] = `
 "<unknown>:12:34: Cannot evaluate expression to a constant: divisor expression must be non-zero
   11 | contract CTest {
 > 12 |     A: Bool = false || exception(0);
@@ -54,7 +54,7 @@ exports[`constant-propagation contract-init-or should fail boolean short-circuit
 "
 `;
 
-exports[`constant-propagation short-circuit-initializations should pass boolean short-circuiting during initialization 1`] = `
+exports[`short-circuit-initialization short-circuit-initializations should pass boolean short-circuiting during initialization 1`] = `
 [
   [
     "true",
@@ -311,7 +311,7 @@ exports[`constant-propagation short-circuit-initializations should pass boolean
 ]
 `;
 
-exports[`constant-propagation struct-init-and should fail boolean short-circuiting during initialization 1`] = `
+exports[`short-circuit-initialization short-circuit-struct-init-and should fail boolean short-circuiting during initialization 1`] = `
 "<unknown>:5:33: Cannot evaluate expression to a constant: divisor expression must be non-zero
   4 | struct STest {
 > 5 |     A: Bool = true && exception(0);
@@ -320,7 +320,7 @@ exports[`constant-propagation struct-init-and should fail boolean short-circuiti
 "
 `;
 
-exports[`constant-propagation struct-init-or should fail boolean short-circuiting during initialization 1`] = `
+exports[`short-circuit-initialization short-circuit-struct-init-or should fail boolean short-circuiting during initialization 1`] = `
 "<unknown>:5:34: Cannot evaluate expression to a constant: divisor expression must be non-zero
   4 | struct STest {
 > 5 |     A: Bool = false || exception(0);

src/optimizer/test/short-circuit-inits.spec.ts

@@ -11,7 +11,7 @@ import { resolveStatements } from "../../types/resolveStatements";
 import { loadCases } from "../../utils/loadCases";
 
 describe("short-circuit-initialization", () => {
-    for (const r of loadCases(__dirname + "/short-circuit/success/")) {
+    for (const r of loadCases(__dirname + "/success/")) {
         it(`${r.name} should pass boolean short-circuiting during initialization`,
             () => {
                 const Ast = getAstFactory();
@@ -29,7 +29,7 @@ describe("short-circuit-initialization", () => {
             },
         );
     }
-    for (const r of loadCases(__dirname + "/short-circuit/failed/")) {
+    for (const r of loadCases(__dirname + "/failed/")) {
         it(`${r.name} should fail boolean short-circuiting during initialization`,
             () => {
                 const Ast = getAstFactory();