Skip to content

[GROVE-250] chore: shorten error strings #100

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.

Sign up for GitHub

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

Merged
davidlee1435 merged 4 commits into from
Jan 6, 2026
Merged

[GROVE-250] chore: shorten error strings #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18b7871
[GROVE-250] chore: shorten error strings
davidlee1435 Jan 6, 2026
e211376
Fix error prefix in CentrifugeLib
davidlee1435 Jan 6, 2026
7a415fa
Update tests
davidlee1435 Jan 6, 2026
1af278f
CR
davidlee1435 Jan 6, 2026
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
26 changes: 13 additions & 13 deletions src/ForeignController.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ contract ForeignController is AccessControl {
modifier rateLimitExists(bytes32 key) {
require(
rateLimits.getRateLimitData(key).maxAmount > 0,
"ForeignController/invalid-action"
"FC/invalid-action"
);
_;
}
Expand Down Expand Up @@ -196,7 +196,7 @@ contract ForeignController is AccessControl {
external
onlyRole(DEFAULT_ADMIN_ROLE)
{
require(maxSlippage <= 1e18, "ForeignController/max-slippage-out-of-bounds");
require(maxSlippage <= 1e18, "FC/max-slippage-oob");
maxSlippages[pool] = maxSlippage;
emit MaxSlippageSet(pool, maxSlippage);
}
Expand All @@ -215,7 +215,7 @@ contract ForeignController is AccessControl {
require(
maxTickDelta > 0 &&
maxTickDelta <= UniswapV3Lib.MAX_TICK_DELTA,
"ForeignController/max-tick-delta-out-of-bounds"
"FC/max-tick-delta-oob"
);

UniswapV3Lib.UniswapV3PoolParams storage params = uniswapV3PoolParams[pool];
Expand All @@ -225,15 +225,15 @@ contract ForeignController is AccessControl {

function setUniswapV3AddLiquidityLowerTickBound(address pool, int24 lowerTickBound) external onlyRole(DEFAULT_ADMIN_ROLE) {
UniswapV3Lib.UniswapV3PoolParams storage params = uniswapV3PoolParams[pool];
require(lowerTickBound >= MIN_TICK && lowerTickBound < params.addLiquidityTickBounds.upper, "ForeignController/lower-tick-out-of-bounds");
require(lowerTickBound >= MIN_TICK && lowerTickBound < params.addLiquidityTickBounds.upper, "FC/lower-tick-oob");

params.addLiquidityTickBounds.lower = lowerTickBound;
emit UniswapV3PoolLowerTickUpdated(pool, lowerTickBound);
}

function setUniswapV3AddLiquidityUpperTickBound(address pool, int24 upperTickBound) external onlyRole(DEFAULT_ADMIN_ROLE) {
UniswapV3Lib.UniswapV3PoolParams storage params = uniswapV3PoolParams[pool];
require(upperTickBound > params.addLiquidityTickBounds.lower && upperTickBound <= MAX_TICK, "ForeignController/upper-tick-out-of-bounds");
require(upperTickBound > params.addLiquidityTickBounds.lower && upperTickBound <= MAX_TICK, "FC/upper-tick-oob");

params.addLiquidityTickBounds.upper = upperTickBound;
emit UniswapV3PoolUpperTickUpdated(pool, upperTickBound);
Expand All @@ -243,7 +243,7 @@ contract ForeignController is AccessControl {
UniswapV3Lib.UniswapV3PoolParams storage params = uniswapV3PoolParams[pool];
// Required due to casting in UniswapV3OracleLibrary.consult
// Limits twapSecondsAgo to approximately 68 years
require(twapSecondsAgo < uint32(type(int32).max), "ForeignController/twap-seconds-ago-out-of-bounds");
require(twapSecondsAgo < uint32(type(int32).max), "FC/twap-seconds-ago-oob");
params.twapSecondsAgo = twapSecondsAgo;
emit UniswapV3PoolTwapSecondsAgoUpdated(pool, twapSecondsAgo);
}
Expand All @@ -259,7 +259,7 @@ contract ForeignController is AccessControl {
function setMaxExchangeRate(address token, uint256 shares, uint256 maxExpectedAssets) external {
_checkRole(DEFAULT_ADMIN_ROLE);

require(token != address(0), "ForeignController/token-zero-address");
require(token != address(0), "FC/token-zero-address");

emit MaxExchangeRateSet(
token,
Expand Down Expand Up @@ -436,7 +436,7 @@ contract ForeignController is AccessControl {

require(
_getExchangeRate(shares, amount) <= maxExchangeRates[token],
"ForeignController/exchange-rate-too-high"
"FC/exchange-rate-too-high"
);
}

Expand Down Expand Up @@ -621,7 +621,7 @@ contract ForeignController is AccessControl {
);

bytes32 recipient = centrifugeRecipients[destinationCentrifugeId];
require(recipient != 0, "ForeignController/centrifuge-id-not-configured");
require(recipient != 0, "FC/id-not-configured");

ICentrifugeV3VaultLike centrifugeVault = ICentrifugeV3VaultLike(token);

Expand Down Expand Up @@ -654,7 +654,7 @@ contract ForeignController is AccessControl {
onlyRole(RELAYER)
rateLimitedAsset(LIMIT_AAVE_DEPOSIT, aToken, amount)
{
require(maxSlippages[aToken] != 0, "ForeignController/max-slippage-not-set");
require(maxSlippages[aToken] != 0, "FC/max-slippage-not-set");

IERC20 underlying = IERC20(IATokenWithPool(aToken).UNDERLYING_ASSET_ADDRESS());
IAavePool pool = IAavePool(IATokenWithPool(aToken).POOL());
Expand All @@ -674,7 +674,7 @@ contract ForeignController is AccessControl {

require(
newATokens >= amount * maxSlippages[aToken] / 1e18,
"ForeignController/slippage-too-high"
"FC/slippage-too-high"
);
}

Expand Down Expand Up @@ -780,7 +780,7 @@ contract ForeignController is AccessControl {

function toggleOperatorMerkl(address operator) external {
_checkRole(RELAYER);
require(address(merklDistributor) != address(0), "ForeignController/merkl-distributor-not-set");
require(address(merklDistributor) != address(0), "FC/merkl-distributor-not-set");

MerklLib.toggleOperator(MerklLib.MerklToggleOperatorParams({
proxy : proxy,
Expand Down Expand Up @@ -928,7 +928,7 @@ contract ForeignController is AccessControl {
if (assets == 0) return 0;

// Zero shares with non-zero assets is invalid (infinite exchange rate).
if (shares == 0) revert("ForeignController/zero-shares");
if (shares == 0) revert("FC/zero-shares");

return (EXCHANGE_RATE_PRECISION * assets) / shares;
}
Expand Down
22 changes: 11 additions & 11 deletions src/MainnetController.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ contract MainnetController is AccessControl {

function setMaxSlippage(address pool, uint256 maxSlippage) external {
_checkRole(DEFAULT_ADMIN_ROLE);
require(maxSlippage <= 1e18, "MainnetController/max-slippage-out-of-bounds");
require(maxSlippage <= 1e18, "MC/max-slippage-oob");
maxSlippages[pool] = maxSlippage;
emit MaxSlippageSet(pool, maxSlippage);
}
Expand All @@ -216,7 +216,7 @@ contract MainnetController is AccessControl {
require(
maxTickDelta > 0 &&
maxTickDelta <= UniswapV3Lib.MAX_TICK_DELTA,
"MainnetController/max-tick-delta-out-of-bounds"
"MC/max-tick-delta-oob"
);

UniswapV3Lib.UniswapV3PoolParams storage params = uniswapV3PoolParams[pool];
Expand All @@ -226,15 +226,15 @@ contract MainnetController is AccessControl {

function setUniswapV3AddLiquidityLowerTickBound(address pool, int24 lowerTickBound) external onlyRole(DEFAULT_ADMIN_ROLE) {
UniswapV3Lib.UniswapV3PoolParams storage params = uniswapV3PoolParams[pool];
require(lowerTickBound >= MIN_TICK && lowerTickBound < params.addLiquidityTickBounds.upper, "MainnetController/lower-tick-out-of-bounds");
require(lowerTickBound >= MIN_TICK && lowerTickBound < params.addLiquidityTickBounds.upper, "MC/lower-tick-oob");

params.addLiquidityTickBounds.lower = lowerTickBound;
emit UniswapV3PoolLowerTickUpdated(pool, lowerTickBound);
}

function setUniswapV3AddLiquidityUpperTickBound(address pool, int24 upperTickBound) external onlyRole(DEFAULT_ADMIN_ROLE) {
UniswapV3Lib.UniswapV3PoolParams storage params = uniswapV3PoolParams[pool];
require(upperTickBound > params.addLiquidityTickBounds.lower && upperTickBound <= MAX_TICK, "MainnetController/upper-tick-out-of-bounds");
require(upperTickBound > params.addLiquidityTickBounds.lower && upperTickBound <= MAX_TICK, "MC/upper-tick-oob");

params.addLiquidityTickBounds.upper = upperTickBound;
emit UniswapV3PoolUpperTickUpdated(pool, upperTickBound);
Expand All @@ -244,7 +244,7 @@ contract MainnetController is AccessControl {
UniswapV3Lib.UniswapV3PoolParams storage params = uniswapV3PoolParams[pool];
// Required due to casting in UniswapV3OracleLibrary.consult
// Limits twapSecondsAgo to approximately 68 years
require(twapSecondsAgo < uint32(type(int32).max), "MainnetController/twap-seconds-ago-out-of-bounds");
require(twapSecondsAgo < uint32(type(int32).max), "MC/twap-seconds-ago-oob");
params.twapSecondsAgo = twapSecondsAgo;
emit UniswapV3PoolTwapSecondsAgoUpdated(pool, twapSecondsAgo);
}
Expand All @@ -258,7 +258,7 @@ contract MainnetController is AccessControl {
function setMaxExchangeRate(address token, uint256 shares, uint256 maxExpectedAssets) external {
_checkRole(DEFAULT_ADMIN_ROLE);

require(token != address(0), "MainnetController/token-zero-address");
require(token != address(0), "MC/token-zero-address");

emit MaxExchangeRateSet(
token,
Expand Down Expand Up @@ -350,7 +350,7 @@ contract MainnetController is AccessControl {

require(
_getExchangeRate(shares, amount) <= maxExchangeRates[token],
"MainnetController/exchange-rate-too-high"
"MC/exchange-rate-too-high"
);
}

Expand Down Expand Up @@ -506,7 +506,7 @@ contract MainnetController is AccessControl {
_checkRole(RELAYER);
_rateLimitedAsset(LIMIT_AAVE_DEPOSIT, aToken, amount);

require(maxSlippages[aToken] != 0, "MainnetController/max-slippage-not-set");
require(maxSlippages[aToken] != 0, "MC/max-slippage-not-set");

IERC20 underlying = IERC20(IATokenWithPool(aToken).UNDERLYING_ASSET_ADDRESS());
IAavePool pool = IAavePool(IATokenWithPool(aToken).POOL());
Expand All @@ -526,7 +526,7 @@ contract MainnetController is AccessControl {

require(
newATokens >= amount * maxSlippages[aToken] / 1e18,
"MainnetController/slippage-too-high"
"MC/slippage-too-high"
);
}

Expand Down Expand Up @@ -994,7 +994,7 @@ contract MainnetController is AccessControl {
function _rateLimitExists(bytes32 key) internal view {
require(
rateLimits.getRateLimitData(key).maxAmount > 0,
"MainnetController/invalid-action"
"MC/invalid-action"
);
}

Expand Down Expand Up @@ -1035,7 +1035,7 @@ contract MainnetController is AccessControl {
if (assets == 0) return 0;

// Zero shares with non-zero assets is invalid (infinite exchange rate).
if (shares == 0) revert("MainnetController/zero-shares");
if (shares == 0) revert("MC/zero-shares");

return (EXCHANGE_RATE_PRECISION * assets) / shares;
}
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/CentrifugeLib.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ library CentrifugeLib {
params.amount
);

require(params.recipient != 0, "MainnetController/centrifuge-id-not-configured");
require(params.recipient != 0, "CentrifugeLib/id-not-configured");

ICentrifugeV3VaultLike centrifugeVault = ICentrifugeV3VaultLike(params.token);

Expand Down Expand Up @@ -124,7 +124,7 @@ library CentrifugeLib {
function _rateLimitExists(IRateLimits rateLimits, bytes32 key) internal view {
require(
rateLimits.getRateLimitData(key).maxAmount > 0,
"MainnetController/invalid-action"
"CentrifugeLib/invalid-action"
);
}
}
2 changes: 1 addition & 1 deletion src/libraries/UniswapV3Lib.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ library UniswapV3Lib {
) = _fetchPositionData(params.tokenId, params.positionManager);

require(positionToken0 == token0 && positionToken1 == token1 && positionFee == fee, "UniswapV3Lib/invalid-pool");
require(params.liquidity > 0 && params.liquidity <= positionLiquidity, "UniswapV3Lib/liquidity-out-of-bounds");
require(params.liquidity > 0 && params.liquidity <= positionLiquidity, "UniswapV3Lib/liquidity-oob");
}

function _decreaseLiquidityCall(
Expand Down
14 changes: 7 additions & 7 deletions test/grove-avalanche-fork/Centrifuge.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ contract ForeignControllerClaimDepositERC7540FailureTests is CentrifugeTestBase

function test_claimDepositERC7540_invalidVault() external {
vm.prank(ALM_RELAYER);
vm.expectRevert("ForeignController/invalid-action");
vm.expectRevert("FC/invalid-action");
foreignController.claimDepositERC7540(makeAddr("fake-vault"));
}

Expand Down Expand Up @@ -343,7 +343,7 @@ contract ForeignControllerCancelCentrifugeDepositFailureTests is CentrifugeTestB

function test_cancelCentrifugeDepositRequest_invalidVault() external {
vm.prank(ALM_RELAYER);
vm.expectRevert("ForeignController/invalid-action");
vm.expectRevert("FC/invalid-action");
foreignController.cancelCentrifugeDepositRequest(makeAddr("fake-vault"));
}

Expand Down Expand Up @@ -399,7 +399,7 @@ contract ForeignControllerClaimCentrifugeCancelDepositFailureTests is Centrifuge

function test_claimCentrifugeCancelDepositRequest_invalidVault() external {
vm.prank(ALM_RELAYER);
vm.expectRevert("ForeignController/invalid-action");
vm.expectRevert("FC/invalid-action");
foreignController.claimCentrifugeCancelDepositRequest(makeAddr("fake-vault"));
}

Expand Down Expand Up @@ -592,7 +592,7 @@ contract ForeignControllerClaimRedeemERC7540FailureTests is CentrifugeTestBase {

function test_claimRedeemERC7540_invalidVault() external {
vm.prank(ALM_RELAYER);
vm.expectRevert("ForeignController/invalid-action");
vm.expectRevert("FC/invalid-action");
foreignController.claimRedeemERC7540(makeAddr("fake-vault"));
}

Expand Down Expand Up @@ -795,7 +795,7 @@ contract ForeignControllerCancelCentrifugeRedeemRequestFailureTests is Centrifug

function test_cancelCentrifugeRedeemRequest_invalidVault() external {
vm.prank(ALM_RELAYER);
vm.expectRevert("ForeignController/invalid-action");
vm.expectRevert("FC/invalid-action");
foreignController.cancelCentrifugeRedeemRequest(makeAddr("fake-vault"));
}

Expand Down Expand Up @@ -855,7 +855,7 @@ contract ForeignControllerClaimCentrifugeCancelRedeemRequestFailureTests is Cent

function test_claimCentrifugeCancelRedeemRequest_invalidVault() external {
vm.prank(ALM_RELAYER);
vm.expectRevert("ForeignController/invalid-action");
vm.expectRevert("FC/invalid-action");
foreignController.claimCentrifugeCancelRedeemRequest(makeAddr("fake-vault"));
}

Expand Down Expand Up @@ -1012,7 +1012,7 @@ contract ForeignControllerTransferSharesCentrifugeFailureTests is CentrifugeTest
deal(ALM_RELAYER, 1 ether); // Gas cost for Centrifuge

vm.startPrank(ALM_RELAYER);
vm.expectRevert("ForeignController/centrifuge-id-not-configured");
vm.expectRevert("FC/id-not-configured");
foreignController.transferSharesCentrifuge{value: 0.5 ether}(
CENTRIFUGE_VAULT,
10_000_000e6,
Expand Down
2 changes: 1 addition & 1 deletion test/grove-base-fork/Merkl.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ contract MerklBaseTest is ForkTestBase {
contract ForeignControllerToggleOperatorMerklFailureTests is MerklBaseTest {

function test_toggleOperatorMerkl_merklDistributorNotSet() external {
vm.expectRevert("ForeignController/merkl-distributor-not-set");
vm.expectRevert("FC/merkl-distributor-not-set");

vm.prank(relayer);
foreignController.toggleOperatorMerkl(operator1);
Expand Down
18 changes: 9 additions & 9 deletions test/grove-base-fork/UniswapV3.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,19 +219,19 @@ contract ForeignControllerConfigFailureTests is UniswapV3TestBase {

function test_setUniswapV3PoolMaxTickDelta_isZero() public {
vm.prank(GROVE_EXECUTOR);
vm.expectRevert("ForeignController/max-tick-delta-out-of-bounds");
vm.expectRevert("FC/max-tick-delta-oob");
foreignController.setUniswapV3PoolMaxTickDelta(_getPool(), 0);
}

function test_setUniswapV3PoolMaxTickDelta_isTooLarge() public {
vm.prank(GROVE_EXECUTOR);
vm.expectRevert("ForeignController/max-tick-delta-out-of-bounds");
vm.expectRevert("FC/max-tick-delta-oob");
foreignController.setUniswapV3PoolMaxTickDelta(_getPool(), UniswapV3Lib.MAX_TICK_DELTA + 1);
}

function test_setUniswapV3AddLiquidityLowerTickBound_isTooSmall() public {
vm.prank(GROVE_EXECUTOR);
vm.expectRevert("ForeignController/lower-tick-out-of-bounds");
vm.expectRevert("FC/lower-tick-oob");
foreignController.setUniswapV3AddLiquidityLowerTickBound(_getPool(), MIN_UNISWAP_TICK - 1);
}

Expand All @@ -240,13 +240,13 @@ contract ForeignControllerConfigFailureTests is UniswapV3TestBase {
int24 currentUpper = tickBounds.upper;

vm.prank(GROVE_EXECUTOR);
vm.expectRevert("ForeignController/lower-tick-out-of-bounds");
vm.expectRevert("FC/lower-tick-oob");
foreignController.setUniswapV3AddLiquidityLowerTickBound(_getPool(), currentUpper);
}

function test_setUniswapV3AddLiquidityUpperTickBound_isTooLarge() public {
vm.prank(GROVE_EXECUTOR);
vm.expectRevert("ForeignController/upper-tick-out-of-bounds");
vm.expectRevert("FC/upper-tick-oob");
foreignController.setUniswapV3AddLiquidityUpperTickBound(_getPool(), MAX_UNISWAP_TICK + 1);
}
}
Expand All @@ -264,13 +264,13 @@ contract ForeignControllerSwapUniswapV3FailureTests is UniswapV3TestBase {

function test_setUniswapV3PoolMaxTickDelta_zeroTickDelta() public {
vm.prank(GROVE_EXECUTOR);
vm.expectRevert("ForeignController/max-tick-delta-out-of-bounds");
vm.expectRevert("FC/max-tick-delta-oob");
foreignController.setUniswapV3PoolMaxTickDelta(_getPool(), 0);
}

function test_setUniswapV3PoolMaxTickDelta_outOfBounds() public {
vm.prank(GROVE_EXECUTOR);
vm.expectRevert("ForeignController/max-tick-delta-out-of-bounds");
vm.expectRevert("FC/max-tick-delta-oob");
foreignController.setUniswapV3PoolMaxTickDelta(_getPool(), UniswapV3Lib.MAX_TICK_DELTA + 1);
}

Expand Down Expand Up @@ -1244,7 +1244,7 @@ contract ForeignControllerRemoveLiquidityFailureTests is UniswapV3TestBase {

function test_removeLiquidityUniswapV3_zeroLiquidity() public {
vm.startPrank(ALM_RELAYER);
vm.expectRevert("UniswapV3Lib/liquidity-out-of-bounds");
vm.expectRevert("UniswapV3Lib/liquidity-oob");
foreignController.removeLiquidityUniswapV3(
_getPool(),
tokenId,
Expand All @@ -1257,7 +1257,7 @@ contract ForeignControllerRemoveLiquidityFailureTests is UniswapV3TestBase {

function test_removeLiquidityUniswapV3_liquidityTooHigh() public {
vm.startPrank(ALM_RELAYER);
vm.expectRevert("UniswapV3Lib/liquidity-out-of-bounds");
vm.expectRevert("UniswapV3Lib/liquidity-oob");
foreignController.removeLiquidityUniswapV3(
_getPool(),
tokenId,
Expand Down
Loading
Loading