chore: remove Arith for now

ProjectBabbage · Dec 18, 2022 · fd0620a · fd0620a
1 parent 8caa034
commit fd0620a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 20 deletions.
diff --git a/makefile b/makefile
@@ -7,4 +7,10 @@ FOUNDRY_ETH_RPC_URL=https://polygon-mainnet.g.alchemy.com/v2/${ALCHEMY_KEY}
 test:
 	forge test -vvv
 
-.PHONY: test
+build:
+	forge build --sizes
+
+create:
+	forge create --constructor-args ${CONSTRUCTOR_ARGS} --private-key ${PRIVATE_KEY} src/Spleth.sol:Spleth
+
+.PHONY: test create
diff --git a/src/Arith.sol b/src/Arith.sol
diff --git a/src/Spleth.sol b/src/Spleth.sol
@@ -1,12 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.13;
 
-import "./Arith.sol";
 import "openzeppelin-contracts/token/ERC20/utils/SafeERC20.sol";
 import "forge-std/console.sol";
 
 contract Spleth {
-    using Arith for uint256;
 
     bool public running;
     address public runningToken;
@@ -20,6 +18,10 @@ contract Spleth {
         participants = addresses;
     }
 
+    function divUp(uint256 x, uint256 y) private pure returns (uint256) {
+        return (x + y - 1) / y;
+    }
+
     function initializeGroupPayWithoutApprove(address token, uint256 amount, address receiver) public {
         require (!running);
 
@@ -46,7 +48,7 @@ contract Spleth {
         require (approvals[msg.sender] == false, "you already approved");
 
         uint amount = runningAmount;
-        uint256 shareOfAmount = amount.divUp(participants.length);
+        uint256 shareOfAmount = divUp(amount, participants.length);
 
         IERC20(runningToken).transferFrom(msg.sender, address(this), shareOfAmount);
         approvals[msg.sender] = true;

diff --git a/test/TestArith.sol b/test/TestArith.sol
@@ -5,20 +5,23 @@ import "forge-std/Vm.sol";
 import "forge-std/console.sol";
 import "forge-std/Test.sol";
 
-import "../src/Arith.sol";
+import "../src/Spleth.sol";
 
 contract TestArith is Test {
-    using Arith for uint256;
+
+    function divUp(uint256 x, uint256 y) private pure returns (uint256) {
+        return (x + y - 1) / y;
+    }
 
     function testFailDivZero() public pure {
         uint256 x = 2.4 ether + 1;
-        x.divUp(0);
+        divUp(x, 0);
     }
 
     function testDivision() public {
         uint256 x = 14;
-        assertEq(x.divUp(2), 7);
-        assertEq(x.divUp(3), 5);
+        assertEq(divUp(x, 2), 7);
+        assertEq(divUp(x, 3), 5);
     }
 
 }
diff --git a/test/TestSpleth.sol b/test/TestSpleth.sol
@@ -6,18 +6,20 @@ import "../lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
 
 import "forge-std/Test.sol";
 import "forge-std/Vm.sol";
-import "../src/Arith.sol";
 import "../src/Spleth.sol";
 
 contract TestSpleth is Test {
-    using Arith for uint256;
 
     Spleth public spleth;
     address user1 = address(123);
     address user2 = address(978);
     address DAI = address(0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063);
     address receiver = address(444);
 
+    function divUp(uint256 x, uint256 y) private pure returns (uint256) {
+        return (x + y - 1) / y;
+    }
+
     function setUp() public {
         address[] memory users = new address[](2);
         users[0] = user1;
@@ -69,6 +71,6 @@ contract TestSpleth is Test {
         uint256 balanceSpleth = IERC20(DAI).balanceOf(address(spleth));
 
         assertEq(balanceReceiver, amount, "transferred amount");
-        assertEq(balanceSpleth, 2 * amount.divUp(2) - amount, "transferred amount");
+        assertEq(balanceSpleth, 2 * divUp(amount, 2) - amount, "transferred amount");
     }
 }