Merge pull request #15 from ethpandaops/pk910/fix-tests

move hardhat tests to fundingvault folder,  fix tests & PR workflow

.github/workflows/build-test.yaml

@@ -1,8 +1,11 @@
 name: Build and Test
 on:
+  pull_request:
+    branches:
+      - master
   push:
     branches:
-      - main
+      - master
 
 jobs:
   build:
@@ -18,10 +21,10 @@ jobs:
           node-version: '18.17.1'
 
       - name: Install dependencies
-        run: npm install
+        run: cd fundingvault && npm install
 
       - name: Build project
-        run: npm run build
+        run: cd fundingvault && npm run build
 
       - name: Run tests
-        run: npm run test
+        run: cd fundingvault && npm run test

.gitignore

@@ -1,109 +1,2 @@
-# Allow a dummy project in this directory for testing purposes
-myproject
 
-/node_modules
-/.idea
-*.tsbuildinfo
-
-# VS Code workspace config
-workspace.code-workspace
-
-.DS_Store
-
-# Below is Github's node gitignore template,
-# ignoring the node_modules part, as it'd ignore every node_modules, and we have some for testing
-
-# Logs
-logs
-*.log
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-#node_modules/
-jspm_packages/
-
-# TypeScript v1 declaration files
-typings/
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'pnpm pack'
-*.tgz
-
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-
-# next.js build output
-.next
-
-# nuxt.js build output
-.nuxt
-
-# vuepress build output
-.vuepress/dist
-
-# Serverless directories
-.serverless/
-
-# FuseBox cache
-.fusebox/
-
-# DynamoDB Local files
-.dynamodb/
-
-
-docs/.env.example
-
-# Generated by Cargo
-# will have compiled files and executables
-/target/
-
-# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
-# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
-Cargo.lock
-
-# These are backup files generated by rustfmt
-**/*.rs.bk
-
-# MSVC Windows builds of rustc generate these, which store debugging information
-*.pdb
-
-# VSCode settings
-.vscode/
-*.code-workspace
-
-artifacts
-cache
+.vscode

fundingvault/.gitignore

@@ -0,0 +1,109 @@
+# Allow a dummy project in this directory for testing purposes
+myproject
+
+/node_modules
+/.idea
+*.tsbuildinfo
+
+# VS Code workspace config
+workspace.code-workspace
+
+.DS_Store
+
+# Below is Github's node gitignore template,
+# ignoring the node_modules part, as it'd ignore every node_modules, and we have some for testing
+
+# Logs
+logs
+*.log
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'pnpm pack'
+*.tgz
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# next.js build output
+.next
+
+# nuxt.js build output
+.nuxt
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+
+docs/.env.example
+
+# Generated by Cargo
+# will have compiled files and executables
+/target/
+
+# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
+# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
+Cargo.lock
+
+# These are backup files generated by rustfmt
+**/*.rs.bk
+
+# MSVC Windows builds of rustc generate these, which store debugging information
+*.pdb
+
+# VSCode settings
+.vscode/
+*.code-workspace
+
+artifacts/
+cache/

hardhat.config.js → fundingvault/hardhat.config.js

@@ -3,7 +3,7 @@ require("@nomicfoundation/hardhat-toolbox");
 /** @type import('hardhat/config').HardhatUserConfig */
 module.exports = {
 	paths: {
-		sources: "./fundingvault/contracts",
+		sources: "./contracts",
 	},
 	networks: {
 		hardhat: {

package.json → fundingvault/package.json

@@ -1,11 +1,15 @@
 {
   "name": "hardhat-project",
   "license": "MIT",
+  "version": "0.0.0",
+  "scripts": {
+    "build": "hardhat compile",
+    "test": "hardhat test"
+  },
   "devDependencies": {
     "@nomicfoundation/hardhat-network-helpers": "^1.0.10",
     "@nomicfoundation/hardhat-toolbox": "^3.0.0",
     "@openzeppelin/contracts": "^4.9.5",
     "hardhat": "^2.19.2"
-  },
-  "version": "0.0.0"
+  }
 }