🐦 Test hardhat-waffle-plugin submodule (#810)

rzadp · web-flow · commit f93abe93aab3 · 2022-11-28T15:00:15.000+01:00
diff --git a/.changeset/cyan-weeks-agree.md b/.changeset/cyan-weeks-agree.md
@@ -0,0 +1,6 @@
+---
+"@ethereum-waffle/chai": patch
+"ethereum-waffle": patch
+---
+
+Move call history injection logic to hardhat plugin
diff --git a/.github/workflows/CI-plugin.yml b/.github/workflows/CI-plugin.yml
@@ -0,0 +1,43 @@
+name: Plugin CI
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+jobs:
+  test-waffle-hardhat-plugin:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:        
+        hardhat: ['2.9.2', '2.11.2', 'latest']
+        hardhat-ethers: ['2.0.3', '2.1.1', 'latest']
+        hardhat-waffle: ['linked', 'latest']
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16.x
+      - run: npm i -g pnpm@7.1.9 yarn@1.22.17
+      - run: pnpm install --frozen-lockfile --strict-peer-dependencies
+      - run: pnpm add -D hardhat@${{ matrix.hardhat }}
+        working-directory: waffle-hardhat
+      - run: pnpm add -D @nomiclabs/hardhat-ethers@${{ matrix.hardhat-ethers }}
+        working-directory: waffle-hardhat
+      - run: pnpm add -D @nomiclabs/hardhat-waffle@${{ matrix.hardhat-waffle }}
+        if: ${{ matrix.hardhat-waffle != 'linked' }}
+        working-directory: waffle-hardhat
+      - name: Initialize plugin submodule
+        if: ${{ matrix.hardhat-waffle == 'linked' }}
+        run: |
+          git submodule update --init
+          cd hardhat-waffle-plugin
+          yarn && yarn build
+      - name: Use the submodule in our tests
+        if: ${{ matrix.hardhat-waffle == 'linked' }}
+        run: |
+          rm -rf waffle-hardhat/node_modules/@nomiclabs/hardhat-waffle/dist
+          cp -r hardhat-waffle-plugin/dist waffle-hardhat/node_modules/@nomiclabs/hardhat-waffle
+      - run: pnpm run build
+      - run: pnpm run test
+        working-directory: waffle-hardhat
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -28,69 +28,6 @@ jobs:
         run: sudo cp ./.github/workflows/solc /bin
       - run: pnpm run build
       - run: pnpm run test
-  test-hardhat-pre-244:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: 16.x
-      - run: npm i -g pnpm@7.1.9
-      - run: pnpm install --frozen-lockfile --strict-peer-dependencies
-      - name: setup-solc
-        run: sudo cp ./.github/workflows/solc /bin
-      - run: pnpm run build
-      - name: Install versions of hardhat packages pre 2.4.4
-        run: |
-          pnpm add hardhat@2.9.2
-          pnpm add -D @nomiclabs/hardhat-waffle@2.0.3
-          pnpm add -D @nomiclabs/hardhat-ethers@2.0.3
-        working-directory: waffle-hardhat
-      - run: pnpm run test
-        working-directory: waffle-hardhat
-  test-hardhat-2112:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: 16.x
-      - run: npm i -g pnpm@7.1.9
-      - run: pnpm install --frozen-lockfile --strict-peer-dependencies
-      - name: setup-solc
-        run: sudo cp ./.github/workflows/solc /bin
-      - run: pnpm run build
-      - name: Install latest versions of hardhat packages
-        run: |
-          pnpm add hardhat@2.11.2
-          pnpm add -D @nomiclabs/hardhat-waffle@2.0.3
-          pnpm add -D @nomiclabs/hardhat-ethers@2.1.1
-        working-directory: waffle-hardhat
-      - run: pnpm run test
-        working-directory: waffle-hardhat
-  test-hardhat-latest:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: 16.x
-      - run: npm i -g pnpm@7.1.9
-      - run: pnpm install --frozen-lockfile --strict-peer-dependencies
-      - name: setup-solc
-        run: sudo cp ./.github/workflows/solc /bin
-      - run: pnpm run build
-      - name: Install latest versions of hardhat packages
-        run: |
-          pnpm add hardhat@latest
-          pnpm add -D @nomiclabs/hardhat-waffle@latest
-          pnpm add -D @nomiclabs/hardhat-ethers@latest
-        working-directory: waffle-hardhat
-      - run: pnpm run test
-        working-directory: waffle-hardhat
   docs-and-linter:
     runs-on: ubuntu-latest
     env:
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "hardhat-waffle-plugin"]
+	path = hardhat-waffle-plugin
+	url = https://github.com/NomicFoundation/hardhat-waffle
diff --git a/hardhat-waffle-plugin b/hardhat-waffle-plugin
@@ -0,0 +1 @@
+Subproject commit c5b5c297ce70e586233d831e30758a982229086a
diff --git a/package.json b/package.json
@@ -38,5 +38,6 @@
     "underscore": ">=1.12.1",
     "lodash": ">=4.17.21",
     "mixme": ">=0.5.1"
