Merge pull request #660 from ubiquity/revert-655-development

Revert "Resolves #647 - Use EIP-1967"

packages/contracts/src/dollar/libraries/LibAppStorage.sol

@@ -56,25 +56,6 @@ contract Modifiers {
      * @dev Works identically to OZ's nonReentrant.
      * @dev Used to avoid state storage collision within diamond.
      */
-    // Getters and setters for each variable in AppStorage
-
-    function getDollarTokenAddress() internal view returns (address) {
-        return LibAppStorage.appStorage().dollarTokenAddress;
-    }
-
-    function setDollarTokenAddress(address newValue) internal {
-        LibAppStorage.appStorage().dollarTokenAddress = newValue;
-    }
-
-    function getCreditNftAddress() internal view returns (address) {
-        return LibAppStorage.appStorage().creditNftAddress;
-    }
-
-    function setCreditNftAddress(address newValue) internal {
-        LibAppStorage.appStorage().creditNftAddress = newValue;
-    }
-
-    // Implement getters and setters for other variables in AppStorage
 
     modifier nonReentrant() {
         // On the first call to nonReentrant, _notEntered will be true
@@ -96,7 +77,15 @@ contract Modifiers {
         LibDiamond.enforceIsContractOwner();
         _;
     }
-
+
+    modifier onlyCreditNFTManager() {
+        require(
+            LibAccessControl.hasRole(CREDIT_NFT_MANAGER_ROLE, msg.sender),
+            "Caller is not a Credit NFT manager"
+        );
+        _;
+    }
+
     modifier onlyAdmin() {
         require(
             LibAccessControl.hasRole(DEFAULT_ADMIN_ROLE, msg.sender),
@@ -128,17 +117,8 @@ contract Modifiers {
      *
      * - The contract must not be paused.
      */
-
-    modifier onlyCreditNFTManager() {
-        require(
-            LibAccessControl.hasRole(CREDIT_NFT_MANAGER_ROLE, msg.sender),
-            "Caller is not a Credit NFT manager"
-        );
-        _;
-    }
-
     modifier whenNotPaused() {
-        require(!LibAppStorage.appStorage().paused, "Pausable: paused");
+        require(!LibAccessControl.paused(), "Pausable: paused");
         _;
     }
 
@@ -150,7 +130,7 @@ contract Modifiers {
      * - The contract must be paused.
      */
     modifier whenPaused() {
-        require(LibAppStorage.appStorage().paused, "Pausable: not paused");
+        require(LibAccessControl.paused(), "Pausable: not paused");
         _;
     }
 
@@ -194,4 +174,3 @@ contract Modifiers {
         _;
     }
 }
-