test: reorganize the tests

Author: PaulRBerg

src/releases/lockup/v2.0/deployments.ts

@@ -170,7 +170,7 @@ export const mainnets: Sablier.Deployment[] = [
     [manifest.HELPERS]: "0x424B27529B49EF4Bfa0727aFcFE4387Ac2932944",
     [manifest.LOCKUP_NFT_DESCRIPTOR]: "0xeaFB40669fe3523b073904De76410b46e79a56D7",
     [manifest.SABLIER_BATCH_LOCKUP]: "0xAc2E42b520364940c90Ce164412Ca9BA212d014B",
-    [manifest.SABLIER_LOCKUP]: ["0x28fCAE6bda2546C93183EeC8638691B2EB184003", 11_275_708],
+    [manifest.SABLIER_LOCKUP]: ["0x0000000000000000000000000000000000001010", 11_275_708],
     [manifest.VESTING_MATH]: "0x9971914DA16787F6cCfb27bEfB4404e33C8b869D",
   }),
   get(chains.superseed.id, {

tests/airdrops.test.ts renamed to tests/deployments/airdrops.test.ts

@@ -1,5 +1,5 @@
 import _ from "lodash";
-import type { BasicContract, BroadcastJSON, ZKBroadcastJSON } from "./types";
+import type { BasicContract, BroadcastJSON, ZKBroadcastJSON } from "../../types";
 
 const CONTRACT_PREFIX = "contract ";
 

tests/flow.test.ts renamed to tests/deployments/flow.test.ts

@@ -2,9 +2,9 @@ import queries from "@src/queries";
 import type { Sablier } from "@src/types";
 import _ from "lodash";
 import { beforeAll, describe, expect, it } from "vitest";
-import { isKnownMissing } from "../setup/missing";
+import { isKnownMissing } from "../../setup/missing";
+import type { BasicContract, BroadcastJSON, ZKBroadcastJSON } from "../../types";
 import { findContract, findZKContract, loadBroadcastJSON, loadZKBroadcastJSONs } from "./helpers";
-import type { BasicContract, BroadcastJSON, ZKBroadcastJSON } from "./types";
 
 type Validated = {
   [chainId: number]: {
@@ -15,7 +15,7 @@ type Validated = {
 };
 const validatedContracts: Validated = {};
 
-export function validateContract(contract: BasicContract, expectedContract: BasicContract): void {
+function expectContract(contract: BasicContract, expectedContract: BasicContract): void {
   const address = contract.address.toLowerCase();
   const expectedAddress = expectedContract.address.toLowerCase();
   expect(address).toBe(expectedAddress);
@@ -24,7 +24,7 @@ export function validateContract(contract: BasicContract, expectedContract: Basi
   expect(name).toBe(expectedContract.name);
 }
 
-export function validateZKContract(contract: BasicContract, zkBroadcast: ZKBroadcastJSON): void {
+function expectZKContract(contract: BasicContract, zkBroadcast: ZKBroadcastJSON): void {
   const address = contract.address.toLowerCase();
   const expectedAddress = zkBroadcast.entries[0].address.toLowerCase();
   expect(address).toBe(expectedAddress);
@@ -41,7 +41,7 @@ export function validateZKContract(contract: BasicContract, zkBroadcast: ZKBroad
 type TestConfig<BD, CD> = {
   finder: (data: BD, contractName: string) => CD | null;
   loader: (release: Sablier.Release, chain: Sablier.Chain, componentName?: string) => Promise<BD | null>;
-  validator: (contract: BasicContract, data: CD) => void;
+  expector: (contract: BasicContract, data: CD) => void;
 };
 
 function createInnerTests<BD, CD>(
@@ -76,7 +76,9 @@ function createInnerTests<BD, CD>(
           expect(previouslyValidated, message).toBeTruthy();
           return;
         }
-        testConfig.validator(contract, contractData);
+
+        // Run the test.
+        testConfig.expector(contract, contractData);
 
         // Mark this contract as validated for this chain.
         _.set(validatedContracts, [chain.id, contract.name, contract.address], true);
@@ -111,17 +113,17 @@ export function createStandardTests(
   chain: Sablier.Chain,
 ): void {
   createContractTests<BroadcastJSON, BasicContract>(release, deployment, chain, {
+    expector: expectContract,
     finder: findContract,
     loader: loadBroadcastJSON,
-    validator: validateContract,
   });
 }
 
 export function createZKTests(release: Sablier.Release, deployment: Sablier.Deployment, chain: Sablier.Chain): void {
   createContractTests<ZKBroadcastJSON[], ZKBroadcastJSON>(release, deployment, chain, {
+    expector: expectZKContract,
     finder: findZKContract,
     loader: loadZKBroadcastJSONs,
-    validator: validateZKContract,
   });
 }
 

tests/lockup.test.ts renamed to tests/deployments/lockup.test.ts

@@ -4,7 +4,7 @@ import { logAndThrow } from "@scripts/logger";
 import type { Sablier } from "@src/types";
 import { globby } from "globby";
 import _ from "lodash";
-import type { BasicContract, BroadcastJSON, ZKBroadcastJSON } from "./types";
+import type { BasicContract, BroadcastJSON, ZKBroadcastJSON } from "../../types";
 
 const CONTRACT_PREFIX = "contract ";
 

tests/utils/finders.ts renamed to tests/deployments/utils/finders.ts

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import { checkBroadcast } from "@scripts/check-broadcasts";
 import type { Sablier } from "@src/types";
 import { globby } from "globby";
-import type { BroadcastJSON, ZKBroadcastJSON } from "./types";
+import type { BroadcastJSON, ZKBroadcastJSON } from "../../types";
 
 export async function loadBroadcastJSON(
   release: Sablier.Release,