Skip to content

Commit

Permalink
CI cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
jhweintraub committed Oct 4, 2024
1 parent bbabb8d commit bf6d75d
Show file tree
Hide file tree
Showing 4 changed files with 414 additions and 67 deletions.
27 changes: 27 additions & 0 deletions contracts/gas-snapshots/ccip.gas-snapshot
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,33 @@ EtherSenderReceiverTest_validatedMessage:test_validatedMessage_emptyDataOverwrit
EtherSenderReceiverTest_validatedMessage:test_validatedMessage_invalidTokenAmounts() (gas: 17925)
EtherSenderReceiverTest_validatedMessage:test_validatedMessage_tokenOverwrittenToWeth() (gas: 25329)
EtherSenderReceiverTest_validatedMessage:test_validatedMessage_validMessage_extraArgs() (gas: 26370)
FactoryBurnMintERC20approve:testApproveSuccess() (gas: 55767)
FactoryBurnMintERC20approve:testInvalidAddressReverts() (gas: 10709)
FactoryBurnMintERC20burn:testBasicBurnSuccess() (gas: 172380)
FactoryBurnMintERC20burn:testBurnFromZeroAddressReverts() (gas: 47384)
FactoryBurnMintERC20burn:testExceedsBalanceReverts() (gas: 21962)
FactoryBurnMintERC20burn:testSenderNotBurnerReverts() (gas: 13491)
FactoryBurnMintERC20burnFrom:testBurnFromSuccess() (gas: 58212)
FactoryBurnMintERC20burnFrom:testExceedsBalanceReverts() (gas: 36130)
FactoryBurnMintERC20burnFrom:testInsufficientAllowanceReverts() (gas: 22054)
FactoryBurnMintERC20burnFrom:testSenderNotBurnerReverts() (gas: 13491)
FactoryBurnMintERC20burnFromAlias:testBurnFromSuccess() (gas: 58187)
FactoryBurnMintERC20burnFromAlias:testExceedsBalanceReverts() (gas: 36094)
FactoryBurnMintERC20burnFromAlias:testInsufficientAllowanceReverts() (gas: 22009)
FactoryBurnMintERC20burnFromAlias:testSenderNotBurnerReverts() (gas: 13446)
FactoryBurnMintERC20constructor:testConstructorSuccess() (gas: 1495659)
FactoryBurnMintERC20decreaseApproval:testDecreaseApprovalSuccess() (gas: 31323)
FactoryBurnMintERC20grantMintAndBurnRoles:testGrantMintAndBurnRolesSuccess() (gas: 121439)
FactoryBurnMintERC20grantRole:testGrantBurnAccessSuccess() (gas: 53612)
FactoryBurnMintERC20grantRole:testGrantManySuccess() (gas: 963184)
FactoryBurnMintERC20grantRole:testGrantMintAccessSuccess() (gas: 94434)
FactoryBurnMintERC20increaseApproval:testIncreaseApprovalSuccess() (gas: 44368)
FactoryBurnMintERC20mint:testBasicMintSuccess() (gas: 149987)
FactoryBurnMintERC20mint:testMaxSupplyExceededReverts() (gas: 50703)
FactoryBurnMintERC20mint:testSenderNotMinterReverts() (gas: 11328)
FactoryBurnMintERC20supportsInterface:testConstructorSuccess() (gas: 11345)
FactoryBurnMintERC20transfer:testInvalidAddressReverts() (gas: 10707)
FactoryBurnMintERC20transfer:testTransferSuccess() (gas: 42427)
FeeQuoter_applyDestChainConfigUpdates:test_InvalidChainFamilySelector_Revert() (gas: 16686)
FeeQuoter_applyDestChainConfigUpdates:test_InvalidDestChainConfigDestChainSelectorEqZero_Revert() (gas: 16588)
FeeQuoter_applyDestChainConfigUpdates:test_applyDestChainConfigUpdatesDefaultTxGasLimitEqZero_Revert() (gas: 16630)
Expand Down
18 changes: 9 additions & 9 deletions contracts/gas-snapshots/operatorforwarder.gas-snapshot
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ FactoryTest:test_DeployNewForwarderAndTransferOwnership_Success() (gas: 1059722)
FactoryTest:test_DeployNewForwarder_Success() (gas: 1048209)
FactoryTest:test_DeployNewOperatorAndForwarder_Success() (gas: 4069305)
FactoryTest:test_DeployNewOperator_Success() (gas: 3020464)
ForwarderTest:test_Forward_Success(uint256) (runs: 257, μ: 226979, ~: 227289)
ForwarderTest:test_MultiForward_Success(uint256,uint256) (runs: 257, μ: 258577, ~: 259120)
ForwarderTest:test_OwnerForward_Success() (gas: 30096)
ForwarderTest:test_Forward_Success(uint256) (runs: 256, μ: 226978, ~: 227289)
ForwarderTest:test_MultiForward_Success(uint256,uint256) (runs: 256, μ: 258575, ~: 259120)
ForwarderTest:test_OwnerForward_Success() (gas: 30118)
ForwarderTest:test_SetAuthorizedSenders_Success() (gas: 160524)
ForwarderTest:test_TransferOwnershipWithMessage_Success() (gas: 35123)
OperatorTest:test_CancelOracleRequest_Success() (gas: 274295)
OperatorTest:test_FulfillOracleRequest_Success() (gas: 330480)
OperatorTest:test_NotAuthorizedSender_Revert() (gas: 246628)
OperatorTest:test_OracleRequest_Success() (gas: 249843)
OperatorTest:test_SendRequestAndCancelRequest_Success(uint96) (runs: 257, μ: 386787, ~: 386790)
OperatorTest:test_SendRequest_Success(uint96) (runs: 257, μ: 303436, ~: 303439)
OperatorTest:test_CancelOracleRequest_Success() (gas: 274436)
OperatorTest:test_FulfillOracleRequest_Success() (gas: 330603)
OperatorTest:test_NotAuthorizedSender_Revert() (gas: 246716)
OperatorTest:test_OracleRequest_Success() (gas: 250019)
OperatorTest:test_SendRequestAndCancelRequest_Success(uint96) (runs: 256, μ: 387121, ~: 387124)
OperatorTest:test_SendRequest_Success(uint96) (runs: 256, μ: 303612, ~: 303615)
76 changes: 18 additions & 58 deletions contracts/src/v0.8/ccip/test/legacy/TokenPoolAndProxy.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -361,12 +361,8 @@ contract TokenPoolAndProxy is EVM2EVMOnRampSetup {
}

