Skip to content

fix: Intermittent test failure in cicd from newing in unit test #233

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
merged 13 commits into from
Jul 17, 2025
Merged

fix: Intermittent test failure in cicd from newing in unit test #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
21ca923
fix(drop 2): avalanche deploy address issue
rovilay Jul 16, 2025
8aab793
draft rotation of salt
tenthirtyone Jul 17, 2025
93b2e20
forge fmt....
tenthirtyone Jul 17, 2025
4fb49ca
deploy create2 from different user
tenthirtyone Jul 17, 2025
4441636
add more verbose debugging in cicd
tenthirtyone Jul 17, 2025
4b415da
add more verbose debugging in cicd
tenthirtyone Jul 17, 2025
d94f76c
remove forge fmt
tenthirtyone Jul 17, 2025
c51ac8b
remove forge fmt
tenthirtyone Jul 17, 2025
0a753b4
remove forge fmt
tenthirtyone Jul 17, 2025
baabc56
found you
tenthirtyone Jul 17, 2025
6151734
Merge remote-tracking branch 'origin/main' into delme/fork-232
tenthirtyone Jul 17, 2025
e8627c8
add back forge fmt
tenthirtyone Jul 17, 2025
fc20662
actually run forge fmt now
tenthirtyone Jul 17, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ jobs:

- name: Run Forge tests
run: |
forge test -vvv
forge test -vvvv
id: test
22 changes: 14 additions & 8 deletions test/factory/MagicDropCloneFactoryTest.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ contract MockERC1155Initializable is MockERC1155 {
}

contract InvalidImplementation is MockERC721 {
function initialize(string memory) public {} // Missing name and symbol parameters
function initialize(string memory) public {
revert("deliberate failure");
} // Missing name and symbol parameters
}

contract MagicDropCloneFactoryTest is Test {
Expand All @@ -34,10 +36,13 @@ contract MagicDropCloneFactoryTest is Test {

uint32 internal erc721ImplId;
uint32 internal erc1155ImplId;
InvalidImplementation invalidImplementation;

function setUp() public {
vm.startPrank(owner);

invalidImplementation = new InvalidImplementation();

// Deploy and initialize registry
address registryImpl = LibClone.clone(address(new MagicDropTokenImplRegistry()));
registry = MagicDropTokenImplRegistry(payable(registryImpl));
Expand Down Expand Up @@ -156,16 +161,16 @@ contract MagicDropCloneFactoryTest is Test {
vm.startPrank(user);

factory.createContractDeterministic{value: 0.01 ether}(
"TestNFT1", "TNFT1", TokenStandard.ERC721, payable(user), erc721ImplId, bytes32(0)
"TestNFT1", "TNFT1", TokenStandard.ERC721, payable(user), erc721ImplId, bytes32(uint256(100))
);
vm.expectRevert();
factory.createContractDeterministic{value: 0.01 ether}(
"TestNFT2", "TNFT2", TokenStandard.ERC721, payable(user), erc721ImplId, bytes32(0)
"TestNFT2", "TNFT2", TokenStandard.ERC721, payable(user), erc721ImplId, bytes32(uint256(100))
);
}

function testContractAlreadyDeployed() public {
bytes32 salt = bytes32(uint256(1));
bytes32 salt = bytes32(uint256(101));
uint32 implId = 1;
TokenStandard standard = TokenStandard.ERC721;
address initialOwner = address(0x1);
Expand All @@ -188,21 +193,22 @@ contract MagicDropCloneFactoryTest is Test {
TokenStandard standard = TokenStandard.ERC721;

vm.startPrank(owner);
InvalidImplementation impl = new InvalidImplementation();
uint32 implId = registry.registerImplementation(standard, address(impl), false, 0.01 ether, 0.00001 ether);

uint32 implId =
registry.registerImplementation(standard, address(invalidImplementation), false, 0.01 ether, 0.00001 ether);
vm.stopPrank();

vm.expectRevert(MagicDropCloneFactory.InitializationFailed.selector);
factory.createContractDeterministic{value: 0.01 ether}(
"TestNFT", "TNFT", standard, payable(user), implId, bytes32(0)
"TestNFT", "TNFT", standard, payable(user), implId, bytes32(uint256(102))
);
}

function testInsufficientDeploymentFee() public {
vm.startPrank(user);
vm.expectRevert(MagicDropCloneFactory.InsufficientDeploymentFee.selector);
factory.createContractDeterministic{value: 0.005 ether}(
"TestNFT", "TNFT", TokenStandard.ERC721, payable(user), erc721ImplId, bytes32(0)
"TestNFT", "TNFT", TokenStandard.ERC721, payable(user), erc721ImplId, bytes32(uint256(103))
);
}

Expand Down