-  }
+  },
+  "version": "0.0.0"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/waffle-chai/src/index.ts b/waffle-chai/src/index.ts
@@ -15,7 +15,6 @@ import {supportChangeTokenBalance} from './matchers/changeTokenBalance';
 import {supportChangeTokenBalances} from './matchers/changeTokenBalances';
 import {supportCalledOnContract} from './matchers/calledOnContract/calledOnContract';
 import {supportCalledOnContractWith} from './matchers/calledOnContract/calledOnContractWith';
-import './inject-call-history';
 
 export function waffleChai(chai: Chai.ChaiStatic, utils: Chai.ChaiUtils) {
   supportBigNumber(chai.Assertion, utils);
diff --git a/waffle-chai/src/inject-call-history.ts b/waffle-chai/src/inject-call-history.ts
diff --git a/waffle-hardhat/.mocharc.js b/waffle-hardhat/.mocharc.js
@@ -1,5 +1,4 @@
 process.env.NODE_ENV = 'test'
-process.env.WAFFLE_EXPERIMENTAL_HARDHAT_CALL_HISTORY = true
 module.exports = {
   require: 'ts-node/register/transpile-only',
   timeout: 50000,
diff --git a/waffle-hardhat/hardhat.config.ts b/waffle-hardhat/hardhat.config.ts
@@ -1,4 +1,4 @@
-import '@nomiclabs/hardhat-waffle'
+import 'hardhat-waffle-dev'
 
 module.exports = {
   networks: {
@@ -18,5 +18,8 @@ module.exports = {
         version: "0.8.10"
       }
     ]
-  } 
+  },
+  waffle: {
+    injectCallHistory: true
+  }
 }
diff --git a/waffle-hardhat/package.json b/waffle-hardhat/package.json
@@ -20,13 +20,14 @@
   },
   "devDependencies": {
     "@ethereum-waffle/chai": "workspace:*",
+    "@ethereum-waffle/provider": "workspace:*",
     "@nomiclabs/hardhat-ethers": "2.1.0",
-    "@nomiclabs/hardhat-waffle": "2.0.3",
+    "hardhat-waffle-dev": "2.0.3-dev.c5b5c29",
     "@types/node": "^17.0.41",
     "eslint": "^7.14.0",
     "ethereum-waffle": "workspace:*",
-    "mocha": "^8.2.1",
     "ethers": "5.6.2",
-    "hardhat": "2.10.1"
+    "hardhat": "2.10.1",
+    "mocha": "^8.2.1"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule "hardhat-waffle-plugin"]`
	`2`	`+ path = hardhat-waffle-plugin`
	`3`	`+ url = https://github.com/NomicFoundation/hardhat-waffle`
Original file line number	Diff line number	Diff line change
`@@ -38,5 +38,6 @@`
`38`	`38`	`"underscore": ">=1.12.1",`
`39`	`39`	`"lodash": ">=4.17.21",`
`40`	`40`	`"mixme": ">=0.5.1"`
`41`		`- }`
	`41`	`+ },`
	`42`	`+ "version": "0.0.0"`
`42`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`process.env.NODE_ENV = 'test'`
`2`		`-process.env.WAFFLE_EXPERIMENTAL_HARDHAT_CALL_HISTORY = true`
`3`	`2`	`module.exports = {`
`4`	`3`	`require: 'ts-node/register/transpile-only',`
`5`	`4`	`timeout: 50000,`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import '@nomiclabs/hardhat-waffle'`
	`1`	`+import 'hardhat-waffle-dev'`
`2`	`2`
`3`	`3`	`module.exports = {`
`4`	`4`	`networks: {`
`@@ -18,5 +18,8 @@ module.exports = {`
`18`	`18`	`version: "0.8.10"`
`19`	`19`	`}`
`20`	`20`	`]`
`21`		`- }`
	`21`	`+ },`
	`22`	`+ waffle: {`
	`23`	`+ injectCallHistory: true`
	`24`	`+ }`
`22`	`25`	`}`