Added event check on test

DistributedCollective · Jul 2, 2021 · b7bcb05 · b7bcb05
1 parent 6dec0cf
commit b7bcb05
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/contracts/connectors/loantoken/LoanTokenSettingsLowerAdmin.sol b/contracts/connectors/loantoken/LoanTokenSettingsLowerAdmin.sol
@@ -185,12 +185,11 @@ contract LoanTokenSettingsLowerAdmin is AdvancedToken {
 		bool isPaused
 	) public {
 		require(msg.sender == pauser, "onlyPauser");
-		/// keccak256("iToken_FunctionPause")
 		bytes32 slot =
 			keccak256(
 				abi.encodePacked(
 					bytes4(keccak256(abi.encodePacked(funcId))), /// Function selector.
-					uint256(0xd46a704bc285dbd6ff5ad3863506260b1df02812f4f857c8cc852317a6ac64f2)
+					uint256(0xd46a704bc285dbd6ff5ad3863506260b1df02812f4f857c8cc852317a6ac64f2) /// keccak256("iToken_FunctionPause")
 				)
 			);
 		assembly {

diff --git a/contracts/mockup/previousLoanToken/PreviousLoanTokenSettingsLowerAdmin.sol b/contracts/mockup/previousLoanToken/PreviousLoanTokenSettingsLowerAdmin.sol
@@ -132,12 +132,11 @@ contract PreviousLoanTokenSettingsLowerAdmin is AdvancedTokenStorage {
 		string memory funcId, /// Example: "mint(uint256,uint256)" ,i.e. function signature.
 		bool isPaused
 	) public onlyAdmin {
-		// keccak256("iToken_FunctionPause")
 		bytes32 slot =
 			keccak256(
 				abi.encodePacked(
 					bytes4(keccak256(abi.encodePacked(funcId))), /// Function selector.
-					uint256(0xd46a704bc285dbd6ff5ad3863506260b1df02812f4f857c8cc852317a6ac64f2)
+					uint256(0xd46a704bc285dbd6ff5ad3863506260b1df02812f4f857c8cc852317a6ac64f2) /// keccak256("iToken_FunctionPause")
 				)
 			);
 		assembly {

diff --git a/tests-js/loan-token/Administration.test.js b/tests-js/loan-token/Administration.test.js
@@ -1,5 +1,5 @@
 const { expect } = require("chai");
-const { expectRevert, BN } = require("@openzeppelin/test-helpers");
+const { expectRevert, BN, expectEvent } = require("@openzeppelin/test-helpers");
 const TestToken = artifacts.require("TestToken");
 const LoanTokenLogicStandard = artifacts.require("LoanTokenLogicStandard");
 const LoanTokenSettingsLowerAdmin = artifacts.require("LoanTokenSettingsLowerAdmin");
@@ -124,7 +124,13 @@ contract("LoanTokenAdministration", (accounts) => {
 			// pause the given function and make sure the function can't be called anymore
 			let localLoanToken = await LoanTokenLogicStandard.at(loanToken.address);
 			await localLoanToken.setPauser(accounts[0]);
-			await localLoanToken.toggleFunctionPause(functionSignature, true);
+			let tx = await localLoanToken.toggleFunctionPause(functionSignature, true);
+
+			// Check event is properly emitted
+			await expectEvent.inTransaction(tx.receipt.rawLogs[0].transactionHash, LoanTokenLogicStandard, "ToggleFunctionPause", {
+				funcId: functionSignature,
+				isPaused: true,
+			});
 
 			await expectRevert(open_margin_trade_position(loanToken, RBTC, WRBTC, SUSD, accounts[1]), "unauthorized");
 
@@ -134,7 +140,14 @@ contract("LoanTokenAdministration", (accounts) => {
 			// reactivate the given function and make sure the function can be called again
 			localLoanToken = await LoanTokenLogicStandard.at(loanToken.address);
 			await localLoanToken.setPauser(accounts[0]);
-			await localLoanToken.toggleFunctionPause(functionSignature, false);
+			tx = await localLoanToken.toggleFunctionPause(functionSignature, false);
+
+			// Check event is properly emitted
+			await expectEvent.inTransaction(tx.receipt.rawLogs[0].transactionHash, LoanTokenLogicStandard, "ToggleFunctionPause", {
+				funcId: functionSignature,
+				isPaused: false,
+			});
+
 			await open_margin_trade_position(loanToken, RBTC, WRBTC, SUSD, accounts[1]);
 
 			// check if checkPause returns false
@@ -146,6 +159,5 @@ contract("LoanTokenAdministration", (accounts) => {
 			let localLoanToken = await LoanTokenLogicStandard.at(loanToken.address);
 			await expectRevert(localLoanToken.toggleFunctionPause("mint(address,uint256)", true, { from: accounts[1] }), "onlyPauser");
 		});
-
 	});
 });