Skip to content

Commit

Permalink
fix: format, snapshot, starport pointer
Browse files Browse the repository at this point in the history
  • Loading branch information
dangerousfood committed Jan 16, 2024
1 parent 75cb6aa commit 6d4a54f
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 18 deletions.
2 changes: 1 addition & 1 deletion lib/starport
18 changes: 12 additions & 6 deletions test/TestAstariaV1Loan.sol
Original file line number Diff line number Diff line change
Expand Up @@ -153,19 +153,20 @@ contract TestAstariaV1Loan is AstariaV1Test {
"lender should receive collateral"
);
}

function testNewLoanCollateral6DecimalsStakeSplit() public {
TestERC20Decimals sixDecimals = new TestERC20Decimals("Test20", "TST20", 6);

{
sixDecimals.mint(recaller.addr, 50e6);
vm.prank(recaller.addr);
sixDecimals.approve(address(status), 50e6);

sixDecimals.mint(lender.addr, 10000e6);
sixDecimals.mint(lender.addr, 10_000e6);
vm.prank(lender.addr);
sixDecimals.approve(address(SP), 5000e6);

sixDecimals.mint(refinancer.addr, 10000e6);
sixDecimals.mint(refinancer.addr, 10_000e6);
// vm.prank(refinancer.addr);
// sixDecimals.approve(address(SP), 1000e6);
}
Expand Down Expand Up @@ -237,7 +238,7 @@ contract TestAstariaV1Loan is AstariaV1Test {
vm.warp(block.timestamp + (details.recallWindow / 2));

bytes memory pricingData =
abi.encode(BasePricing.Details({rate: 1e4 /* 1% */, carryRate: 1e5, decimals: 6}));
abi.encode(BasePricing.Details({rate: 1e4, /* 1% */ carryRate: 1e5, decimals: 6}));
{
Starport.Loan memory refinancableLoan = getRefinanceDetails(loan, pricingData, refinancer.addr).loan;
CaveatEnforcer.SignedCaveats memory refinancerCaveat =
Expand All @@ -263,7 +264,10 @@ contract TestAstariaV1Loan is AstariaV1Test {

assertEq(
sixDecimals.balanceOf(lender.addr),
oldLenderBefore + loan.debt[0].amount + recallBonus + interest.mulDiv((10 ** pricingDetails.decimals) - pricingDetails.carryRate, 10 ** pricingDetails.decimals),
oldLenderBefore + loan.debt[0].amount + recallBonus
+ interest.mulDiv(
(10 ** pricingDetails.decimals) - pricingDetails.carryRate, 10 ** pricingDetails.decimals
),
"Payment to old lender calculated incorrectly"
);
}
Expand All @@ -277,7 +281,9 @@ contract TestAstariaV1Loan is AstariaV1Test {
);
}
assertEq(
recallerBefore, sixDecimals.balanceOf(recaller.addr), "Recaller stake not paid to lender and fulfiller as expected"
recallerBefore,
sixDecimals.balanceOf(recaller.addr),
"Recaller stake not paid to lender and fulfiller as expected"
);

{
Expand Down
15 changes: 4 additions & 11 deletions test/util/TestERC20Decimals.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Unlicense
pragma solidity ^0.8.13;

import { ERC20 } from "@rari-capital/solmate/src/tokens/ERC20.sol";
import {ERC20} from "@rari-capital/solmate/src/tokens/ERC20.sol";

// Used for minting test ERC20s in our tests
contract TestERC20Decimals is ERC20 {
Expand All @@ -27,11 +27,7 @@ contract TestERC20Decimals is ERC20 {
return true;
}

function transferFrom(
address from,
address to,
uint256 amount
) public override returns (bool ok) {
function transferFrom(address from, address to, uint256 amount) public override returns (bool ok) {
if (blocked) {
return false;
}
Expand All @@ -53,10 +49,7 @@ contract TestERC20Decimals is ERC20 {
ok = true;
}

function increaseAllowance(
address spender,
uint256 amount
) external returns (bool) {
function increaseAllowance(address spender, uint256 amount) external returns (bool) {
uint256 current = allowance[msg.sender][spender];
uint256 remaining = type(uint256).max - current;
if (amount > remaining) {
Expand All @@ -65,4 +58,4 @@ contract TestERC20Decimals is ERC20 {
approve(spender, current + amount);
return true;
}
}
}

0 comments on commit 6d4a54f

Please sign in to comment.