feat: Using more common

m0-foundation · Oct 30, 2024 · 67f77f9 · 67f77f9
1 parent b3d6d0a
commit 67f77f9
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 270 deletions.
diff --git a/lib/common b/lib/common
diff --git a/script/DeployBase.sol b/script/DeployBase.sol
@@ -3,10 +3,10 @@
 pragma solidity 0.8.26;
 
 import { ContractHelper } from "../lib/common/src/libs/ContractHelper.sol";
+import { Proxy } from "../lib/common/src/Proxy.sol";
 
 import { SmartMToken } from "../src/SmartMToken.sol";
 import { EarnerManager } from "../src/EarnerManager.sol";
-import { Proxy } from "../src/Proxy.sol";
 
 contract DeployBase {
     /**

diff --git a/src/EarnerManager.sol b/src/EarnerManager.sol
@@ -2,11 +2,11 @@
 
 pragma solidity 0.8.26;
 
+import { Migratable } from "../lib/common/src/Migratable.sol";
+
 import { IEarnerManager } from "./interfaces/IEarnerManager.sol";
 import { IRegistrarLike } from "./interfaces/IRegistrarLike.sol";
 
-import { Migratable } from "./Migratable.sol";
-
 /**
  * @title  Earner Manager allows admins to define earners without governance, and take fees from yield.
  * @author M^0 Labs

diff --git a/src/Migratable.sol b/src/Migratable.sol
diff --git a/src/Proxy.sol b/src/Proxy.sol
diff --git a/src/SmartMToken.sol b/src/SmartMToken.sol
@@ -2,20 +2,19 @@
 
 pragma solidity 0.8.26;
 
+import { IndexingMath } from "../lib/common/src/libs/IndexingMath.sol";
 import { UIntMath } from "../lib/common/src/libs/UIntMath.sol";
 
 import { IERC20 } from "../lib/common/src/interfaces/IERC20.sol";
 import { ERC20Extended } from "../lib/common/src/ERC20Extended.sol";
 
-import { IndexingMath } from "./libs/IndexingMath.sol";
+import { Migratable } from "../lib/common/src/Migratable.sol";
 
 import { IEarnerManager } from "./interfaces/IEarnerManager.sol";
 import { IMTokenLike } from "./interfaces/IMTokenLike.sol";
 import { IRegistrarLike } from "./interfaces/IRegistrarLike.sol";
 import { ISmartMToken } from "./interfaces/ISmartMToken.sol";
 
-import { Migratable } from "./Migratable.sol";
-
 /*
 
 ██╗    ██╗██████╗  █████╗ ██████╗ ██████╗ ███████╗██████╗     ███╗   ███╗    ████████╗ ██████╗ ██╗  ██╗███████╗███╗   ██╗

diff --git a/src/interfaces/IEarnerManager.sol b/src/interfaces/IEarnerManager.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.26;
 
-import { IMigratable } from "./IMigratable.sol";
+import { IMigratable } from "../../lib/common/src/interfaces/IMigratable.sol";
 
 /**
  * @title  Earner Status Manager interface for setting and returning earner status for Smart M Token accounts.

diff --git a/src/interfaces/IMigratable.sol b/src/interfaces/IMigratable.sol
diff --git a/src/interfaces/ISmartMToken.sol b/src/interfaces/ISmartMToken.sol
@@ -3,8 +3,7 @@
 pragma solidity 0.8.26;
 
 import { IERC20Extended } from "../../lib/common/src/interfaces/IERC20Extended.sol";
-
-import { IMigratable } from "./IMigratable.sol";
+import { IMigratable } from "../../lib/common/src/interfaces/IMigratable.sol";
 
 /**
  * @title  Smart M Token interface extending Extended ERC20.

diff --git a/src/libs/IndexingMath.sol b/src/libs/IndexingMath.sol
diff --git a/test/integration/TestBase.sol b/test/integration/TestBase.sol
@@ -5,12 +5,13 @@ pragma solidity 0.8.26;
 import { IERC20 } from "../../lib/common/src/interfaces/IERC20.sol";
 import { IERC20Extended } from "../../lib/common/src/interfaces/IERC20Extended.sol";
 import { IERC712 } from "../../lib/common/src/interfaces/IERC712.sol";
+
+import { Proxy } from "../../lib/common/src/Proxy.sol";
 import { Test } from "../../lib/forge-std/src/Test.sol";
 
 import { ISmartMToken } from "../../src/interfaces/ISmartMToken.sol";
 
 import { EarnerManager } from "../../src/EarnerManager.sol";
-import { Proxy } from "../../src/Proxy.sol";
 import { SmartMToken } from "../../src/SmartMToken.sol";
 import { SmartMTokenMigratorV1 } from "../../src/SmartMTokenMigratorV1.sol";
 

diff --git a/test/unit/Migrations.t.sol b/test/unit/Migrations.t.sol
@@ -2,14 +2,14 @@
 
 pragma solidity 0.8.26;
 
+import { Proxy } from "../../lib/common/src/Proxy.sol";
 import { Test } from "../../lib/forge-std/src/Test.sol";
 
 import { IEarnerManager } from "../../src/interfaces/IEarnerManager.sol";
 import { ISmartMToken } from "../../src/interfaces/ISmartMToken.sol";
 
 import { EarnerManager } from "../../src/EarnerManager.sol";
 import { SmartMToken } from "../../src/SmartMToken.sol";
-import { Proxy } from "../../src/Proxy.sol";
 
 import { MockM, MockRegistrar } from "./../utils/Mocks.sol";
 

diff --git a/test/unit/SmartMToken.t.sol b/test/unit/SmartMToken.t.sol
@@ -2,17 +2,17 @@
 
 pragma solidity 0.8.26;
 
-import { Test, console2 } from "../../lib/forge-std/src/Test.sol";
+import { IndexingMath } from "../../lib/common/src/libs/IndexingMath.sol";
+
 import { IERC20 } from "../../lib/common/src/interfaces/IERC20.sol";
 import { IERC20Extended } from "../../lib/common/src/interfaces/IERC20Extended.sol";
+
 import { UIntMath } from "../../lib/common/src/libs/UIntMath.sol";
+import { Proxy } from "../../lib/common/src/Proxy.sol";
+import { Test, console2 } from "../../lib/forge-std/src/Test.sol";
 
 import { ISmartMToken } from "../../src/interfaces/ISmartMToken.sol";
 
-import { IndexingMath } from "../../src/libs/IndexingMath.sol";
-
-import { Proxy } from "../../src/Proxy.sol";
-
 import { MockEarnerManager, MockM, MockRegistrar } from "../utils/Mocks.sol";
 import { SmartMTokenHarness } from "../utils/SmartMTokenHarness.sol";
 

diff --git a/test/unit/Stories.t.sol b/test/unit/Stories.t.sol
@@ -2,12 +2,12 @@
 
 pragma solidity 0.8.26;
 
+import { Proxy } from "../../lib/common/src/Proxy.sol";
 import { Test } from "../../lib/forge-std/src/Test.sol";
 
 import { ISmartMToken } from "../../src/interfaces/ISmartMToken.sol";
 
 import { SmartMToken } from "../../src/SmartMToken.sol";
-import { Proxy } from "../../src/Proxy.sol";
 
 import { MockEarnerManager, MockM, MockRegistrar } from "../utils/Mocks.sol";