Skip to content

Commit

Permalink
prettier auto formatting changes
Browse files Browse the repository at this point in the history
  • Loading branch information
funderbrker authored and github-actions[bot] committed Aug 20, 2024
1 parent da4639a commit 4bf1ecf
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 7 deletions.
2 changes: 1 addition & 1 deletion protocol/contracts/beanstalk/init/InitDiamond.sol
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ contract InitDiamond is InitializeDiamond {

C.bean().mint(msg.sender, INIT_SUPPLY);
}
}
}
8 changes: 7 additions & 1 deletion protocol/contracts/beanstalk/silo/ConvertFacet.sol
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,13 @@ contract ConvertFacet is Invariable, ReentrancyGuard {
uint256 newBdv = LibTokenSilo.beanDenominatedValue(toToken, toAmount);
toBdv = newBdv > fromBdv ? newBdv : fromBdv;

toStem = LibConvert._depositTokensForConvert(LibTractor._user(), toToken, toAmount, toBdv, pipeData.grownStalk);
toStem = LibConvert._depositTokensForConvert(
LibTractor._user(),
toToken,
toAmount,
toBdv,
pipeData.grownStalk
);

emit Convert(LibTractor._user(), fromToken, toToken, fromAmount, toAmount);
}
Expand Down
8 changes: 7 additions & 1 deletion protocol/contracts/beanstalk/silo/PipelineConvertFacet.sol
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,13 @@ contract PipelineConvertFacet is Invariable, ReentrancyGuard {
advancedFarmCalls
);

toStem = LibConvert._depositTokensForConvert(LibTractor._user(), outputToken, toAmount, toBdv, grownStalk);
toStem = LibConvert._depositTokensForConvert(
LibTractor._user(),
outputToken,
toAmount,
toBdv,
grownStalk
);

emit Convert(LibTractor._user(), inputToken, outputToken, fromAmount, toAmount);
}
Expand Down
7 changes: 6 additions & 1 deletion protocol/contracts/tokens/Fertilizer/Fertilizer1155.sol
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,12 @@ contract Fertilizer1155 is ERC1155Upgradeable {
__doSafeTransferAcceptanceCheck(operator, address(0), to, id, amount, data);
}

function _safeBurn(address from, uint256 id, uint256 amount, bytes memory data) internal virtual {
function _safeBurn(
address from,
uint256 id,
uint256 amount,
bytes memory data
) internal virtual {
require(from != address(0), "ERC1155: burn from the zero address");

address operator = _msgSender();
Expand Down
6 changes: 5 additions & 1 deletion protocol/test/foundry/sun/Sun.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@ contract SunTest is TestHelper {
// needed to equal the newly paid off pods (scaled up or down).
// 3) no pods should be paid off.
if (deltaB >= 0) {
assertEq(C.bean().balanceOf(address(bs)), uint256(deltaB), "invalid bean minted +deltaB");
assertEq(
C.bean().balanceOf(address(bs)),
uint256(deltaB),
"invalid bean minted +deltaB"
);
}
// if deltaB is negative, soil is issued equal to deltaB.
// no beans should be minted.
Expand Down
2 changes: 0 additions & 2 deletions protocol/test/foundry/utils/LibAltC.sol
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ pragma solidity ^0.8.20;
* Only contains address constants that diverge from actual Beanstalk.
*/
library LibAltC {

address constant BEANSTALK = 0x00F84c1cF4Ca7fa8A8b0Dc923DA91ACA148B865C;
address internal constant BEAN = 0x006DD9acC7cDf83128C4aDF46847c301f94406ab;

Expand All @@ -20,5 +19,4 @@ library LibAltC {

// address constant PRICE_DEPLOYER = ;
// address constant PRICE = ;

}

0 comments on commit 4bf1ecf

Please sign in to comment.