Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename and clean up #87

Merged
merged 2 commits into from
Feb 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/LBToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ contract LBToken is ILBToken {
* @param spender The address of the spender.
* @param approved The boolean value to grant or revoke permission.
*/
function setApprovalForAll(address spender, bool approved) public virtual override {
_setApprovalForAll(msg.sender, spender, approved);
function approveForAll(address spender, bool approved) public virtual override {
_approveForAll(msg.sender, spender, approved);
}

/**
Expand Down Expand Up @@ -261,7 +261,7 @@ contract LBToken is ILBToken {
* @param spender The address of the spender
* @param approved The boolean value to grant or revoke permission
*/
function _setApprovalForAll(address owner, address spender, bool approved) internal {
function _approveForAll(address owner, address spender, bool approved) internal {
if (owner == spender) revert LBToken__SelfApproval(owner);

_spenderApprovals[owner][spender] = approved;
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/ILBToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ interface ILBToken {

function isApprovedForAll(address owner, address spender) external view returns (bool);

function setApprovalForAll(address spender, bool approved) external;
function approveForAll(address spender, bool approved) external;

function batchTransferFrom(address from, address to, uint256[] calldata ids, uint256[] calldata amounts) external;
}
4 changes: 0 additions & 4 deletions src/libraries/math/PackedUint128Math.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
pragma solidity 0.8.10;

import {Constants} from "../Constants.sol";
import {SafeCast} from "./SafeCast.sol";

/**
* @title Liquidity Book Packed Uint128 Math Library
Expand All @@ -12,11 +11,8 @@ import {SafeCast} from "./SafeCast.sol";
* and interact with the encoded bytes32.
*/
library PackedUint128Math {
using SafeCast for uint256;

error PackedUint128Math__AddOverflow();
error PackedUint128Math__SubUnderflow();
error PackedUint128Math__AddFirstSubSecondOverflow();
error PackedUint128Math__MultiplierTooLarge();

uint256 private constant OFFSET = 128;
Expand Down
2 changes: 0 additions & 2 deletions src/libraries/math/Uint128x128Math.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@ pragma solidity 0.8.10;

import {Constants} from "../Constants.sol";
import {BitMath} from "./BitMath.sol";
import {Uint256x256Math} from "./Uint256x256Math.sol";

/**
* @title Liquidity Book Uint128x128 Math Library
* @author Trader Joe
* @notice Helper contract used for power and log calculations
*/
library Uint128x128Math {
using Uint256x256Math for uint256;
using BitMath for uint256;

error Uint128x128Math__LogUnderflow();
Expand Down
4 changes: 0 additions & 4 deletions src/libraries/math/Uint256x256Math.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@

pragma solidity 0.8.10;

import {BitMath} from "./BitMath.sol";

/**
* @title Liquidity Book Uint256x256 Math Library
* @author Trader Joe
* @notice Helper contract used for full precision calculations
*/
library Uint256x256Math {
using BitMath for uint256;

error Uint256x256Math__MulShiftOverflow();
error Uint256x256Math__MulDivOverflow();

Expand Down
8 changes: 4 additions & 4 deletions test/LBRouter.Liquidity.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ contract LiquidityBinRouterTest is TestHelper {

ILBPair pair = factory.getLBPairInformation(usdt, usdc, DEFAULT_BIN_STEP).LBPair;

pair.setApprovalForAll(address(router), true);
pair.approveForAll(address(router), true);

(uint256 amountXOut, uint256 amountYOut) = router.removeLiquidity(
usdt, usdc, DEFAULT_BIN_STEP, 0, 0, depositIds, liquidityMinted, address(this), block.timestamp
Expand Down Expand Up @@ -382,7 +382,7 @@ contract LiquidityBinRouterTest is TestHelper {
router.addLiquidity(liquidityParameters);

ILBPair pair = factory.getLBPairInformation(usdt, usdc, DEFAULT_BIN_STEP).LBPair;
pair.setApprovalForAll(address(router), true);
pair.approveForAll(address(router), true);

// Revert if the deadline is passed
vm.expectRevert(
Expand Down Expand Up @@ -441,7 +441,7 @@ contract LiquidityBinRouterTest is TestHelper {
router.addLiquidityNATIVE{value: liquidityParameters.amountX}(liquidityParameters);

ILBPair pair = factory.getLBPairInformation(wnative, usdc, DEFAULT_BIN_STEP).LBPair;
pair.setApprovalForAll(address(router), true);
pair.approveForAll(address(router), true);

uint256 balanceNATIVEBefore = address(this).balance;
uint256 balanceUSDCBefore = usdc.balanceOf(address(this));
Expand Down Expand Up @@ -470,7 +470,7 @@ contract LiquidityBinRouterTest is TestHelper {
router.addLiquidityNATIVE{value: liquidityParameters.amountX}(liquidityParameters);

ILBPair pair = factory.getLBPairInformation(wnative, usdc, DEFAULT_BIN_STEP).LBPair;
pair.setApprovalForAll(address(router), true);
pair.approveForAll(address(router), true);

// Revert if the deadline is passed
vm.expectRevert(
Expand Down
6 changes: 3 additions & 3 deletions test/LBToken.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ contract LBTokenTest is Test {
vm.stopPrank();

vm.startPrank(from);
lbToken.setApprovalForAll(to, true);
lbToken.approveForAll(to, true);
vm.stopPrank();

assertEq(lbToken.isApprovedForAll(from, to), true, "testFuzz_ApprovedForAll::1");
Expand All @@ -249,7 +249,7 @@ contract LBTokenTest is Test {
assertEq(lbToken.balanceOf(to, id), amount, "testFuzz_ApprovedForAll::3");

vm.startPrank(from);
lbToken.setApprovalForAll(to, false);
lbToken.approveForAll(to, false);
vm.stopPrank();

assertEq(lbToken.isApprovedForAll(from, to), false, "testFuzz_ApprovedForAll::4");
Expand Down Expand Up @@ -292,7 +292,7 @@ contract LBTokenTest is Test {

vm.startPrank(account);
vm.expectRevert(abi.encodeWithSelector(ILBToken.LBToken__SelfApproval.selector, account));
lbToken.setApprovalForAll(account, true);
lbToken.approveForAll(account, true);
vm.stopPrank();

assertEq(lbToken.isApprovedForAll(account, account), true, "testFuzz_SetApprovalOnSelf::1");
Expand Down