Skip to content

improve drippie & faucet tests and coverage #13040

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
smartcontracts merged 3 commits into from
Nov 22, 2024
Merged

improve drippie & faucet tests and coverage #13040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd49ea5
improve drippie & faucet tests and coverage
AmadiMichael Nov 22, 2024
a828af3
Update packages/contracts-bedrock/test/periphery/faucet/Faucet.t.sol
AmadiMichael Nov 22, 2024
12689f6
Update packages/contracts-bedrock/test/periphery/faucet/Faucet.t.sol
AmadiMichael Nov 22, 2024
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
18 changes: 7 additions & 11 deletions packages/contracts-bedrock/test/periphery/drippie/Drippie.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ import { SimpleStorage } from "test/mocks/SimpleStorage.sol";
contract TestDrippie is Drippie {
constructor(address owner) Drippie(owner) { }

function dripStatus(string memory name) external view returns (Drippie.DripStatus) {
return drips[name].status;
}

function dripStateLast(string memory name) external view returns (uint256) {
return drips[name].last;
}
Expand Down Expand Up @@ -131,12 +127,12 @@ contract Drippie_Test is Test {
vm.prank(drippie.owner());
drippie.create(dripName, cfg);

Drippie.DripStatus status = drippie.dripStatus(dripName);
Drippie.DripStatus status = drippie.getDripStatus(dripName);
Drippie.DripConfig memory config = drippie.dripConfig(dripName);

assertEq(uint256(status), uint256(Drippie.DripStatus.PAUSED));

assertEq(config.interval, cfg.interval);
assertEq(drippie.getDripInterval(dripName), cfg.interval);
assertEq(config.reentrant, cfg.reentrant);
assertEq(address(config.dripcheck), address(cfg.dripcheck));
assertEq(config.checkparams, cfg.checkparams);
Expand Down Expand Up @@ -186,7 +182,7 @@ contract Drippie_Test is Test {
address owner = drippie.owner();

{
Drippie.DripStatus status = drippie.dripStatus(dripName);
Drippie.DripStatus status = drippie.getDripStatus(dripName);
assertEq(uint256(status), uint256(Drippie.DripStatus.PAUSED));
}

Expand All @@ -198,7 +194,7 @@ contract Drippie_Test is Test {
drippie.status(dripName, Drippie.DripStatus.ACTIVE);

{
Drippie.DripStatus status = drippie.dripStatus(dripName);
Drippie.DripStatus status = drippie.getDripStatus(dripName);
assertEq(uint256(status), uint256(Drippie.DripStatus.ACTIVE));
}

Expand All @@ -210,7 +206,7 @@ contract Drippie_Test is Test {
drippie.status(dripName, Drippie.DripStatus.PAUSED);

{
Drippie.DripStatus status = drippie.dripStatus(dripName);
Drippie.DripStatus status = drippie.getDripStatus(dripName);
assertEq(uint256(status), uint256(Drippie.DripStatus.PAUSED));
}
}
Expand Down Expand Up @@ -252,7 +248,7 @@ contract Drippie_Test is Test {

drippie.status(dripName, Drippie.DripStatus.ARCHIVED);

Drippie.DripStatus status = drippie.dripStatus(dripName);
Drippie.DripStatus status = drippie.getDripStatus(dripName);
assertEq(uint256(status), uint256(Drippie.DripStatus.ARCHIVED));
}

Expand Down Expand Up @@ -463,7 +459,7 @@ contract Drippie_Test is Test {
function test_not_active_reverts() external {
_createDefaultDrip(dripName);

Drippie.DripStatus status = drippie.dripStatus(dripName);
Drippie.DripStatus status = drippie.getDripStatus(dripName);
assertEq(uint256(status), uint256(Drippie.DripStatus.PAUSED));

vm.prank(drippie.owner());
Expand Down
18 changes: 18 additions & 0 deletions packages/contracts-bedrock/test/periphery/faucet/Faucet.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,24 @@ contract FaucetTest is Faucet_Initializer {
assertEq(faucet.ADMIN(), faucetContractAdmin);
}

function test_configure_whenAdmin_succeeds() external {
vm.startPrank(faucetContractAdmin);
faucet.configure(optimistNftFam, Faucet.ModuleConfig("OptimistNftModule", true, 1 days, 1 ether));

(string memory name, bool enabled, uint256 ttl, uint256 amount) = faucet.modules(optimistNftFam);
assertEq(name, "OptimistNftModule");
assertEq(enabled, true);
assertEq(ttl, 1 days);
assertEq(amount, 1 ether);

assertTrue(faucet.isModuleEnabled(optimistNftFam));
}

function test_configure_whenNotAdmin_reverts() external {
vm.expectRevert("Faucet: function can only be called by admin");
faucet.configure(optimistNftFam, Faucet.ModuleConfig("OptimistNftModule", true, 1 days, 1 ether));
}

function test_authAdmin_drip_succeeds() external {
_enableFaucetAuthModules();
bytes32 nonce = faucetHelper.consumeNonce();
Expand Down