From b3fc887790aa34aa09e3590317fa4cdc8d237646 Mon Sep 17 00:00:00 2001
From: Gas One Cent <86567384+gas1cent@users.noreply.github.com>
Date: Mon, 6 Nov 2023 11:20:13 +0400
Subject: [PATCH] fix: uncomment helpers for tests

---
 solidity/test/utils/Helpers.sol | 114 ++++++++++++++++----------------
 1 file changed, 58 insertions(+), 56 deletions(-)

diff --git a/solidity/test/utils/Helpers.sol b/solidity/test/utils/Helpers.sol
index 46874489..009085f0 100644
--- a/solidity/test/utils/Helpers.sol
+++ b/solidity/test/utils/Helpers.sol
@@ -1,56 +1,58 @@
-// // SPDX-License-Identifier: MIT
-// pragma solidity ^0.8.19;
-
-// import {IERC20} from '@openzeppelin/contracts/token/ERC20/IERC20.sol';
-// import {DSTestPlus} from '@defi-wonderland/solidity-utils/solidity/test/DSTestPlus.sol';
-// import {IOracle} from '@defi-wonderland/prophet-core-contracts/solidity/interfaces/IOracle.sol';
-
-// import {IAccountingExtension} from '../../interfaces/extensions/IAccountingExtension.sol';
-
-// contract Helpers is DSTestPlus {
-//   modifier assumeFuzzable(address _address) {
-//     _assumeFuzzable(_address);
-//     _;
-//   }
-
-//   function _assumeFuzzable(address _address) internal pure {
-//     assumeNotForgeAddress(_address);
-//     assumeNotZeroAddress(_address);
-//     assumeNotPrecompile(_address);
-//   }
-
-//   function _mockAndExpect(address _receiver, bytes memory _calldata, bytes memory _returned) internal {
-//     vm.mockCall(_receiver, _calldata, _returned);
-//     vm.expectCall(_receiver, _calldata);
-//   }
-
-//   function _getMockDispute(
-//     bytes32 _requestId,
-//     address _disputer,
-//     address _proposer
-//   ) internal view returns (IOracle.Dispute memory _dispute) {
-//     _dispute = IOracle.Dispute({
-//       disputer: _disputer,
-//       responseId: bytes32('response'),
-//       proposer: _proposer,
-//       requestId: _requestId,
-//       status: IOracle.DisputeStatus.None,
-//       createdAt: block.timestamp
-//     });
-//   }
-
-//   function _forBondDepositERC20(
-//     IAccountingExtension _accountingExtension,
-//     address _depositor,
-//     IERC20 _token,
-//     uint256 _depositAmount,
-//     uint256 _balanceIncrease
-//   ) internal {
-//     vm.assume(_balanceIncrease >= _depositAmount);
-//     deal(address(_token), _depositor, _balanceIncrease);
-//     vm.startPrank(_depositor);
-//     _token.approve(address(_accountingExtension), _depositAmount);
-//     _accountingExtension.deposit(_token, _depositAmount);
-//     vm.stopPrank();
-//   }
-// }
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.19;
+
+import {IERC20} from '@openzeppelin/contracts/token/ERC20/IERC20.sol';
+import {DSTestPlus} from '@defi-wonderland/solidity-utils/solidity/test/DSTestPlus.sol';
+import {IOracle} from '@defi-wonderland/prophet-core-contracts/solidity/interfaces/IOracle.sol';
+
+import {IAccountingExtension} from '../../interfaces/extensions/IAccountingExtension.sol';
+
+import {TestConstants} from '../utils/TestConstants.sol';
+
+contract Helpers is DSTestPlus, TestConstants {
+  IERC20 public usdc = IERC20(label(USDC_ADDRESS, 'USDC'));
+
+  modifier assumeFuzzable(address _address) {
+    _assumeFuzzable(_address);
+    _;
+  }
+
+  function _assumeFuzzable(address _address) internal pure {
+    assumeNotForgeAddress(_address);
+    assumeNotZeroAddress(_address);
+    assumeNotPrecompile(_address);
+  }
+
+  function _mockAndExpect(address _receiver, bytes memory _calldata, bytes memory _returned) internal {
+    vm.mockCall(_receiver, _calldata, _returned);
+    vm.expectCall(_receiver, _calldata);
+  }
+
+  function _getMockDispute(
+    bytes32 _requestId,
+    address _disputer,
+    address _proposer
+  ) internal view returns (IOracle.Dispute memory _dispute) {
+    _dispute = IOracle.Dispute({
+      disputer: _disputer,
+      responseId: bytes32('response'),
+      proposer: _proposer,
+      requestId: _requestId
+    });
+  }
+
+  function _forBondDepositERC20(
+    IAccountingExtension _accountingExtension,
+    address _depositor,
+    IERC20 _token,
+    uint256 _depositAmount,
+    uint256 _balanceIncrease
+  ) internal {
+    vm.assume(_balanceIncrease >= _depositAmount);
+    deal(address(_token), _depositor, _balanceIncrease);
+    vm.startPrank(_depositor);
+    _token.approve(address(_accountingExtension), _depositAmount);
+    _accountingExtension.deposit(_token, _depositAmount);
+    vm.stopPrank();
+  }
+}