fix: use 'lite-server' instead of 'serve' for serving files outside o…

…f root
zkmopro · Dec 4, 2024 · d9419d8 · d9419d8
1 parent fa543ff
commit d9419d8
Show file tree

Hide file tree

Showing 6 changed files with 847 additions and 417 deletions.
diff --git a/test-e2e/web/bs-config.js b/test-e2e/web/bs-config.js
@@ -0,0 +1,15 @@
+export const server = {
+    baseDir: "./",
+    routes: {
+      "/test-vectors": "../../test-vectors"
+    },
+    middleware: [
+      // To allow COR for only testing and development
+      function (req, res, next) {
+        res.setHeader("Cross-Origin-Embedder-Policy", "require-corp");
+        res.setHeader("Cross-Origin-Opener-Policy", "same-origin");
+        next();
+      }
+    ]
+  };
+
diff --git a/test-e2e/web/index.js b/test-e2e/web/index.js
@@ -25,7 +25,7 @@ const chrome = require('selenium-webdriver/chrome');
 
         // Log ChromeDriver version via WebDriver
         const driverVersion = await driver.executeScript('return navigator.userAgent');
-        console.log(`WebDriver user agent: ${driverVersion}`);
+        console.log(`WebDriver user agent:\n${driverVersion}`);
 
         await driver.get('http://localhost:3000');
 

diff --git a/test-e2e/web/package.json b/test-e2e/web/package.json
@@ -6,13 +6,13 @@
   "author": "Jinhwan",
   "license": "MIT",
   "scripts": {
-    "start": "yarn serve",
+    "start": "yarn lite-server",
     "test": "node index.js"
   },
   "dependencies": {
     "selenium-webdriver": "^4.27.0"
   },
   "devDependencies": {
-    "serve": "^14.2.4"
+    "lite-server": "^2.6.1"
   }
 }
diff --git a/test-e2e/web/serve.json b/test-e2e/web/serve.json
diff --git a/test-e2e/web/test_halo2.js b/test-e2e/web/test_halo2.js
@@ -28,9 +28,9 @@ async function measureTime(callback) {
 
 async function run_plonk_test(input) {
     try {
-        const SRS_KEY = await fetchBinaryFile('./mopro-pkg/parameters/plonk_fibonacci_srs.bin');
-        const PROVING_KEY = await fetchBinaryFile('./mopro-pkg/parameters/plonk_fibonacci_pk.bin');
-        const VERIFYING_KEY = await fetchBinaryFile('./mopro-pkg/parameters/plonk_fibonacci_vk.bin');
+        const SRS_KEY = await fetchBinaryFile('./test-vectors/halo2/plonk_fibonacci_srs.bin');
+        const PROVING_KEY = await fetchBinaryFile('./test-vectors/halo2/plonk_fibonacci_pk.bin');
+        const VERIFYING_KEY = await fetchBinaryFile('./test-vectors/halo2/plonk_fibonacci_vk.bin');
 
         const { result: proofResult, timeTaken: proofTime } = await measureTime(() =>
             mopro_wasm.generate_plonk_proof(SRS_KEY, PROVING_KEY, input)
@@ -53,9 +53,9 @@ async function run_plonk_test(input) {
 
 async function run_hyperplonk_test(input) {
     try {
-        const SRS_KEY = await fetchBinaryFile('./mopro-pkg/parameters/hyperplonk_fibonacci_srs.bin');
-        const PROVING_KEY = await fetchBinaryFile('./mopro-pkg/parameters/hyperplonk_fibonacci_pk.bin');
-        const VERIFYING_KEY = await fetchBinaryFile('./mopro-pkg/parameters/hyperplonk_fibonacci_vk.bin');
+        const SRS_KEY = await fetchBinaryFile('./test-vectors/halo2/hyperplonk_fibonacci_srs.bin');
+        const PROVING_KEY = await fetchBinaryFile('./test-vectors/halo2/hyperplonk_fibonacci_pk.bin');
+        const VERIFYING_KEY = await fetchBinaryFile('./test-vectors/halo2/hyperplonk_fibonacci_vk.bin');
 
         const { result: proofResult, timeTaken: proofTime } = await measureTime(() =>
             mopro_wasm.generate_hyperplonk_proof(SRS_KEY, PROVING_KEY, input)
@@ -79,9 +79,9 @@ async function run_hyperplonk_test(input) {
 
 async function run_gemini_test(input) {
     try {
-        const SRS_KEY = await fetchBinaryFile('./mopro-pkg/parameters/gemini_fibonacci_srs.bin');
-        const PROVING_KEY = await fetchBinaryFile('./mopro-pkg/parameters/gemini_fibonacci_pk.bin');
-        const VERIFYING_KEY = await fetchBinaryFile('./mopro-pkg/parameters/gemini_fibonacci_vk.bin');
+        const SRS_KEY = await fetchBinaryFile('./test-vectors/halo2/gemini_fibonacci_srs.bin');
+        const PROVING_KEY = await fetchBinaryFile('./test-vectors/halo2/gemini_fibonacci_pk.bin');
+        const VERIFYING_KEY = await fetchBinaryFile('./test-vectors/halo2/gemini_fibonacci_vk.bin');
 
         const { result: proofResult, timeTaken: proofTime } = await measureTime(() =>
             mopro_wasm.generate_gemini_proof(SRS_KEY, PROVING_KEY, input)