From 24ebff5ae947dca60101b1ba0cfe4a5e727b926d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ernesto=20Garc=C3=ADa?= Date: Tue, 11 Jul 2023 11:51:40 -0600 Subject: [PATCH] Remove unused imports (#4436) Co-authored-by: Francisco --- contracts/access/AccessControl.sol | 1 - contracts/governance/extensions/GovernorTimelockCompound.sol | 1 - contracts/mocks/token/ERC20PermitNoRevertMock.sol | 1 - contracts/proxy/transparent/ProxyAdmin.sol | 2 +- contracts/proxy/utils/Initializable.sol | 2 -- contracts/token/ERC20/extensions/ERC20Votes.sol | 1 - contracts/token/ERC721/extensions/ERC721Royalty.sol | 1 - scripts/upgradeable/transpile.sh | 3 +++ test/token/ERC20/extensions/ERC4626.t.sol | 1 - 9 files changed, 4 insertions(+), 9 deletions(-) diff --git a/contracts/access/AccessControl.sol b/contracts/access/AccessControl.sol index ec30e81e7..d934eddaf 100644 --- a/contracts/access/AccessControl.sol +++ b/contracts/access/AccessControl.sol @@ -5,7 +5,6 @@ pragma solidity ^0.8.19; import {IAccessControl} from "./IAccessControl.sol"; import {Context} from "../utils/Context.sol"; -import {Strings} from "../utils/Strings.sol"; import {ERC165} from "../utils/introspection/ERC165.sol"; /** diff --git a/contracts/governance/extensions/GovernorTimelockCompound.sol b/contracts/governance/extensions/GovernorTimelockCompound.sol index 4b609723d..c50c82c57 100644 --- a/contracts/governance/extensions/GovernorTimelockCompound.sol +++ b/contracts/governance/extensions/GovernorTimelockCompound.sol @@ -5,7 +5,6 @@ pragma solidity ^0.8.19; import {IGovernorTimelock} from "./IGovernorTimelock.sol"; import {IGovernor, Governor} from "../Governor.sol"; -import {SafeCast} from "../../utils/math/SafeCast.sol"; import {ICompoundTimelock} from "../../vendor/compound/ICompoundTimelock.sol"; import {IERC165} from "../../interfaces/IERC165.sol"; import {Address} from "../../utils/Address.sol"; diff --git a/contracts/mocks/token/ERC20PermitNoRevertMock.sol b/contracts/mocks/token/ERC20PermitNoRevertMock.sol index 23395d75d..63ae363fa 100644 --- a/contracts/mocks/token/ERC20PermitNoRevertMock.sol +++ b/contracts/mocks/token/ERC20PermitNoRevertMock.sol @@ -2,7 +2,6 @@ pragma solidity ^0.8.19; -import {ERC20} from "../../token/ERC20/ERC20.sol"; import {ERC20Permit} from "../../token/ERC20/extensions/ERC20Permit.sol"; abstract contract ERC20PermitNoRevertMock is ERC20Permit { diff --git a/contracts/proxy/transparent/ProxyAdmin.sol b/contracts/proxy/transparent/ProxyAdmin.sol index 344c942f2..12d80a9c4 100644 --- a/contracts/proxy/transparent/ProxyAdmin.sol +++ b/contracts/proxy/transparent/ProxyAdmin.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.19; -import {ITransparentUpgradeableProxy, TransparentUpgradeableProxy} from "./TransparentUpgradeableProxy.sol"; +import {ITransparentUpgradeableProxy} from "./TransparentUpgradeableProxy.sol"; import {Ownable} from "../../access/Ownable.sol"; /** diff --git a/contracts/proxy/utils/Initializable.sol b/contracts/proxy/utils/Initializable.sol index a2e3569c4..08171015d 100644 --- a/contracts/proxy/utils/Initializable.sol +++ b/contracts/proxy/utils/Initializable.sol @@ -3,8 +3,6 @@ pragma solidity ^0.8.19; -import {Address} from "../../utils/Address.sol"; - /** * @dev This is a base contract to aid in writing upgradeable contracts, or any kind of contract that will be deployed * behind a proxy. Since proxied contracts do not make use of a constructor, it's common to move constructor logic to an diff --git a/contracts/token/ERC20/extensions/ERC20Votes.sol b/contracts/token/ERC20/extensions/ERC20Votes.sol index e0d675b2a..74953d3d6 100644 --- a/contracts/token/ERC20/extensions/ERC20Votes.sol +++ b/contracts/token/ERC20/extensions/ERC20Votes.sol @@ -5,7 +5,6 @@ pragma solidity ^0.8.19; import {ERC20} from "../ERC20.sol"; import {Votes} from "../../../governance/utils/Votes.sol"; -import {SafeCast} from "../../../utils/math/SafeCast.sol"; import {Checkpoints} from "../../../utils/structs/Checkpoints.sol"; /** diff --git a/contracts/token/ERC721/extensions/ERC721Royalty.sol b/contracts/token/ERC721/extensions/ERC721Royalty.sol index eb128ac58..c4b8d371e 100644 --- a/contracts/token/ERC721/extensions/ERC721Royalty.sol +++ b/contracts/token/ERC721/extensions/ERC721Royalty.sol @@ -5,7 +5,6 @@ pragma solidity ^0.8.19; import {ERC721} from "../ERC721.sol"; import {ERC2981} from "../../common/ERC2981.sol"; -import {ERC165} from "../../../utils/introspection/ERC165.sol"; /** * @dev Extension of ERC721 with the ERC2981 NFT Royalty Standard, a standardized way to retrieve royalty payment diff --git a/scripts/upgradeable/transpile.sh b/scripts/upgradeable/transpile.sh index fbffe844e..c0cb9ff5e 100644 --- a/scripts/upgradeable/transpile.sh +++ b/scripts/upgradeable/transpile.sh @@ -33,3 +33,6 @@ npx @openzeppelin/upgrade-safe-transpiler@latest -D \ -x '!contracts/proxy/utils/UUPSUpgradeable.sol' \ -x '!contracts/proxy/beacon/IBeacon.sol' \ -p 'contracts/**/presets/**/*' + +# delete compilation artifacts of vanilla code +npm run clean diff --git a/test/token/ERC20/extensions/ERC4626.t.sol b/test/token/ERC20/extensions/ERC4626.t.sol index da01c7d81..b5f94fcb1 100644 --- a/test/token/ERC20/extensions/ERC4626.t.sol +++ b/test/token/ERC20/extensions/ERC4626.t.sol @@ -3,7 +3,6 @@ pragma solidity ^0.8.19; import {ERC4626Test} from "erc4626-tests/ERC4626.test.sol"; -import {SafeCast} from "openzeppelin/utils/math/SafeCast.sol"; import {ERC20} from "openzeppelin/token/ERC20/ERC20.sol"; import {ERC4626} from "openzeppelin/token/ERC20/extensions/ERC4626.sol";