move mocks to src/mocks

solidity-labs-io · May 15, 2024 · f367641 · f367641
1 parent 841a730
commit f367641
Show file tree

Hide file tree

Showing 19 changed files with 24 additions and 24 deletions.
diff --git a/script/DeployGovernorBravo.s.sol b/script/DeployGovernorBravo.s.sol
@@ -6,9 +6,9 @@ import {GovernorBravoDelegator} from "@comp-governance/GovernorBravoDelegator.so
 
 import {Addresses} from "@forge-proposal-simulator/addresses/Addresses.sol";
 
-import {MockERC20Votes} from "mocks/MockERC20Votes.sol";
-import {Timelock} from "mocks/bravo/Timelock.sol";
-import {GovernorBravoDelegate} from "mocks/bravo/GovernorBravoDelegate.sol";
+import {MockERC20Votes} from "src/mocks/MockERC20Votes.sol";
+import {Timelock} from "src/mocks/bravo/Timelock.sol";
+import {GovernorBravoDelegate} from "src/mocks/bravo/GovernorBravoDelegate.sol";
 
 contract DeployGovernorBravo is Script {
     function run() public virtual {

diff --git a/script/InitializeBravo.s.sol b/script/InitializeBravo.s.sol
@@ -4,9 +4,9 @@ import "@forge-std/Script.sol";
 
 import {Addresses} from "@forge-proposal-simulator/addresses/Addresses.sol";
 
-import {MockGovernorAlpha} from "mocks/MockGovernorAlpha.sol";
-import {Timelock} from "mocks/bravo/Timelock.sol";
-import {GovernorBravoDelegate} from "mocks/bravo/GovernorBravoDelegate.sol";
+import {MockGovernorAlpha} from "src/mocks/MockGovernorAlpha.sol";
+import {Timelock} from "src/mocks/bravo/Timelock.sol";
+import {GovernorBravoDelegate} from "src/mocks/bravo/GovernorBravoDelegate.sol";
 
 contract DeployGovernorBravo is Script {
     function run() public virtual {

diff --git a/mocks/MockERC20Votes.sol → src/mocks/MockERC20Votes.sol b/mocks/MockERC20Votes.sol → src/mocks/MockERC20Votes.sol
diff --git a/mocks/MockGovernorAlpha.sol → src/mocks/MockGovernorAlpha.sol b/mocks/MockGovernorAlpha.sol → src/mocks/MockGovernorAlpha.sol
diff --git a/mocks/Token.sol → src/mocks/Token.sol b/mocks/Token.sol → src/mocks/Token.sol
diff --git a/mocks/Vault.sol → src/mocks/Vault.sol b/mocks/Vault.sol → src/mocks/Vault.sol
diff --git a/mocks/bravo/GovernorBravoDelegate.sol → src/mocks/bravo/GovernorBravoDelegate.sol b/mocks/bravo/GovernorBravoDelegate.sol → src/mocks/bravo/GovernorBravoDelegate.sol
diff --git a/mocks/bravo/GovernorBravoInterfaces.sol → src/mocks/bravo/GovernorBravoInterfaces.sol b/mocks/bravo/GovernorBravoInterfaces.sol → src/mocks/bravo/GovernorBravoInterfaces.sol
diff --git a/mocks/bravo/SafeMath.sol → src/mocks/bravo/SafeMath.sol b/mocks/bravo/SafeMath.sol → src/mocks/bravo/SafeMath.sol
diff --git a/mocks/bravo/Timelock.sol → src/mocks/bravo/Timelock.sol b/mocks/bravo/Timelock.sol → src/mocks/bravo/Timelock.sol
diff --git a/src/proposals/BravoProposal_01.sol b/src/proposals/BravoProposal_01.sol
@@ -4,8 +4,8 @@ pragma solidity ^0.8.0;
 import {GovernorBravoProposal} from "@forge-proposal-simulator/src/proposals/GovernorBravoProposal.sol";
 import {IGovernorBravo} from "@forge-proposal-simulator/src/interface/IGovernorBravo.sol";
 import {Addresses} from "@forge-proposal-simulator/addresses/Addresses.sol";
-import {Vault} from "mocks/Vault.sol";
-import {Token} from "mocks/Token.sol";
+import {Vault} from "src/mocks/Vault.sol";
+import {Token} from "src/mocks/Token.sol";
 
 contract BravoProposal_01 is GovernorBravoProposal {
     function name() public pure override returns (string memory) {

diff --git a/src/proposals/BravoProposal_02.sol b/src/proposals/BravoProposal_02.sol
@@ -4,8 +4,8 @@ pragma solidity ^0.8.0;
 import {GovernorBravoProposal} from "@forge-proposal-simulator/src/proposals/GovernorBravoProposal.sol";
 import {IGovernorBravo} from "@forge-proposal-simulator/src/interface/IGovernorBravo.sol";
 import {Addresses} from "@forge-proposal-simulator/addresses/Addresses.sol";
-import {Vault} from "mocks/Vault.sol";
-import {Token} from "mocks/Token.sol";
+import {Vault} from "src/mocks/Vault.sol";
+import {Token} from "src/mocks/Token.sol";
 
 contract BravoProposal_02 is GovernorBravoProposal {
     function name() public pure override returns (string memory) {

diff --git a/src/proposals/MultisigProposal_01.sol b/src/proposals/MultisigProposal_01.sol
@@ -2,8 +2,8 @@ pragma solidity ^0.8.0;
 
 import {MultisigProposal} from "@forge-proposal-simulator/src/proposals/MultisigProposal.sol";
 import {Addresses} from "@forge-proposal-simulator/addresses/Addresses.sol";
-import {Vault} from "mocks/Vault.sol";
-import {Token} from "mocks/Token.sol";
+import {Vault} from "src/mocks/Vault.sol";
+import {Token} from "src/mocks/Token.sol";
 
 contract MultisigProposal_01 is MultisigProposal {
     function name() public pure override returns (string memory) {

diff --git a/src/proposals/MultisigProposal_02.sol b/src/proposals/MultisigProposal_02.sol
@@ -2,8 +2,8 @@ pragma solidity ^0.8.0;
 
 import {MultisigProposal} from "@forge-proposal-simulator/src/proposals/MultisigProposal.sol";
 import {Addresses} from "@forge-proposal-simulator/addresses/Addresses.sol";
-import {Vault} from "mocks/Vault.sol";
-import {Token} from "mocks/Token.sol";
+import {Vault} from "src/mocks/Vault.sol";
+import {Token} from "src/mocks/Token.sol";
 import {console} from "@forge-std/console.sol";
 
 contract MultisigProposal_02 is MultisigProposal {

diff --git a/src/proposals/TimelockProposal_01.sol b/src/proposals/TimelockProposal_01.sol
@@ -3,8 +3,8 @@ pragma solidity ^0.8.0;
 import {TimelockProposal} from "@forge-proposal-simulator/src/proposals/TimelockProposal.sol";
 import {ITimelockController} from "@forge-proposal-simulator/src/interface/ITimelockController.sol";
 import {Addresses} from "@forge-proposal-simulator/addresses/Addresses.sol";
-import {Vault} from "mocks/Vault.sol";
-import {Token} from "mocks/Token.sol";
+import {Vault} from "src/mocks/Vault.sol";
+import {Token} from "src/mocks/Token.sol";
 
 contract TimelockProposal_01 is TimelockProposal {
     function name() public pure override returns (string memory) {

diff --git a/src/proposals/TimelockProposal_02.sol b/src/proposals/TimelockProposal_02.sol
@@ -3,8 +3,8 @@ pragma solidity ^0.8.0;
 import {TimelockProposal} from "@forge-proposal-simulator/src/proposals/TimelockProposal.sol";
 import {ITimelockController} from "@forge-proposal-simulator/src/interface/ITimelockController.sol";
 import {Addresses} from "@forge-proposal-simulator/addresses/Addresses.sol";
-import {Vault} from "mocks/Vault.sol";
-import {Token} from "mocks/Token.sol";
+import {Vault} from "src/mocks/Vault.sol";
+import {Token} from "src/mocks/Token.sol";
 
 contract TimelockProposal_02 is TimelockProposal {
     function name() public pure override returns (string memory) {

diff --git a/test/bravo/BravoProposalIntegrationTest.t.sol b/test/bravo/BravoProposalIntegrationTest.t.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.8.0;
 
-import {Vault} from "mocks/Vault.sol";
-import {Token} from "mocks/Token.sol";
+import {Vault} from "src/mocks/Vault.sol";
+import {Token} from "src/mocks/Token.sol";
 import {BravoPostProposalCheck} from "./BravoPostProposalCheck.sol";
 
 // @dev This test contract extends BravoPostProposalCheck, granting it

diff --git a/test/multisig/MultisigProposalIntegrationTest.t.sol b/test/multisig/MultisigProposalIntegrationTest.t.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.8.0;
 
-import {Vault} from "mocks/Vault.sol";
-import {Token} from "mocks/Token.sol";
+import {Vault} from "src/mocks/Vault.sol";
+import {Token} from "src/mocks/Token.sol";
 import {MultisigPostProposalCheck} from "./MultisigPostProposalCheck.sol";
 
 // @dev This test contract inherits MultisigPostProposalCheck, granting it

diff --git a/test/timelock/TimelockProposalIntegrationTest.t.sol b/test/timelock/TimelockProposalIntegrationTest.t.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.8.0;
 
-import {Vault} from "mocks/Vault.sol";
-import {Token} from "mocks/Token.sol";
+import {Vault} from "src/mocks/Vault.sol";
+import {Token} from "src/mocks/Token.sol";
 import {TimelockPostProposalCheck} from "./TimelockPostProposalCheck.sol";
 
 // @dev This test contract extends TimelockPostProposalCheck, granting it