fix collateral mgr

packages/contracts/contracts/CollateralManager.sol

@@ -16,7 +16,8 @@ import "@openzeppelin/contracts-upgradeable/token/ERC721/IERC721ReceiverUpgradea
 import "./interfaces/ICollateralManager.sol";
 import { Collateral, CollateralType, ICollateralEscrowV1 } from "./interfaces/escrow/ICollateralEscrowV1.sol";
 import "./interfaces/ITellerV2.sol";
-
+import "./interfaces/IProtocolPausingManager.sol";
+import "./interfaces/IHasProtocolPausingManager.sol";
 contract CollateralManager is OwnableUpgradeable, ICollateralManager {
     /* Storage */
     using EnumerableSetUpgradeable for EnumerableSetUpgradeable.AddressSet;
@@ -78,8 +79,10 @@ contract CollateralManager is OwnableUpgradeable, ICollateralManager {
         _;
     }
 
-    modifier whenProtocolNotPaused() {        
-        require( PausableUpgradeable(address(tellerV2)).paused() == false , "Protocol is paused");
+    modifier whenProtocolNotPaused() {   
+        address pausingManager = IHasProtocolPausingManager( address(tellerV2) ).getProtocolPausingManager();
+
+        require( IProtocolPausingManager(address(pausingManager)).protocolPaused() == false , "Protocol is paused");
         _;
     }
 

packages/contracts/tests/TellerV2/TellerV2_Test.sol

@@ -42,6 +42,7 @@ contract TellerV2_Test is Testable {
     WethMock wethMock;
     TestERC20Token daiMock;
     CollateralManager collateralManager;
+    ProtocolPausingManager protocolPausingManager;
 
     uint256 marketId1;
     uint256 collateralAmount = 10;
@@ -81,7 +82,7 @@ contract TellerV2_Test is Testable {
         EscrowVault escrowVault = new EscrowVault();
         escrowVault.initialize();
 
-        ProtocolPausingManager protocolPausingManager = new ProtocolPausingManager();
+        protocolPausingManager = new ProtocolPausingManager();
         protocolPausingManager.initialize();
 
         // Deploy LenderCommitmentForwarder
@@ -171,6 +172,9 @@ contract TellerV2_Test is Testable {
     }
 
     function test_collateralEscrow() public {
+
+
+
         // Submit bid as borrower
         uint256 bidId = submitCollateralBid();
         // Accept bid as lender

packages/contracts/tests/TellerV2/TellerV2_bids.sol

@@ -278,7 +278,7 @@ contract TellerV2_bids_test is Testable {
 
         collateralManagerMock.forceSetCommitCollateralValidation(false);
 
-        vm.expectRevert("Collateral balance could not be validated");
+        vm.expectRevert("C bal NV");
         tellerV2.submitBid(
             address(1), // lending token
             1, // market ID
@@ -321,7 +321,7 @@ contract TellerV2_bids_test is Testable {
                 ActionNotAllowed.selector,
                 bidId,
                 "cancelBid",
-                "Only the bid owner can cancel!"
+                "Not bid owner"
             )
         );
         tellerV2.cancelBid(bidId);
@@ -421,7 +421,7 @@ contract TellerV2_bids_test is Testable {
                 ActionNotAllowed.selector,
                 bidId,
                 "lenderAcceptBid",
-                "Bid must be pending"
+                "Bid not pending"
             )
         );
 
@@ -660,7 +660,7 @@ contract TellerV2_bids_test is Testable {
                 ActionNotAllowed.selector,
                 bidId,
                 "repayLoan",
-                "Loan must be accepted"
+                "Loan not accepted"
             )
         );
 
@@ -701,7 +701,7 @@ contract TellerV2_bids_test is Testable {
                 ActionNotAllowed.selector,
                 bidId,
                 "repayLoan",
-                "Loan must be accepted"
+                "Loan not accepted"
             )
         );
 
@@ -812,7 +812,7 @@ contract TellerV2_bids_test is Testable {
                 ActionNotAllowed.selector,
                 bidId,
                 "liquidateLoan",
-                "Loan must be accepted"
+                "Loan not accepted"
             )
         );
         tellerV2.liquidateLoanFull(bidId);