Maintenance

contracts/contracts-registry/pools/pool-factory/APoolFactory.sol → contracts/contracts-registry/pools/APoolFactory.sol

@@ -4,8 +4,8 @@ pragma solidity ^0.8.22;
 import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
 import {BeaconProxy} from "@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol";
 
-import {ADependant} from "../../../contracts-registry/ADependant.sol";
-import {APoolContractsRegistry} from "../APoolContractsRegistry.sol";
+import {ADependant} from "../../contracts-registry/ADependant.sol";
+import {APoolContractsRegistry} from "./APoolContractsRegistry.sol";
 
 /**
  * @notice The PoolContractsRegistry module

contracts/diamond/presets/OwnableDiamond.sol

@@ -1,15 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.21;
 
+import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+
 import {Diamond} from "../Diamond.sol";
-import {DiamondOwnable} from "../access/ownable/DiamondOwnable.sol";
 
 /**
  * @notice The Diamond standard module
  *
  * The Ownable preset of Diamond proxy
  */
-contract OwnableDiamond is Diamond, DiamondOwnable {
+contract OwnableDiamond is Diamond, OwnableUpgradeable {
     /**
      * @notice The function to manipulate the Diamond contract, as defined in [EIP-2535](https://eips.ethereum.org/EIPS/eip-2535)
      * @param facets_ the array of actions to be executed against the Diamond