diff --git a/test/modules/auctions/GDA/GDATest.sol b/test/modules/auctions/GDA/GDATest.sol index ac054804..8d8d9708 100644 --- a/test/modules/auctions/GDA/GDATest.sol +++ b/test/modules/auctions/GDA/GDATest.sol @@ -32,7 +32,7 @@ abstract contract GdaTest is Test, Permit2User { uint256 internal constant _DECAY_TARGET = 10e16; // 10% uint256 internal constant _DECAY_PERIOD = 12 hours; UD60x18 internal constant _ONE_DAY = UD60x18.wrap(1 days * uUNIT); - UD60x18 internal constant LN_OF_PRODUCT_LN_MAX = UD60x18.wrap(4_883_440_042_183_455_484); + UD60x18 internal constant _LN_OF_PRODUCT_LN_MAX = UD60x18.wrap(4_883_440_042_183_455_484); AtomicAuctionHouse internal _auctionHouse; GradualDutchAuction internal _module; diff --git a/test/modules/auctions/GDA/auction.t.sol b/test/modules/auctions/GDA/auction.t.sol index 92b29a06..660cd9c0 100644 --- a/test/modules/auctions/GDA/auction.t.sol +++ b/test/modules/auctions/GDA/auction.t.sol @@ -336,7 +336,7 @@ contract GdaCreateAuctionTest is GdaTest { console2.log("Decay constant:", decayConstant.unwrap()); // Calculate the maximum duration in seconds - uint256 maxDuration = convert(LN_OF_PRODUCT_LN_MAX.div(decayConstant).mul(_ONE_DAY)); + uint256 maxDuration = convert(_LN_OF_PRODUCT_LN_MAX.div(decayConstant).mul(_ONE_DAY)); console2.log("Max duration:", maxDuration); // Set the bounds diff --git a/test/modules/auctions/GDA/maxAmountAccepted.t.sol b/test/modules/auctions/GDA/maxAmountAccepted.t.sol index dde54930..f9b2fe0e 100644 --- a/test/modules/auctions/GDA/maxAmountAccepted.t.sol +++ b/test/modules/auctions/GDA/maxAmountAccepted.t.sol @@ -2,11 +2,9 @@ pragma solidity 0.8.19; import {IAuction} from "../../../../src/interfaces/modules/IAuction.sol"; -import {uUNIT} from "prb-math-4.0-axis/UD60x18.sol"; import "prb-math-4.0-axis/Common.sol" as PRBMath; import {GdaTest} from "./GDATest.sol"; -import {console2} from "@forge-std-1.9.1/console2.sol"; contract GdaMaxAmountAcceptedTest is GdaTest { using {PRBMath.mulDiv} for uint256; diff --git a/test/modules/auctions/GDA/maxPayout.t.sol b/test/modules/auctions/GDA/maxPayout.t.sol index 00cbccce..4dc0ce9f 100644 --- a/test/modules/auctions/GDA/maxPayout.t.sol +++ b/test/modules/auctions/GDA/maxPayout.t.sol @@ -2,7 +2,6 @@ pragma solidity 0.8.19; import {IAuction} from "../../../../src/interfaces/modules/IAuction.sol"; -import {uUNIT} from "prb-math-4.0-axis/UD60x18.sol"; import "prb-math-4.0-axis/Common.sol" as PRBMath; import {GdaTest} from "./GDATest.sol"; diff --git a/test/modules/auctions/GDA/payoutFor.t.sol b/test/modules/auctions/GDA/payoutFor.t.sol index b47ac032..6baeb247 100644 --- a/test/modules/auctions/GDA/payoutFor.t.sol +++ b/test/modules/auctions/GDA/payoutFor.t.sol @@ -1,14 +1,11 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity 0.8.19; -import {Module} from "../../../../src/modules/Modules.sol"; import {IAuction} from "../../../../src/interfaces/modules/IAuction.sol"; import {IGradualDutchAuction} from "../../../../src/interfaces/modules/auctions/IGradualDutchAuction.sol"; -import { - UD60x18, ud, convert, UNIT, uUNIT, ZERO, EXP_MAX_INPUT -} from "prb-math-4.0-axis/UD60x18.sol"; +import {UD60x18, ud, convert, uUNIT} from "prb-math-4.0-axis/UD60x18.sol"; import "prb-math-4.0-axis/Common.sol" as PRBMath; import {GdaTest} from "./GDATest.sol"; diff --git a/test/modules/auctions/GDA/priceFor.t.sol b/test/modules/auctions/GDA/priceFor.t.sol index d31982ca..04adcfba 100644 --- a/test/modules/auctions/GDA/priceFor.t.sol +++ b/test/modules/auctions/GDA/priceFor.t.sol @@ -1,12 +1,11 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity 0.8.19; -import {Module} from "../../../../src/modules/Modules.sol"; import {IAuction} from "../../../../src/interfaces/modules/IAuction.sol"; import {IGradualDutchAuction} from "../../../../src/interfaces/modules/auctions/IGradualDutchAuction.sol"; -import {UD60x18, ud, convert, UNIT, uUNIT, EXP_MAX_INPUT} from "prb-math-4.0-axis/UD60x18.sol"; +import {UD60x18, ud, convert, uUNIT} from "prb-math-4.0-axis/UD60x18.sol"; import "prb-math-4.0-axis/Common.sol" as PRBMath; import {GdaTest} from "./GDATest.sol"; diff --git a/test/modules/auctions/GDA/purchase.t.sol b/test/modules/auctions/GDA/purchase.t.sol index ed7d54b7..83fd2356 100644 --- a/test/modules/auctions/GDA/purchase.t.sol +++ b/test/modules/auctions/GDA/purchase.t.sol @@ -3,12 +3,7 @@ pragma solidity 0.8.19; import {Module} from "../../../../src/modules/Modules.sol"; import {IAuction} from "../../../../src/interfaces/modules/IAuction.sol"; -import {IGradualDutchAuction} from - "../../../../src/interfaces/modules/auctions/IGradualDutchAuction.sol"; -import { - UD60x18, ud, convert, UNIT, uUNIT, ZERO, EXP_MAX_INPUT -} from "prb-math-4.0-axis/UD60x18.sol"; import "prb-math-4.0-axis/Common.sol" as PRBMath; import {GdaTest} from "./GDATest.sol";