Merge pull request #2 from OriginProtocol/nicka/ci

Github Actions
OriginProtocol · Jun 28, 2024 · 7408035 · 7408035
2 parents 41387a2 + 89cbd98
commit 7408035
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 21 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,7 +17,7 @@ jobs:
     name: Contracts Linter
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -28,15 +28,17 @@ jobs:
         run: forge fmt --check
 
   foundry-tests:
-    name: Foundry tests
+    name: Foundry fork tests
     runs-on: ubuntu-latest
+    env:
+      PROVIDER_URL: ${{ secrets.PROVIDER_URL }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
 
-      - name: Run tests
-        run: forge test --no-match-contract "(Fork)" -vvv
+      - name: Run fork tests
+        run: forge test --fork-url $PROVIDER_URL -vvv
diff --git a/script/deploy/mainnet/001_DeployCore.sol b/script/deploy/mainnet/001_DeployCore.sol
@@ -7,7 +7,7 @@ import {Vm} from "forge-std/Vm.sol";
 
 import {Addresses} from "contracts/utils/Addresses.sol";
 
-import {OEthARM} from "contracts/OEthARM.sol";
+import {OEthARM} from "contracts/OethARM.sol";
 import {Proxy} from "contracts/Proxy.sol";
 
 import {GovProposal, GovSixHelper} from "contracts/utils/GovSixHelper.sol";
@@ -36,9 +36,6 @@ contract DeployCoreScript is BaseMainnetScript {
 
         // 3. Initialize proxy
         proxy.initialize(address(implementation), Addresses.TIMELOCK, "");
-
-        // // 4. Operator
-        // proxy.setOperator(Addresses.STRATEGIST);
     }
 
     function _buildGovernanceProposal() internal override {

diff --git a/src/contracts/utils/Addresses.sol b/src/contracts/utils/Addresses.sol
@@ -8,6 +8,6 @@ library Addresses {
 
     address public constant STRATEGIST = 0xF14BBdf064E3F67f51cd9BD646aE3716aD938FDC;
     address public constant GOV_MULTISIG = 0xbe2AB3d3d8F6a32b96414ebbd865dBD276d3d899;
-    
+
     address public constant INITIAL_DEPLOYER = address(0x1001);
 }
diff --git a/test/OethARM.t.sol b/test/OethARM.t.sol
@@ -3,9 +3,9 @@ pragma solidity ^0.8.23;
 
 import {Test, console2} from "forge-std/Test.sol";
 
-import {IERC20} from "../src/contracts/Interfaces.sol";
-import {OEthARM} from "../src/contracts/OEthARM.sol";
-import {Proxy} from "../src/contracts/Proxy.sol";
+import {IERC20} from "contracts/Interfaces.sol";
+import {OEthARM} from "contracts/OethARM.sol";
+import {Proxy} from "contracts/Proxy.sol";
 
 contract OethARMTest is Test {
     IERC20 weth = IERC20(0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2);

diff --git a/test/OethLiquidityManager.t.sol b/test/OethLiquidityManager.t.sol
@@ -3,9 +3,9 @@ pragma solidity ^0.8.23;
 
 import {Test, console2} from "forge-std/Test.sol";
 
-import {IERC20, IOethARM, IOETHVault} from "../src/contracts/Interfaces.sol";
-import {OEthARM} from "../src/contracts/OEthARM.sol";
-import {Proxy} from "../src/contracts/Proxy.sol";
+import {IERC20, IOethARM, IOETHVault} from "contracts/Interfaces.sol";
+import {OEthARM} from "contracts/OethARM.sol";
+import {Proxy} from "contracts/Proxy.sol";
 
 contract OethLiquidityManagerTest is Test {
     address constant RANDOM_ADDRESS = 0xfEEDBeef00000000000000000000000000000000;

diff --git a/test/Proxy.t.sol b/test/Proxy.t.sol
@@ -4,8 +4,8 @@ pragma solidity ^0.8.23;
 import {Vm} from "forge-std/Vm.sol";
 import {Test, console2} from "forge-std/Test.sol";
 
-import {OEthARM} from "../src/contracts/OEthARM.sol";
-import {Proxy} from "../src/contracts/Proxy.sol";
+import {OEthARM} from "contracts/OethARM.sol";
+import {Proxy} from "contracts/Proxy.sol";
 
 contract ProxyTest is Test {
     address constant RANDOM_ADDRESS = 0xfEEDBeef00000000000000000000000000000000;

diff --git a/test/UniswapV2.t.sol b/test/UniswapV2.t.sol
@@ -3,9 +3,9 @@ pragma solidity ^0.8.23;
 
 import {Test, console2} from "forge-std/Test.sol";
 
-import {IERC20} from "../src/contracts/Interfaces.sol";
-import {OEthARM} from "../src/contracts/OEthARM.sol";
-import {Proxy} from "../src/contracts/Proxy.sol";
+import {IERC20} from "contracts/Interfaces.sol";
+import {OEthARM} from "contracts/OethARM.sol";
+import {Proxy} from "contracts/Proxy.sol";
 
 // Tests for the Uniswap V2 Router compatible interface of OSwap.
 contract UniswapV2Test is Test {