Update contract deplyoments in tests

sprintertech · Oct 16, 2024 · f4819c8 · f4819c8
1 parent d06b3f4
commit f4819c8
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 8 deletions.
diff --git a/testUnderForked/admin.js b/testUnderForked/admin.js
@@ -87,6 +87,7 @@ contract("TwapFeeHandler - [admin]", async (accounts) => {
     DynamicFeeHandlerInstance = await DynamicFeeHandlerContract.new(
       BridgeInstance.address,
       FeeHandlerRouterInstance.address,
+      0,
       0
     );
     ADMIN_ROLE = await DynamicFeeHandlerInstance.DEFAULT_ADMIN_ROLE();
@@ -119,21 +120,40 @@ contract("TwapFeeHandler - [admin]", async (accounts) => {
     );
   });
 
-  it("should set fee properties and emit 'FeePropertySet' event", async () => {
+  it("should set gas used property and emit 'GasUsedSet' event", async () => {
     assert.equal(await DynamicFeeHandlerInstance._gasUsed.call(), "0");
-    const setFeeOraclePropertiesTx = await DynamicFeeHandlerInstance.setFeeProperties(gasUsed);
+    const setFeeOraclePropertiesTx = await DynamicFeeHandlerInstance.setGasUsed(gasUsed);
     assert.equal(await DynamicFeeHandlerInstance._gasUsed.call(), gasUsed);
 
-    TruffleAssert.eventEmitted(setFeeOraclePropertiesTx, "FeePropertySet", (event) => {
+    TruffleAssert.eventEmitted(setFeeOraclePropertiesTx, "GasUsedSet", (event) => {
       return (
         event.gasUsed.toNumber() === gasUsed
       );
     });
   });
 
-  it("should require admin role to change fee properties", async () => {
+  it("should require admin role to set gas used", async () => {
     await assertOnlyAdmin(
-      DynamicFeeHandlerInstance.setFeeProperties,
+      DynamicFeeHandlerInstance.setGasUsed,
+      gasUsed
+    );
+  });
+
+  it("should set revert gas property and emit 'RecoverGasSet' event", async () => {
+    assert.equal(await DynamicFeeHandlerInstance._recoverGas.call(), "0");
+    const setRecoverGasTx = await DynamicFeeHandlerInstance.setRecoverGas(gasUsed);
+    assert.equal(await DynamicFeeHandlerInstance._recoverGas.call(), gasUsed);
+
+    TruffleAssert.eventEmitted(setRecoverGasTx, "RecoverGasSet", (event) => {
+      return (
+        event.recoverGas.toNumber() === gasUsed
+      );
+    });
+  });
+
+  it("should require admin role to set recover gas", async () => {
+    await assertOnlyAdmin(
+      DynamicFeeHandlerInstance.setRecoverGas,
       gasUsed
     );
   });

diff --git a/testUnderForked/calculateFeeERC20EVM.js b/testUnderForked/calculateFeeERC20EVM.js
@@ -102,6 +102,7 @@ contract("TwapFeeHandler - [calculateFee]", async (accounts) => {
     DynamicFeeHandlerInstance = await DynamicFeeHandlerContract.new(
       BridgeInstance.address,
       FeeHandlerRouterInstance.address,
+      0,
       0
     );
     FeeHandlerRouterInstance.adminSetResourceHandler(
@@ -117,7 +118,7 @@ contract("TwapFeeHandler - [calculateFee]", async (accounts) => {
       fixedProtocolFee
     );
     await DynamicFeeHandlerInstance.setWrapTokenAddress(destinationDomainID, MATIC_ADDRESS);
-    await DynamicFeeHandlerInstance.setFeeProperties(gasUsed);
+    await DynamicFeeHandlerInstance.setGasUsed(gasUsed);
 
     depositData = Helpers.createERCDepositData(
       100,

diff --git a/testUnderForked/collectFeeERC20EVM.js b/testUnderForked/collectFeeERC20EVM.js
@@ -81,6 +81,7 @@ contract("TwapNativeTokenFeeHandler - [collectFee]", async (accounts) => {
     DynamicFeeHandlerInstance = await DynamicFeeHandlerContract.new(
       BridgeInstance.address,
       FeeHandlerRouterInstance.address,
+      0,
       0
     );
 
@@ -127,7 +128,7 @@ contract("TwapNativeTokenFeeHandler - [collectFee]", async (accounts) => {
       fixedProtocolFee
     );
     await DynamicFeeHandlerInstance.setWrapTokenAddress(destinationDomainID, MATIC_ADDRESS);
-    await DynamicFeeHandlerInstance.setFeeProperties(gasUsed);
+    await DynamicFeeHandlerInstance.setGasUsed(gasUsed);
 
     await BridgeInstance.adminSetResource(
       ERC20HandlerInstance.address,

diff --git a/testUnderForked/optionalContractCall/calculateFeeERC20EVM.js b/testUnderForked/optionalContractCall/calculateFeeERC20EVM.js
@@ -107,6 +107,7 @@ contract("TwapFeeHandler - [calculateFee]", async (accounts) => {
     DynamicFeeHandlerInstance = await DynamicFeeHandlerContract.new(
       BridgeInstance.address,
       FeeHandlerRouterInstance.address,
+      0,
       0
     );
     FeeHandlerRouterInstance.adminSetResourceHandler(
@@ -122,7 +123,7 @@ contract("TwapFeeHandler - [calculateFee]", async (accounts) => {
       fixedProtocolFee
     );
     await DynamicFeeHandlerInstance.setWrapTokenAddress(destinationDomainID, MATIC_ADDRESS);
-    await DynamicFeeHandlerInstance.setFeeProperties(gasUsed);
+    await DynamicFeeHandlerInstance.setGasUsed(gasUsed);
   });
 
   it("should return higher fee for higher execution amount", async () => {