Rename test dirs

.gitignore

@@ -137,5 +137,5 @@ chain-data
 # ignore vite config timestamps
 vite.config.ts.timestamp*
 
-# ignore test results dir
-**/tests/**/test_results
+# ignore our cache dir
+.cache

dev/config/src/projectInfo.ts

@@ -11,6 +11,14 @@ export const getRootDir = () => {
     return new URL('../../..', import.meta.url).pathname.slice(0, -1)
 }
 
+export const getCacheDir = () => {
+    return `${getRootDir()}/.cache`
+}
+
+export const getTestResultsDir = () => {
+    return `${getCacheDir()}/test-results`
+}
+
 export const getDevDir = () => {
     return `${getRootDir()}/dev`
 }

dev/config/src/vite/vite.test.config.ts

@@ -20,7 +20,7 @@ export default function () {
             root: getRootDir(),
             include: ['packages/*/src/**/*.{test,spec}.?(c|m)[jt]s?(x)'],
             watch: false,
-            watchExclude: ['**/node_modules/**', '**/dist/**', '../../packages/datasets-fs/src/tests/data/**'],
+            watchExclude: ['**/node_modules/**', '**/dist/**'],
             logHeapUsage: true,
             coverage: {
                 enabled: true,

packages/datasets-fs/package.json

@@ -33,6 +33,7 @@
     "dependencies": {
         "@polkadot/util": "12.6.1",
         "@prosopo/common": "0.3.1",
+        "@prosopo/config": "0.3.1",
         "@prosopo/types": "0.3.1",
         "@prosopo/util": "0.3.1",
         "bcrypt": "^5.1.0",

packages/datasets-fs/src/tests/mocked.test.ts

@@ -8,29 +8,35 @@ import { Resize } from '../commands/resize.js'
 import { afterAll, beforeAll, describe, test } from 'vitest'
 import { blake2b } from '@noble/hashes/blake2b'
 import { captchasEqFs, fsEq, fsWalk, restoreRepoDir, substituteRepoDir } from './utils.js'
+import { getRootDir, getTestResultsDir } from '@prosopo/config'
 import { u8aToHex } from '@polkadot/util/u8a'
 import fs from 'fs'
+import path from 'path'
 import sharp from 'sharp'
 
 describe('dataset commands', () => {
+    const pkgDir = path.relative(getRootDir(), __dirname)
+    const pkgInternalPath = pkgDir.replace(`${__dirname}/`, '')
+    const testResultsDir = `${getTestResultsDir()}/${pkgInternalPath}`
+
     beforeAll(() => {
         // substitute the repo path in the data for tests
         substituteRepoDir()
-        // remove previous test results
-        if (fs.existsSync(`${__dirname}/test_results`)) {
-            fs.rmdirSync(`${__dirname}/test_results`, { recursive: true })
-        }
-        fs.mkdirSync(`${__dirname}/test_results`, { recursive: true })
+        fs.mkdirSync(`${testResultsDir}`, { recursive: true })
     })
 
     afterAll(() => {
         // restore repo path back to placeholder
         restoreRepoDir()
+        // remove test results
+        if (fs.existsSync(`${testResultsDir}`)) {
+            fs.rmdirSync(`${testResultsDir}`, { recursive: true })
+        }
     })
 
     test('labels', async () => {
         const input = `${__dirname}/data/flat_resized/data.json`
-        const output = `${__dirname}/test_results/labels.json`
+        const output = `${testResultsDir}/labels.json`
         const labels = new Labels()
         labels.logger.setLogLevel('error')
         await labels.exec({
@@ -52,7 +58,7 @@ describe('dataset commands', () => {
 
     test('generate v2', async () => {
         const input = `${__dirname}/data/flat_resized/data.json`
-        const output = `${__dirname}/test_results/captchas_v2.json`
+        const output = `${testResultsDir}/captchas_v2.json`
         const minIncorrect = 1
         const minCorrect = 1
         const minLabelled = 2
@@ -120,7 +126,7 @@ describe('dataset commands', () => {
 
     test('generate v1', async () => {
         const input = `${__dirname}/data/flat_resized/data.json`
-        const output = `${__dirname}/test_results/captchas_v1.json`
+        const output = `${testResultsDir}/captchas_v1.json`
         const generate = new GenerateV1()
         generate.logger.setLogLevel('error')
         await generate.exec({
@@ -143,7 +149,7 @@ describe('dataset commands', () => {
 
     test('resizes data', async () => {
         const input = `${__dirname}/data/flat/data.json`
-        const output = `${__dirname}/test_results/flat_resized`
+        const output = `${testResultsDir}/flat_resized`
         const resize = new Resize()
         resize.logger.setLogLevel('error')
         await resize.exec({
@@ -174,7 +180,7 @@ describe('dataset commands', () => {
 
     test('relocates data', async () => {
         const input = `${__dirname}/data/flat_resized/data.json`
-        const output = `${__dirname}/test_results/relocated_data.json`
+        const output = `${testResultsDir}/relocated_data.json`
         const relocate = new Relocate()
         relocate.logger.setLogLevel('error')
         await relocate.exec({
@@ -192,7 +198,7 @@ describe('dataset commands', () => {
 
     test('flattens hierarchical data', async () => {
         const input = `${__dirname}/data/hierarchical`
-        const output = `${__dirname}/test_results/flat`
+        const output = `${testResultsDir}/flat`
         const flatten = new Flatten()
         flatten.logger.setLogLevel('error')
         await flatten.exec({

packages/datasets/src/tests/captcha.test.ts

@@ -22,7 +22,7 @@ import {
     Item,
     MerkleProof,
 } from '@prosopo/types'
-import { NO_SOLUTION_VALUE, getSolutionValueToHash } from '../../src/captcha/index.js'
+import { NO_SOLUTION_VALUE, getSolutionValueToHash } from '../captcha/index.js'
 import { at, get } from '@prosopo/util'
 import { beforeAll, describe, expect, test } from 'vitest'
 import {
@@ -36,7 +36,7 @@ import {
     parseCaptchaDataset,
     sortAndComputeHashes,
     verifyProof,
-} from '../../src/captcha/index.js'
+} from '../captcha/index.js'
 import path from 'path'
 
 describe('CAPTCHA FUNCTIONS', async function () {