Skip to content

Commit 998ae24

Browse files
committed
fmt
1 parent 039c70e commit 998ae24

File tree

2 files changed

+60
-72
lines changed

2 files changed

+60
-72
lines changed

contracts/nft/erc1155m/ERC1155CMInitializableV1_0_2.sol

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,7 @@ contract ERC1155CMInitializableV1_0_2 is
119119
/// @param qty The quantity to mint
120120
/// @param limit The minting limit for the caller (used in merkle proofs)
121121
/// @param proof The merkle proof for allowlist minting
122-
function mint(uint256 tokenId, uint32 qty, uint32 limit, bytes32[] calldata proof)
123-
external
124-
payable
125-
nonReentrant
126-
{
122+
function mint(uint256 tokenId, uint32 qty, uint32 limit, bytes32[] calldata proof) external payable nonReentrant {
127123
_mintInternal(msg.sender, tokenId, qty, limit, proof);
128124
}
129125

test/erc1155m/ERC1155CMInitializableTest.t.sol

Lines changed: 59 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -208,16 +208,16 @@ contract ERC1155CMInitializableTest is Test {
208208
function testSetTransferValidator() public {
209209
// Deploy a mock validator with code
210210
address mockValidator = address(new MockTransferValidator());
211-
211+
212212
vm.prank(owner);
213213
nft.setTransferValidator(mockValidator);
214-
214+
215215
assertEq(nft.getTransferValidator(), mockValidator);
216216
}
217217

218218
function testSetTransferValidatorNonOwnerRevert() public {
219219
address mockValidator = address(new MockTransferValidator());
220-
220+
221221
vm.prank(minter);
222222
vm.expectRevert(Ownable.Unauthorized.selector);
223223
nft.setTransferValidator(mockValidator);
@@ -226,7 +226,7 @@ contract ERC1155CMInitializableTest is Test {
226226
function testSetTransferValidatorZeroAddress() public {
227227
vm.prank(owner);
228228
nft.setTransferValidator(address(0));
229-
229+
230230
// After setting to zero, validator should be zero (no validator)
231231
assertEq(nft.getTransferValidator(), address(0));
232232
}
@@ -245,14 +245,14 @@ contract ERC1155CMInitializableTest is Test {
245245

246246
function testAutoApproveTransfersFromValidator() public {
247247
address mockValidator = address(new MockTransferValidator());
248-
248+
249249
vm.prank(owner);
250250
nft.setTransferValidator(mockValidator);
251-
251+
252252
// Mint a token to minter
253253
vm.prank(owner);
254254
nft.ownerMint(minter, 0, 1);
255-
255+
256256
// The validator should be auto-approved if autoApproveTransfersFromValidator is true
257257
// Note: This depends on the AutomaticValidatorTransferApproval implementation
258258
// The approval depends on the autoApproveTransfersFromValidator flag
@@ -265,7 +265,7 @@ contract ERC1155CMInitializableTest is Test {
265265
ERC1155CMInitializable nftMulti =
266266
ERC1155CMInitializable(LibClone.deployERC1967(address(new ERC1155CMInitializable())));
267267
nftMulti.initialize("Test", "TEST", owner, mintFee);
268-
268+
269269
// Deploy and set a mock transfer validator
270270
address mockValidator = address(new MockTransferValidator());
271271
nftMulti.setTransferValidator(mockValidator);
@@ -277,9 +277,7 @@ contract ERC1155CMInitializableTest is Test {
277277
walletLimit[0] = GLOBAL_WALLET_LIMIT;
278278
walletLimit[1] = GLOBAL_WALLET_LIMIT;
279279

280-
nftMulti.setup(
281-
"base_uri_", maxSupply, walletLimit, address(0), fundReceiver, initialStages, address(this), 0
282-
);
280+
nftMulti.setup("base_uri_", maxSupply, walletLimit, address(0), fundReceiver, initialStages, address(this), 0);
283281

284282
vm.startPrank(owner);
285283
nftMulti.ownerMint(minter, 0, 5);
@@ -304,13 +302,13 @@ contract ERC1155CMInitializableTest is Test {
304302

305303
function testTransferValidationIsCalledOnTransfer() public {
306304
MockTransferValidatorWithRevert mockValidator = new MockTransferValidatorWithRevert();
307-
305+
308306
vm.prank(owner);
309307
nft.setTransferValidator(address(mockValidator));
310-
308+
311309
vm.prank(owner);
312310
nft.ownerMint(minter, 0, 1);
313-
311+
314312
// Transfer should revert because validator reverts
315313
vm.prank(minter);
316314
vm.expectRevert("MockValidator: transfer not allowed");
@@ -319,26 +317,26 @@ contract ERC1155CMInitializableTest is Test {
319317

320318
function testMintDoesNotCallValidator() public {
321319
MockTransferValidatorWithRevert mockValidator = new MockTransferValidatorWithRevert();
322-
320+
323321
vm.prank(owner);
324322
nft.setTransferValidator(address(mockValidator));
325-
323+
326324
// Minting should work even though validator would revert on transfers
327325
vm.prank(owner);
328326
nft.ownerMint(minter, 0, 1);
329-
327+
330328
assertEq(nft.balanceOf(minter, 0), 1);
331329
}
332330

333331
function testBurnDoesNotCallValidator() public {
334332
MockTransferValidatorWithRevert mockValidator = new MockTransferValidatorWithRevert();
335-
333+
336334
vm.prank(owner);
337335
nft.ownerMint(minter, 0, 1);
338-
336+
339337
vm.prank(owner);
340338
nft.setTransferValidator(address(mockValidator));
341-
339+
342340
// Burning should work even though validator would revert on transfers
343341
// Note: ERC1155M doesn't have a public burn function, so we can't test this directly
344342
// This test is here for completeness but will be skipped
@@ -349,79 +347,73 @@ contract ERC1155CMInitializableTest is Test {
349347

350348
contract MockTransferValidator is ITransferValidator {
351349
function applyCollectionTransferPolicy(address caller, address from, address to) external pure override {}
352-
350+
353351
function validateTransfer(address caller, address from, address to) external pure override {}
354-
355-
function validateTransfer(
356-
address caller,
357-
address from,
358-
address to,
359-
uint256 tokenId
360-
) external pure override {}
361-
362-
function validateTransfer(
363-
address caller,
364-
address from,
365-
address to,
366-
uint256 tokenId,
367-
uint256 amount
368-
) external pure override {}
369-
352+
353+
function validateTransfer(address caller, address from, address to, uint256 tokenId) external pure override {}
354+
355+
function validateTransfer(address caller, address from, address to, uint256 tokenId, uint256 amount)
356+
external
357+
pure
358+
override
359+
{}
360+
370361
function beforeAuthorizedTransfer(address operator, address token, uint256 tokenId) external pure override {}
371-
362+
372363
function afterAuthorizedTransfer(address token, uint256 tokenId) external pure override {}
373-
364+
374365
function beforeAuthorizedTransfer(address operator, address token) external pure override {}
375-
366+
376367
function afterAuthorizedTransfer(address token) external pure override {}
377-
368+
378369
function beforeAuthorizedTransfer(address token, uint256 tokenId) external pure override {}
379-
380-
function beforeAuthorizedTransferWithAmount(address token, uint256 tokenId, uint256 amount) external pure override {}
381-
370+
371+
function beforeAuthorizedTransferWithAmount(address token, uint256 tokenId, uint256 amount)
372+
external
373+
pure
374+
override
375+
{}
376+
382377
function afterAuthorizedTransferWithAmount(address token, uint256 tokenId) external pure override {}
383378
}
384379

385380
contract MockTransferValidatorWithRevert is ITransferValidator {
386381
function applyCollectionTransferPolicy(address caller, address from, address to) external pure override {
387382
revert("MockValidator: transfer not allowed");
388383
}
389-
384+
390385
function validateTransfer(address caller, address from, address to) external pure override {
391386
revert("MockValidator: transfer not allowed");
392387
}
393-
394-
function validateTransfer(
395-
address caller,
396-
address from,
397-
address to,
398-
uint256 tokenId
399-
) external pure override {
388+
389+
function validateTransfer(address caller, address from, address to, uint256 tokenId) external pure override {
400390
revert("MockValidator: transfer not allowed");
401391
}
402392

403-
function validateTransfer(
404-
address caller,
405-
address from,
406-
address to,
407-
uint256 tokenId,
408-
uint256 amount
409-
) external pure override {
393+
function validateTransfer(address caller, address from, address to, uint256 tokenId, uint256 amount)
394+
external
395+
pure
396+
override
397+
{
410398
revert("MockValidator: transfer not allowed");
411399
}
412-
400+
413401
function beforeAuthorizedTransfer(address operator, address token, uint256 tokenId) external pure override {}
414-
402+
415403
function afterAuthorizedTransfer(address token, uint256 tokenId) external pure override {}
416-
404+
417405
function beforeAuthorizedTransfer(address operator, address token) external pure override {}
418-
406+
419407
function afterAuthorizedTransfer(address token) external pure override {}
420-
408+
421409
function beforeAuthorizedTransfer(address token, uint256 tokenId) external pure override {}
422-
423-
function beforeAuthorizedTransferWithAmount(address token, uint256 tokenId, uint256 amount) external pure override {}
424-
410+
411+
function beforeAuthorizedTransferWithAmount(address token, uint256 tokenId, uint256 amount)
412+
external
413+
pure
414+
override
415+
{}
416+
425417
function afterAuthorizedTransferWithAmount(address token, uint256 tokenId) external pure override {}
426418
}
427419

0 commit comments

Comments
 (0)