Addressing PR comments

aragon · Apr 22, 2024 · 617878c · 617878c
1 parent 60dc73c
commit 617878c
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 7 deletions.
diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.13;
 
 import {VmSafe} from "forge-std/Vm.sol";
-import {Script, console2} from "forge-std/Script.sol";
+import {Script} from "forge-std/Script.sol";
 import {OptimisticTokenVotingPlugin} from "../src/OptimisticTokenVotingPlugin.sol";
 import {OptimisticTokenVotingPluginSetup} from "../src/setup/OptimisticTokenVotingPluginSetup.sol";
 import {MultisigPluginSetup} from "../src/setup/MultisigPluginSetup.sol";

diff --git a/src/OptimisticTokenVotingPlugin.sol b/src/OptimisticTokenVotingPlugin.sol
@@ -8,7 +8,7 @@ import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Ini
 import {SafeCastUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/math/SafeCastUpgradeable.sol";
 import {IVotesUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/utils/IVotesUpgradeable.sol";
 import {IMembership} from "@aragon/osx/core/plugin/membership/IMembership.sol";
-import {IOptimisticTokenVoting} from "./IOptimisticTokenVoting.sol";
+import {IOptimisticTokenVoting} from "./interfaces/IOptimisticTokenVoting.sol";
 
 import {ProposalUpgradeable} from "@aragon/osx/core/plugin/proposal/ProposalUpgradeable.sol";
 import {PluginUUPSUpgradeable} from "@aragon/osx/core/plugin/PluginUUPSUpgradeable.sol";

diff --git a/src/conditions/StandardProposalCondition.sol b/src/conditions/StandardProposalCondition.sol
@@ -2,7 +2,6 @@
 
 pragma solidity ^0.8.17;
 
-import "forge-std/console.sol";
 import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {IPermissionCondition} from "@aragon/osx/core/permission/IPermissionCondition.sol";
 import {IDAO} from "@aragon/osx/core/dao/IDAO.sol";

diff --git a/src/IOptimisticTokenVoting.sol → src/interfaces/IOptimisticTokenVoting.sol b/src/IOptimisticTokenVoting.sol → src/interfaces/IOptimisticTokenVoting.sol
diff --git a/test/OptimisticTokenVotingPlugin.t.sol b/test/OptimisticTokenVotingPlugin.t.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.17;
 
-import {Test, console2} from "forge-std/Test.sol";
+import {Test} from "forge-std/Test.sol";
 import {OptimisticTokenVotingPlugin} from "../src/OptimisticTokenVotingPlugin.sol";
-import {IOptimisticTokenVoting} from "../src/IOptimisticTokenVoting.sol";
+import {IOptimisticTokenVoting} from "../src/interfaces/IOptimisticTokenVoting.sol";
 import {DAO} from "@aragon/osx/core/dao/DAO.sol";
 import {IDAO} from "@aragon/osx/core/dao/IDAO.sol";
 import {IPlugin} from "@aragon/osx/core/plugin/IPlugin.sol";

diff --git a/test/OptimisticTokenVotingPluginSetup.t.sol b/test/OptimisticTokenVotingPluginSetup.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.17;
 
-import {Test, console2} from "forge-std/Test.sol";
+import {Test} from "forge-std/Test.sol";
 import {OptimisticTokenVotingPlugin} from "../src/OptimisticTokenVotingPlugin.sol";
 import {OptimisticTokenVotingPluginSetup} from "../src/setup/OptimisticTokenVotingPluginSetup.sol";
 import {GovernanceERC20} from "@aragon/osx/token/ERC20/governance/GovernanceERC20.sol";

diff --git a/test/StandardProposalCondition.t.sol b/test/StandardProposalCondition.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.17;
 
-import {Test, console2} from "forge-std/Test.sol";
+import {Test} from "forge-std/Test.sol";
 import {StandardProposalCondition} from "../src/conditions/StandardProposalCondition.sol";
 import {OptimisticTokenVotingPlugin} from "../src/OptimisticTokenVotingPlugin.sol";
 import {DAO} from "@aragon/osx/core/dao/DAO.sol";