Removing older python code + some old contracts (#65)

* Removing older python code + some old contracts * clean up ci
RealityETH · Aug 16, 2023 · 3cd2c63 · 3cd2c63
1 parent 9b6c5fd
commit 3cd2c63
Show file tree

Hide file tree

Showing 23 changed files with 12 additions and 7,176 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -37,13 +37,6 @@ jobs:
           forge test -vvv
         id: test
 
-      - name: Python tests
-        run: |
-          python3 -m venv venv
-          source venv/bin/activate
-          cd tests/python
-          pip install -r requirements.txt
-          python test.py
 
   lint:
     strategy:

diff --git a/.solhintignore b/.solhintignore
@@ -5,22 +5,16 @@
 /development/contracts/ForkableRealityETH_ERC20.sol
 /development/contracts/ForkableRealityETH_ERC20.sol
 /development/contracts/Auction_ERC20.sol
-/development/contracts/BalanceHolder.sol
-/development/contracts/BalanceHolder_ERC20.sol
+/development/contracts/mixin/BalanceHolder.sol
+/development/contracts/mixin/BalanceHolder_ERC20.sol
 development/contracts/WhitelistArbitrator.sol
-development/contracts/Owned.sol
+development/contracts/mixin/Owned.sol
 development/contracts/interfaces/IZKBridge.sol
 development/contracts/interfaces/IRealityETH_ERC20.sol
 development/contracts/interfaces/IBalanceHolder_ERC20.sol
 development/contracts/interfaces/IERC20Mint.sol
 development/contracts/interfaces/IForkableRealityETH.sol
 development/contracts/interfaces/IArbitratorForeignProxy.sol
 development/contracts/ERC20Mint.sol
-development/contracts/ForkManager.sol
-development/contracts/FakeZKBridge.sol
-development/contracts/DelayedTokenBridge.sol
-development/contracts/ZKBridgeToL2.sol
 development/contracts/TokenBridge.sol
 development/contracts/ERC20.sol
-development/contracts/BridgeToL2.sol
-development/contracts/AMB.sol
diff --git a/development/README.md b/development/README.md
diff --git a/development/contracts/AMB.sol b/development/contracts/AMB.sol
diff --git a/development/contracts/Arbitrator.sol b/development/contracts/Arbitrator.sol
@@ -5,7 +5,7 @@ pragma solidity ^0.8.17;
 import "./interfaces/IArbitrator.sol";
 import "./interfaces/IRealityETH.sol";
 import "./interfaces/IERC20.sol";
-import "./Owned.sol";
+import "./mixin/Owned.sol";
 
 contract Arbitrator is Owned, IArbitrator {
     IRealityETH public realitio;

diff --git a/development/contracts/BridgeToL2.sol b/development/contracts/BridgeToL2.sol
diff --git a/development/contracts/DelayedTokenBridge.sol b/development/contracts/DelayedTokenBridge.sol