diff --git a/contracts/src/test/token/GovernanceERC20Mock.sol b/contracts/src/test/token/TestGovernanceERC20.sol similarity index 75% rename from contracts/src/test/token/GovernanceERC20Mock.sol rename to contracts/src/test/token/TestGovernanceERC20.sol index 26708d7a..a95088cf 100644 --- a/contracts/src/test/token/GovernanceERC20Mock.sol +++ b/contracts/src/test/token/TestGovernanceERC20.sol @@ -6,24 +6,17 @@ import {IDAO} from "@aragon/osx/packages/contracts/src/core/dao/IDAO.sol"; import {GovernanceERC20} from "../../token/erc20/GovernanceERC20.sol"; -/// @title GovernanceERC20Mock +/// @title TestGovernanceERC20 /// @author Aragon Association - 2022-2023 /// @notice A test GovernanceERC20 that can be minted and burned by everyone. /// @dev DO NOT USE IN PRODUCTION! -contract GovernanceERC20Mock is GovernanceERC20 { +contract TestGovernanceERC20 is GovernanceERC20 { constructor( IDAO _dao, string memory _name, string memory _symbol, MintSettings memory _mintSettings - ) - GovernanceERC20( - _dao, - _name, - _symbol, - _mintSettings //MintSettings({amounts: new uint256[](0), receivers: new address[](0)}) - ) - {} + ) GovernanceERC20(_dao, _name, _symbol, _mintSettings) {} // sets the balance of the address // this mints/burns the amount depending on the current balance diff --git a/contracts/src/utils/proxy/ProxyFactory.sol b/contracts/src/utils/proxy/ProxyFactory.sol index 80fdf04b..4cd044f3 100644 --- a/contracts/src/utils/proxy/ProxyFactory.sol +++ b/contracts/src/utils/proxy/ProxyFactory.sol @@ -11,7 +11,7 @@ import {ProxyLib} from "./ProxyLib.sol"; contract ProxyFactory { using ProxyLib for address; /// @notice The immutable logic contract address. - address private immutable _LOGIC; + address public immutable LOGIC; /// @notice Emitted when an proxy contract is created. /// @param proxy The proxy address. @@ -20,7 +20,7 @@ contract ProxyFactory { /// @notice Initializes the contract with a logic contract address. /// @param _logic The logic contract address. constructor(address _logic) { - _LOGIC = _logic; + LOGIC = _logic; } /// @notice Creates an [ERC-1967](https://eips.ethereum.org/EIPS/eip-1967) proxy contract pointing to the pre-set logic contract. @@ -28,7 +28,7 @@ contract ProxyFactory { /// @return proxy The address of the proxy contract created. /// @dev If `_data` is non-empty, it is used in a delegate call to the `_logic` contract. This will typically be an encoded function call initializing the proxy (see [OpenZeppelin ERC1967Proxy-constructor](https://docs.openzeppelin.com/contracts/4.x/api/proxy#ERC1967Proxy-constructor-address-bytes-)). function deployUUPSProxy(bytes memory _data) external returns (address proxy) { - proxy = _LOGIC.deployUUPSProxy(_data); + proxy = LOGIC.deployUUPSProxy(_data); emit ProxyCreated({proxy: proxy}); } @@ -37,7 +37,7 @@ contract ProxyFactory { /// @return proxy The address of the proxy contract created. /// @dev If `_data` is non-empty, it is used in a call to the clone contract. This will typically be an encoded function call initializing the storage of the contract. function deployMinimalProxy(bytes memory _data) external returns (address proxy) { - proxy = _LOGIC.deployMinimalProxy(_data); + proxy = LOGIC.deployMinimalProxy(_data); emit ProxyCreated({proxy: proxy}); } }