Revert test sript

l1-verifier/scripts/test.js

@@ -1,4 +1,4 @@
-const { fork, spawn, execSync } = require('node:child_process');
+const { fork } = require('node:child_process');
 const ganache = require('ganache');
 const options = {
   logging: {
@@ -10,34 +10,36 @@ async function main() {
   const server = ganache.server(options);
   console.log('Starting server');
   const port = await new Promise((resolve, reject) => {
-    server.listen(8888, async (err) => {
+    server.listen(0, async (err) => {
       console.log(`Listening on port ${server.address().port}`);
       if (err) reject(err);
       resolve(server.address().port);
     });
   });
 
   console.log('Starting hardhat');
-
-  const code = await new Promise((resolve, reject) => {
-    const hh = spawn('hardhat', ['test', '--network', 'ganache'], {
-      stdio: 'inherit'
-    });
-    hh.on('close', (code) => {
-      console.log('Shutting down');
-      server.close();
-      if (code === 0) {
-        resolve(code);
-        process.exit(code);
-      } else {
-        reject(code);
+  const code = await new Promise((resolve) => {
+    const hh = fork(
+      'node_modules/.bin/hardhat',
+      ['test', '--network', 'ganache'],
+      {
+        stdio: 'inherit',
+        env: {
+          RPC_PORT: port.toString(),
+        },
       }
-    });
+    );
+    hh.on('close', (code) => resolve(code));
   });
+
+  console.log('Shutting down');
+  server.close();
+  process.exit(code);
 }
 
 // We recommend this pattern to be able to use async/await everywhere
 // and properly handle errors.
 main().catch((error) => {
-  process.exit(error);
+  console.error(error);
+  process.exitCode = 1;
 });

l1-verifier/test/testL1Verifier.ts

@@ -4,6 +4,7 @@ import { HardhatEthersProvider } from '@nomicfoundation/hardhat-ethers/internal/
 import type { HardhatEthersHelpers } from '@nomicfoundation/hardhat-ethers/types';
 import { expect } from 'chai';
 import {
+  BrowserProvider,
   Contract,
   FetchRequest,
   JsonRpcProvider,
@@ -29,15 +30,15 @@ declare module 'hardhat/types/runtime' {
 }
 
 describe('L1Verifier', () => {
-  let provider: JsonRpcProvider;
+  let provider: BrowserProvider;
   let signer: Signer;
   let verifier: Contract;
   let target: Contract;
 
   before(async () => {
     // Hack to get a 'real' ethers provider from hardhat. The default `HardhatProvider`
     // doesn't support CCIP-read.
-    provider = new ethers.JsonRpcProvider('http://localhost:8888');
+    provider = new ethers.BrowserProvider(ethers.provider._hardhatProvider);
     // provider.on("debug", (x: any) => console.log(JSON.stringify(x, undefined, 2)));
     signer = await provider.getSigner(0);
     const gateway = makeL1Gateway(provider as unknown as JsonRpcProvider);