From 606da56d17b80942a1a5809b64a8548d7cbf55d4 Mon Sep 17 00:00:00 2001
From: Oleksii Matiiasevych <oleksii@chainsafe.io>
Date: Mon, 5 Aug 2024 17:30:02 +0700
Subject: [PATCH] Fix forked tests

---
 .github/workflows/test.yml | 2 +-
 Makefile                   | 4 ++++
 testUnderForked/admin.js   | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4ed27d9b..c38836e0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -41,7 +41,7 @@ jobs:
         run: |
           fuser -k 8545/tcp
           make start-forkedMainnet FORKED_TESTS_PROVIDER=${{ secrets.FORKED_TESTS_PROVIDER }}
-          npx truffle test testUnderForked/*
+          make test-forked
 
   coverage:
     needs: test
diff --git a/Makefile b/Makefile
index 8f137ad2..0c6358fb 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,10 @@ start-forkedMainnet:
 	@echo " > \033[32mStarting forked environment... \033[0m "
 	ganache -f $(FORKED_TESTS_PROVIDER) & sleep 3
 
+test-forked:
+	@echo " > \033[32mTesting contracts... \033[0m "
+	truffle test --stacktrace testUnderForked/*
+
 start-geth:
 	@echo " > \033[32mStarting geth... \033[0m "
 	./scripts/geth/start_geth.sh
diff --git a/testUnderForked/admin.js b/testUnderForked/admin.js
index 50c26789..0baf3de9 100644
--- a/testUnderForked/admin.js
+++ b/testUnderForked/admin.js
@@ -31,7 +31,7 @@ contract("TwapFeeHandler - [admin]", async (accounts) => {
   const currentFeeHandlerAdmin = accounts[0];
 
   const assertOnlyAdmin = (method, ...params) => {
-    return TruffleAssert.reverts(
+    return Helpers.reverts(
       method(...params, {from: initialRelayers[1]}),
       "sender doesn't have admin role"
     );
@@ -198,7 +198,7 @@ contract("TwapFeeHandler - [admin]", async (accounts) => {
       )
     );
 
-    await TruffleAssert.passes(
+    await Helpers.passes(
       DynamicFeeHandlerInstance.renounceAdmin(
         expectedDynamicFeeHandlerAdmin
       )