function test_lockOrBurn_burnWithFromMint_Success() public {
s_pool = new BurnWithFromMintTokenPoolAndProxy(
s_token,
new address[](0),
address(s_mockRMN),
address(s_sourceRouter)
);
s_pool =
new BurnWithFromMintTokenPoolAndProxy(s_token, new address[](0), address(s_mockRMN), address(s_sourceRouter));
_configurePool();
_deployOldPool();
_assertLockOrBurnCorrect();
Expand All @@ -378,13 +374,8 @@ contract TokenPoolAndProxy is EVM2EVMOnRampSetup {
}

function test_lockOrBurn_lockRelease_Success() public {
s_pool = new LockReleaseTokenPoolAndProxy(
s_token,
new address[](0),
address(s_mockRMN),
false,
address(s_sourceRouter)
);
s_pool =
new LockReleaseTokenPoolAndProxy(s_token, new address[](0), address(s_mockRMN), false, address(s_sourceRouter));
_configurePool();
_deployOldPool();
_assertLockOrBurnCorrect();
Expand All @@ -400,17 +391,11 @@ contract TokenPoolAndProxy is EVM2EVMOnRampSetup {
s_token.grantMintAndBurnRoles(address(s_legacyPool));

TokenPool1_2.RampUpdate[] memory onRampUpdates = new TokenPool1_2.RampUpdate[](1);
onRampUpdates[0] = TokenPool1_2.RampUpdate({
ramp: address(s_pool),
allowed: true,
rateLimiterConfig: _getInboundRateLimiterConfig()
});
onRampUpdates[0] =
TokenPool1_2.RampUpdate({ramp: address(s_pool), allowed: true, rateLimiterConfig: _getInboundRateLimiterConfig()});
TokenPool1_2.RampUpdate[] memory offRampUpdates = new TokenPool1_2.RampUpdate[](1);
offRampUpdates[0] = TokenPool1_2.RampUpdate({
ramp: address(s_pool),
allowed: true,
rateLimiterConfig: _getInboundRateLimiterConfig()
});
offRampUpdates[0] =
TokenPool1_2.RampUpdate({ramp: address(s_pool), allowed: true, rateLimiterConfig: _getInboundRateLimiterConfig()});
BurnMintTokenPool1_2(address(s_legacyPool)).applyRampUpdates(onRampUpdates, offRampUpdates);
}

Expand Down Expand Up @@ -521,13 +506,8 @@ contract TokenPoolAndProxy is EVM2EVMOnRampSetup {
}

function test_setPreviousPool_Success() public {
LockReleaseTokenPoolAndProxy pool = new LockReleaseTokenPoolAndProxy(
s_token,
new address[](0),
address(s_mockRMN),
true,
address(s_sourceRouter)
);
LockReleaseTokenPoolAndProxy pool =
new LockReleaseTokenPoolAndProxy(s_token, new address[](0), address(s_mockRMN), true, address(s_sourceRouter));

assertEq(pool.getPreviousPool(), address(0));

Expand Down Expand Up @@ -559,23 +539,13 @@ contract LockReleaseTokenPoolAndProxySetup is RouterSetup {
RouterSetup.setUp();
s_token = new BurnMintERC677("LINK", "LNK", 18, 0);
deal(address(s_token), OWNER, type(uint256).max);
s_lockReleaseTokenPoolAndProxy = new LockReleaseTokenPoolAndProxy(
s_token,
new address[](0),
address(s_mockRMN),
true,
address(s_sourceRouter)
);
s_lockReleaseTokenPoolAndProxy =
new LockReleaseTokenPoolAndProxy(s_token, new address[](0), address(s_mockRMN), true, address(s_sourceRouter));

s_allowedList.push(USER_1);
s_allowedList.push(DUMMY_CONTRACT_ADDRESS);
s_lockReleaseTokenPoolAndProxyWithAllowList = new LockReleaseTokenPoolAndProxy(
s_token,
s_allowedList,
address(s_mockRMN),
true,
address(s_sourceRouter)
);
s_lockReleaseTokenPoolAndProxyWithAllowList =
new LockReleaseTokenPoolAndProxy(s_token, s_allowedList, address(s_mockRMN), true, address(s_sourceRouter));

TokenPool.ChainUpdate[] memory chainUpdate = new TokenPool.ChainUpdate[](1);
chainUpdate[0] = TokenPool.ChainUpdate({
Expand Down Expand Up @@ -618,13 +588,8 @@ contract LockReleaseTokenPoolPoolAndProxy_canAcceptLiquidity is LockReleaseToken
function test_CanAcceptLiquidity_Success() public {
assertEq(true, s_lockReleaseTokenPoolAndProxy.canAcceptLiquidity());

s_lockReleaseTokenPoolAndProxy = new LockReleaseTokenPoolAndProxy(
s_token,
new address[](0),
address(s_mockRMN),
false,
address(s_sourceRouter)
);
s_lockReleaseTokenPoolAndProxy =
new LockReleaseTokenPoolAndProxy(s_token, new address[](0), address(s_mockRMN), false, address(s_sourceRouter));
assertEq(false, s_lockReleaseTokenPoolAndProxy.canAcceptLiquidity());
}
}
Expand Down Expand Up @@ -656,13 +621,8 @@ contract LockReleaseTokenPoolPoolAndProxy_provideLiquidity is LockReleaseTokenPo
}

function test_LiquidityNotAccepted_Revert() public {
s_lockReleaseTokenPoolAndProxy = new LockReleaseTokenPoolAndProxy(
s_token,
new address[](0),
address(s_mockRMN),
false,
address(s_sourceRouter)
);
s_lockReleaseTokenPoolAndProxy =
new LockReleaseTokenPoolAndProxy(s_token, new address[](0), address(s_mockRMN), false, address(s_sourceRouter));

vm.expectRevert(LockReleaseTokenPoolAndProxy.LiquidityNotAccepted.selector);
s_lockReleaseTokenPoolAndProxy.provideLiquidity(1);
Expand Down
Loading

0 comments on commit bf6d75d

Please sign in to comment.