From 1a26c3ee8c286303fee865971e48703197138e6f Mon Sep 17 00:00:00 2001 From: Filipp Makarov Date: Tue, 26 Nov 2024 21:15:45 +0400 Subject: [PATCH] clean logs --- test/base/TestBase.sol | 8 +------- test/unit/concrete/TestTokenPaymaster.Base.t.sol | 3 --- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/test/base/TestBase.sol b/test/base/TestBase.sol index 2569eed..414be2d 100644 --- a/test/base/TestBase.sol +++ b/test/base/TestBase.sol @@ -414,7 +414,6 @@ abstract contract TestBase is CheatCodes, TestHelper, BaseEventsAndErrors { + uint128(bytes16(userOp.paymasterAndData[_PAYMASTER_POSTOP_GAS_OFFSET:_PAYMASTER_DATA_OFFSET])); uint256 penalty = (gasLimit - gasValue) * 10 * gasPrice / 100; - console2.log("penalty in tests", penalty); return penalty; } @@ -477,11 +476,6 @@ abstract contract TestBase is CheatCodes, TestHelper, BaseEventsAndErrors { // unless ofcourse there is same token transfer in calldata assertEq(gasPaidBySAInERC20, gasCollectedInERC20ByPaymaster); - console2.log("gasPaidBySAInERC20", gasPaidBySAInERC20); - console2.log("gasCollectedInERC20ByPaymaster", gasCollectedInERC20ByPaymaster); - console2.log("maxPenalty", maxPenalty); - console2.log("totalGasFeePaid", totalGasFeePaid); - uint256 gasPaidBySAInNativeTokens = gasPaidBySAInERC20 * 1e18 / tokenPrice; // Assert we never undercharge @@ -490,7 +484,7 @@ abstract contract TestBase is CheatCodes, TestHelper, BaseEventsAndErrors { // Ensure that max 2% difference between what is should have been charged and what was charged // this difference comes from difference of postop gas and estimated postop gas (paymaster.unaccountedGas) // and from estimation of real penalty which is not emitted by EP :( - assertApproxEqRel((totalGasFeePaid + maxPenalty - realPenalty) * priceMarkup / _PRICE_MARKUP_DENOMINATOR, gasPaidBySAInNativeTokens, 0.02e18); + assertApproxEqRel((totalGasFeePaid + maxPenalty - realPenalty) * priceMarkup / _PRICE_MARKUP_DENOMINATOR, gasPaidBySAInNativeTokens, 0.02e18, "If this fails, check the test case inline comments"); } function _toSingletonArray(address addr) internal pure returns (address[] memory) { diff --git a/test/unit/concrete/TestTokenPaymaster.Base.t.sol b/test/unit/concrete/TestTokenPaymaster.Base.t.sol index 4582794..17133a1 100644 --- a/test/unit/concrete/TestTokenPaymaster.Base.t.sol +++ b/test/unit/concrete/TestTokenPaymaster.Base.t.sol @@ -31,8 +31,6 @@ contract TestTokenPaymasterBase is TestBase { // assertEq(block.number, 21744650); setupPaymasterTestEnvironment(); - console2.log("current block timestamp ", block.timestamp); - swapRouter = IV3SwapRouter(SWAP_ROUTER_ADDRESS); // uniswap swap router v2 on base // Deploy the token paymaster tokenPaymaster = new BiconomyTokenPaymaster( @@ -148,7 +146,6 @@ contract TestTokenPaymasterBase is TestBase { // deposit 100 USDC to the paymaster deal(address(usdc), address(tokenPaymaster), 100e6); uint256 initialTokenBalance = usdc.balanceOf(address(tokenPaymaster)); - console2.log("initialTokenBalance", initialTokenBalance); uint256 initialDepositOnEntryPoint = tokenPaymaster.getDeposit(); vm.startPrank(address(tokenPaymaster));