Merge pull request #140 from CreamFi/add_legacy

contracts/: refactor code structure
CreamFi · Sep 29, 2021 · 7c1bb78 · 7c1bb78
2 parents b709d39 + f98b0cf
commit 7c1bb78
Show file tree

Hide file tree

Showing 28 changed files with 68 additions and 159 deletions.
diff --git a/contracts/Governance/Comp.sol b/contracts/Governance/Comp.sol
@@ -1,5 +1,4 @@
 pragma solidity ^0.5.16;
-pragma experimental ABIEncoderV2;
 
 contract Comp {
     /// @notice EIP-20 token name for this token

diff --git a/contracts/CCTokenDelegate.sol → contracts/Legacy/CCTokenDelegate.sol b/contracts/CCTokenDelegate.sol → contracts/Legacy/CCTokenDelegate.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.5.16;
 
 import "./CCapableErc20Delegate.sol";
-import "./EIP20Interface.sol";
+import "../EIP20Interface.sol";
 
 /**
  * @notice Compound's Comptroller interface to get Comp address

diff --git a/contracts/CCapableErc20.sol → contracts/Legacy/CCapableErc20.sol b/contracts/CCapableErc20.sol → contracts/Legacy/CCapableErc20.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.5.16;
 
-import "./CToken.sol";
+import "../CToken.sol";
 
 /**
  * @title Deprecated Cream's CCapableErc20 Contract

diff --git a/contracts/CCapableErc20Delegate.sol → contracts/Legacy/CCapableErc20Delegate.sol b/contracts/CCapableErc20Delegate.sol → contracts/Legacy/CCapableErc20Delegate.sol
diff --git a/contracts/CCollateralCapErc20Delegator.sol → ...s/Legacy/CCollateralCapErc20Delegator.sol b/contracts/CCollateralCapErc20Delegator.sol → ...s/Legacy/CCollateralCapErc20Delegator.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.5.16;
 
-import "./CTokenInterfaces.sol";
+import "../CTokenInterfaces.sol";
 
 /**
  * @title Cream's CCollateralCapErc20Delegator Contract

diff --git a/contracts/CErc20Immutable.sol → contracts/Legacy/CErc20Immutable.sol b/contracts/CErc20Immutable.sol → contracts/Legacy/CErc20Immutable.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.5.16;
 
-import "./CErc20.sol";
+import "../CErc20.sol";
 
 /**
  * @title Compound's CErc20Immutable Contract

diff --git a/contracts/CEther.sol → contracts/Legacy/CEther.sol b/contracts/CEther.sol → contracts/Legacy/CEther.sol
diff --git a/contracts/CSLPDelegate.sol → contracts/Legacy/CSLPDelegate.sol b/contracts/CSLPDelegate.sol → contracts/Legacy/CSLPDelegate.sol
@@ -2,7 +2,7 @@ pragma solidity ^0.5.16;
 pragma experimental ABIEncoderV2;
 
 import "./CCapableErc20Delegate.sol";
-import "./EIP20Interface.sol";
+import "../EIP20Interface.sol";
 
 // Ref: https://etherscan.io/address/0xc2edad668740f1aa35e4d8f227fb8e17dca888cd#code
 interface IMasterChef {

diff --git a/contracts/CTokenDeprecated.sol → contracts/Legacy/CTokenDeprecated.sol b/contracts/CTokenDeprecated.sol → contracts/Legacy/CTokenDeprecated.sol
@@ -1,12 +1,12 @@
 pragma solidity ^0.5.16;
 
-import "./ComptrollerInterface.sol";
-import "./CTokenInterfaces.sol";
-import "./ErrorReporter.sol";
-import "./Exponential.sol";
-import "./EIP20Interface.sol";
-import "./EIP20NonStandardInterface.sol";
-import "./InterestRateModel.sol";
+import "../ComptrollerInterface.sol";
+import "../CTokenInterfaces.sol";
+import "../ErrorReporter.sol";
+import "../Exponential.sol";
+import "../EIP20Interface.sol";
+import "../EIP20NonStandardInterface.sol";
+import "../InterestRateModel.sol";
 
 /**
  * @title Deprecated CToken Contract only for CEther.

diff --git a/contracts/ComptrollerG1.sol → contracts/Legacy/ComptrollerG1.sol b/contracts/ComptrollerG1.sol → contracts/Legacy/ComptrollerG1.sol
@@ -1,12 +1,12 @@
 pragma solidity ^0.5.16;
 
-import "./CToken.sol";
-import "./ErrorReporter.sol";
-import "./Exponential.sol";
-import "./PriceOracle/PriceOracle.sol";
-import "./ComptrollerInterface.sol";
-import "./ComptrollerStorage.sol";
-import "./Unitroller.sol";
+import "../CToken.sol";
+import "../ErrorReporter.sol";
+import "../Exponential.sol";
+import "../PriceOracle/PriceOracle.sol";
+import "../ComptrollerInterface.sol";
+import "../ComptrollerStorage.sol";
+import "../Unitroller.sol";
 
 /**
  * @title Compound's Comptroller Contract

diff --git a/contracts/ComptrollerG2.sol → contracts/Legacy/ComptrollerG2.sol b/contracts/ComptrollerG2.sol → contracts/Legacy/ComptrollerG2.sol
@@ -1,12 +1,12 @@
 pragma solidity ^0.5.16;
 
-import "./CToken.sol";
-import "./ErrorReporter.sol";
-import "./Exponential.sol";
-import "./PriceOracle/PriceOracle.sol";
-import "./ComptrollerInterface.sol";
-import "./ComptrollerStorage.sol";
-import "./Unitroller.sol";
+import "../CToken.sol";
+import "../ErrorReporter.sol";
+import "../Exponential.sol";
+import "../PriceOracle/PriceOracle.sol";
+import "../ComptrollerInterface.sol";
+import "../ComptrollerStorage.sol";
+import "../Unitroller.sol";
 
 /**
  * @title Compound's Comptroller Contract

diff --git a/contracts/ComptrollerG3.sol → contracts/Legacy/ComptrollerG3.sol b/contracts/ComptrollerG3.sol → contracts/Legacy/ComptrollerG3.sol
@@ -1,13 +1,13 @@
 pragma solidity ^0.5.16;
 
-import "./CToken.sol";
-import "./ErrorReporter.sol";
-import "./Exponential.sol";
-import "./PriceOracle/PriceOracle.sol";
-import "./ComptrollerInterface.sol";
-import "./ComptrollerStorage.sol";
-import "./Unitroller.sol";
-import "./Governance/Comp.sol";
+import "../CToken.sol";
+import "../ErrorReporter.sol";
+import "../Exponential.sol";
+import "../PriceOracle/PriceOracle.sol";
+import "../ComptrollerInterface.sol";
+import "../ComptrollerStorage.sol";
+import "../Unitroller.sol";
+import "../Governance/Comp.sol";
 
 /**
  * @title Compound's Comptroller Contract

diff --git a/contracts/ComptrollerG4.sol → contracts/Legacy/ComptrollerG4.sol b/contracts/ComptrollerG4.sol → contracts/Legacy/ComptrollerG4.sol
@@ -1,13 +1,13 @@
 pragma solidity ^0.5.16;
 
-import "./CToken.sol";
-import "./ErrorReporter.sol";
-import "./Exponential.sol";
-import "./PriceOracle/PriceOracle.sol";
-import "./ComptrollerInterface.sol";
-import "./ComptrollerStorage.sol";
-import "./Unitroller.sol";
-import "./Governance/Comp.sol";
+import "../CToken.sol";
+import "../ErrorReporter.sol";
+import "../Exponential.sol";
+import "../PriceOracle/PriceOracle.sol";
+import "../ComptrollerInterface.sol";
+import "../ComptrollerStorage.sol";
+import "../Unitroller.sol";
+import "../Governance/Comp.sol";
 
 /**
  * @title Compound's Comptroller Contract

diff --git a/contracts/ComptrollerG5.sol → contracts/Legacy/ComptrollerG5.sol b/contracts/ComptrollerG5.sol → contracts/Legacy/ComptrollerG5.sol
@@ -1,13 +1,13 @@
 pragma solidity ^0.5.16;
 
-import "./CToken.sol";
-import "./ErrorReporter.sol";
-import "./Exponential.sol";
-import "./PriceOracle/PriceOracle.sol";
-import "./ComptrollerInterface.sol";
-import "./ComptrollerStorage.sol";
-import "./Unitroller.sol";
-import "./Governance/Comp.sol";
+import "../CToken.sol";
+import "../ErrorReporter.sol";
+import "../Exponential.sol";
+import "../PriceOracle/PriceOracle.sol";
+import "../ComptrollerInterface.sol";
+import "../ComptrollerStorage.sol";
+import "../Unitroller.sol";
+import "../Governance/Comp.sol";
 
 /**
  * @title Compound's Comptroller Contract

diff --git a/contracts/ComptrollerG6.sol → contracts/Legacy/ComptrollerG6.sol b/contracts/ComptrollerG6.sol → contracts/Legacy/ComptrollerG6.sol
@@ -1,13 +1,13 @@
 pragma solidity ^0.5.16;
 
-import "./CToken.sol";
-import "./ErrorReporter.sol";
-import "./Exponential.sol";
-import "./PriceOracle/PriceOracle.sol";
-import "./ComptrollerInterface.sol";
-import "./ComptrollerStorage.sol";
-import "./Unitroller.sol";
-import "./Governance/Comp.sol";
+import "../CToken.sol";
+import "../ErrorReporter.sol";
+import "../Exponential.sol";
+import "../PriceOracle/PriceOracle.sol";
+import "../ComptrollerInterface.sol";
+import "../ComptrollerStorage.sol";
+import "../Unitroller.sol";
+import "../Governance/Comp.sol";
 
 /**
  * @title Compound's Comptroller Contract

diff --git a/contracts/PriceOracle/PriceOracleProxy.sol b/contracts/PriceOracle/PriceOracleProxy.sol
@@ -1,5 +1,4 @@
 pragma solidity ^0.5.16;
-pragma experimental ABIEncoderV2;
 
 import "./Denominations.sol";
 import "./PriceOracle.sol";

diff --git a/tests/Contracts/CErc20Harness.sol b/tests/Contracts/CErc20Harness.sol
@@ -1,13 +1,13 @@
 pragma solidity ^0.5.16;
 pragma experimental ABIEncoderV2;
 
-import "../../contracts/CErc20Immutable.sol";
+import "../../contracts/Legacy/CErc20Immutable.sol";
 import "../../contracts/CErc20Delegator.sol";
 import "../../contracts/CErc20Delegate.sol";
-import "../../contracts/CSLPDelegate.sol";
-import "../../contracts/CCTokenDelegate.sol";
+import "../../contracts/Legacy/CSLPDelegate.sol";
+import "../../contracts/Legacy/CCTokenDelegate.sol";
 import "../../contracts/CCollateralCapErc20Delegate.sol";
-import "../../contracts/CCollateralCapErc20Delegator.sol";
+import "../../contracts/Legacy/CCollateralCapErc20Delegator.sol";
 import "../../contracts/CWrappedNativeDelegate.sol";
 import "../../contracts/CWrappedNativeDelegator.sol";
 import "./ComptrollerScenario.sol";

diff --git a/tests/Contracts/CEtherHarness.sol b/tests/Contracts/CEtherHarness.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.5.16;
 
-import "../../contracts/CEther.sol";
+import "../../contracts/Legacy/CEther.sol";
 import "./ComptrollerScenario.sol";
 
 contract CEtherHarness is CEther {

diff --git a/tests/Contracts/CompHarness.sol b/tests/Contracts/CompHarness.sol
@@ -1,5 +1,4 @@
 pragma solidity ^0.5.16;
-pragma experimental ABIEncoderV2;
 
 import "../../contracts/Governance/Comp.sol";
 

diff --git a/tests/Contracts/ComptrollerScenarioG1.sol b/tests/Contracts/ComptrollerScenarioG1.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.5.16;
 
-import "../../contracts/ComptrollerG1.sol";
+import "../../contracts/Legacy/ComptrollerG1.sol";
 import "../../contracts/PriceOracle/PriceOracle.sol";
 
 // XXX we should delete G1 everything...

diff --git a/tests/Contracts/ComptrollerScenarioG2.sol b/tests/Contracts/ComptrollerScenarioG2.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.5.16;
 
-import "../../contracts/ComptrollerG2.sol";
+import "../../contracts/Legacy/ComptrollerG2.sol";
 
 contract ComptrollerScenarioG2 is ComptrollerG2 {
     uint256 public blockNumber;

diff --git a/tests/Contracts/ComptrollerScenarioG3.sol b/tests/Contracts/ComptrollerScenarioG3.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.5.16;
 
-import "../../contracts/ComptrollerG3.sol";
+import "../../contracts/Legacy/ComptrollerG3.sol";
 
 contract ComptrollerScenarioG3 is ComptrollerG3 {
     uint256 public blockNumber;

diff --git a/tests/Contracts/ComptrollerScenarioG4.sol b/tests/Contracts/ComptrollerScenarioG4.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.5.16;
 
-import "../../contracts/ComptrollerG4.sol";
+import "../../contracts/Legacy/ComptrollerG4.sol";
 
 contract ComptrollerScenarioG4 is ComptrollerG4 {
     uint256 public blockNumber;

diff --git a/tests/Contracts/EvilToken.sol b/tests/Contracts/EvilToken.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.5.16;
 
 import "./FaucetToken.sol";
-import "../../contracts/CEther.sol";
+import "../../contracts/Legacy/CEther.sol";
 import "../../contracts/CCollateralCapErc20.sol";
 
 /**

diff --git a/tests/Contracts/Fauceteer.sol b/tests/Contracts/Fauceteer.sol
diff --git a/tests/Contracts/MathHelpers.sol b/tests/Contracts/MathHelpers.sol
diff --git a/tests/Contracts/MockMCD.sol b/tests/Contracts/MockMCD.sol
diff --git a/tests/Contracts/Structs.sol b/tests/Contracts/Structs.sol
@@ -1,5 +1,4 @@
 pragma solidity ^0.5.16;
-pragma experimental ABIEncoderV2;
 
 contract Structs {
     struct Outer {