From b0964392d2c5c240d63371318e2d97dfad6b9681 Mon Sep 17 00:00:00 2001 From: Ryan Ghods Date: Thu, 8 Feb 2024 17:40:15 -0800 Subject: [PATCH] lint: forge fmt --- script/DeployAndConfigure1155Receive.s.sol | 4 +-- ...dRedeemTokens-CampaignOnReceiveToken.s.sol | 4 +-- script/DeployAndRedeemTokens.s.sol | 16 +++------ script/DeployAndRedeemTrait.s.sol | 16 +++------ ...kenWithPredeployedSeadropRedeemToken.s.sol | 4 +-- test/ERC7498-MultiRedeem.t.sol | 30 +++++----------- test/ERC7498-Revert.t.sol | 29 ++++----------- test/ERC7498-SimpleRedeem.t.sol | 30 +++++----------- test/ERC7498-TraitRedemption.t.sol | 36 +++++-------------- test/utils/BaseRedeemablesTest.sol | 30 ++++------------ 10 files changed, 50 insertions(+), 149 deletions(-) diff --git a/script/DeployAndConfigure1155Receive.s.sol b/script/DeployAndConfigure1155Receive.s.sol index 17b3000..96c677c 100644 --- a/script/DeployAndConfigure1155Receive.s.sol +++ b/script/DeployAndConfigure1155Receive.s.sol @@ -52,9 +52,7 @@ contract DeployAndConfigure1155Receive is Script, Test { recipient: payable(BURN_ADDRESS) }); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 1 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](1); requirements[0].offer = offer; requirements[0].consideration = consideration; diff --git a/script/DeployAndRedeemTokens-CampaignOnReceiveToken.s.sol b/script/DeployAndRedeemTokens-CampaignOnReceiveToken.s.sol index db452e7..da0f806 100644 --- a/script/DeployAndRedeemTokens-CampaignOnReceiveToken.s.sol +++ b/script/DeployAndRedeemTokens-CampaignOnReceiveToken.s.sol @@ -39,9 +39,7 @@ contract DeployAndRedeemTokens_CampaignOnReceiveToken is Script, Test { recipient: payable(BURN_ADDRESS) }); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 1 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](1); requirements[0].offer = offer; requirements[0].consideration = consideration; diff --git a/script/DeployAndRedeemTokens.s.sol b/script/DeployAndRedeemTokens.s.sol index 2cd2da3..80108cd 100644 --- a/script/DeployAndRedeemTokens.s.sol +++ b/script/DeployAndRedeemTokens.s.sol @@ -14,16 +14,12 @@ contract DeployAndRedeemTokens is Script, Test { function run() external { vm.startBroadcast(); - ERC721ShipyardRedeemableOwnerMintable redeemToken = new ERC721ShipyardRedeemableOwnerMintable( - "TestRedeemablesRedeemToken", - "TEST" - ); + ERC721ShipyardRedeemableOwnerMintable redeemToken = + new ERC721ShipyardRedeemableOwnerMintable("TestRedeemablesRedeemToken", "TEST"); address[] memory redeemTokens = new address[](1); redeemTokens[0] = address(redeemToken); - ERC721ShipyardRedeemableMintable receiveToken = new ERC721ShipyardRedeemableMintable( - "TestRedeemablesRecieveToken", - "TEST" - ); + ERC721ShipyardRedeemableMintable receiveToken = + new ERC721ShipyardRedeemableMintable("TestRedeemablesRecieveToken", "TEST"); receiveToken.setRedeemablesContracts(redeemTokens); // Configure the campaign. @@ -46,9 +42,7 @@ contract DeployAndRedeemTokens is Script, Test { recipient: payable(BURN_ADDRESS) }); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 1 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](1); requirements[0].offer = offer; requirements[0].consideration = consideration; diff --git a/script/DeployAndRedeemTrait.s.sol b/script/DeployAndRedeemTrait.s.sol index f213f73..807230b 100644 --- a/script/DeployAndRedeemTrait.s.sol +++ b/script/DeployAndRedeemTrait.s.sol @@ -15,20 +15,16 @@ contract DeployAndRedeemTrait is Script, Test { vm.startBroadcast(); // deploy the receive token first - ERC721ShipyardRedeemableMintable receiveToken = new ERC721ShipyardRedeemableMintable( - "TestRedeemablesRecieveToken", - "TEST" - ); + ERC721ShipyardRedeemableMintable receiveToken = + new ERC721ShipyardRedeemableMintable("TestRedeemablesRecieveToken", "TEST"); // add the receive token address to allowed trait setters array address[] memory allowedTraitSetters = new address[](1); allowedTraitSetters[0] = address(receiveToken); // deploy the redeem token - ERC721ShipyardRedeemableTraitSetters redeemToken = new ERC721ShipyardRedeemableTraitSetters( - "DynamicTraitsRedeemToken", - "TEST" - ); + ERC721ShipyardRedeemableTraitSetters redeemToken = + new ERC721ShipyardRedeemableTraitSetters("DynamicTraitsRedeemToken", "TEST"); // set the receive token as an allowed trait setter redeemToken.setAllowedTraitSetters(allowedTraitSetters); @@ -66,9 +62,7 @@ contract DeployAndRedeemTrait is Script, Test { substandardValue: substandardValue }); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 1 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](1); requirements[0].offer = offer; requirements[0].consideration = consideration; requirements[0].traitRedemptions = traitRedemptions; diff --git a/script/DeployERC721ReceiveTokenWithPredeployedSeadropRedeemToken.s.sol b/script/DeployERC721ReceiveTokenWithPredeployedSeadropRedeemToken.s.sol index 55b558d..a9982cf 100644 --- a/script/DeployERC721ReceiveTokenWithPredeployedSeadropRedeemToken.s.sol +++ b/script/DeployERC721ReceiveTokenWithPredeployedSeadropRedeemToken.s.sol @@ -39,9 +39,7 @@ contract DeployERC721ReceiveTokenWithPredeployedSeaDropRedeemToken is Script, Te recipient: payable(BURN_ADDRESS) }); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 1 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](1); requirements[0].offer = offer; requirements[0].consideration = consideration; diff --git a/test/ERC7498-MultiRedeem.t.sol b/test/ERC7498-MultiRedeem.t.sol index 7f98d31..f0f61bb 100644 --- a/test/ERC7498-MultiRedeem.t.sol +++ b/test/ERC7498-MultiRedeem.t.sol @@ -36,35 +36,26 @@ contract ERC7498_MultiRedeem is BaseRedeemablesTest { address secondRedeemTokenAddress; _mintToken(address(context.erc7498Token), tokenId); if (_isERC721(address(context.erc7498Token))) { - ERC721ShipyardRedeemableOwnerMintable secondRedeemToken721 = new ERC721ShipyardRedeemableOwnerMintable( - "", - "" - ); + ERC721ShipyardRedeemableOwnerMintable secondRedeemToken721 = + new ERC721ShipyardRedeemableOwnerMintable("", ""); secondRedeemTokenAddress = address(secondRedeemToken721); vm.label(secondRedeemTokenAddress, "secondRedeemToken721"); secondRedeemToken721.setApprovalForAll(address(context.erc7498Token), true); } else { - ERC1155ShipyardRedeemableOwnerMintable secondRedeemToken1155 = new ERC1155ShipyardRedeemableOwnerMintable( - "", - "" - ); + ERC1155ShipyardRedeemableOwnerMintable secondRedeemToken1155 = + new ERC1155ShipyardRedeemableOwnerMintable("", ""); secondRedeemTokenAddress = address(secondRedeemToken1155); vm.label(secondRedeemTokenAddress, "secondRedeemToken1155"); secondRedeemToken1155.setApprovalForAll(address(context.erc7498Token), true); } _mintToken(secondRedeemTokenAddress, tokenId); - ERC721ShipyardRedeemableMintable receiveToken = new ERC721ShipyardRedeemableMintable( - "", - "" - ); + ERC721ShipyardRedeemableMintable receiveToken = new ERC721ShipyardRedeemableMintable("", ""); receiveToken.setRedeemablesContracts(erc7498Tokens); ConsiderationItem[] memory consideration = new ConsiderationItem[](2); consideration[0] = _getCampaignConsiderationItem(address(context.erc7498Token)); consideration[1] = _getCampaignConsiderationItem(secondRedeemTokenAddress); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 1 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](1); OfferItem[] memory offer = new OfferItem[](1); offer[0] = defaultCampaignOffer[0].withToken(address(receiveToken)); requirements[0].offer = offer; @@ -107,10 +98,7 @@ contract ERC7498_MultiRedeem is BaseRedeemablesTest { function burnOneErc721OrErc1155RedeemMultiErc1155(RedeemablesContext memory context) public { _mintToken(address(context.erc7498Token), tokenId); - ERC1155ShipyardRedeemableMintable receiveToken = new ERC1155ShipyardRedeemableMintable( - "", - "" - ); + ERC1155ShipyardRedeemableMintable receiveToken = new ERC1155ShipyardRedeemableMintable("", ""); ERC721(address(context.erc7498Token)).setApprovalForAll(address(receiveToken), true); OfferItem[] memory offer = new OfferItem[](3); offer[0] = OfferItem({ @@ -136,9 +124,7 @@ contract ERC7498_MultiRedeem is BaseRedeemablesTest { }); ConsiderationItem[] memory consideration = new ConsiderationItem[](1); consideration[0] = _getCampaignConsiderationItem(address(context.erc7498Token)); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 1 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](1); requirements[0].offer = offer; requirements[0].consideration = consideration; CampaignParams memory params = CampaignParams({ diff --git a/test/ERC7498-Revert.t.sol b/test/ERC7498-Revert.t.sol index 023d4be..8c6906b 100644 --- a/test/ERC7498-Revert.t.sol +++ b/test/ERC7498-Revert.t.sol @@ -27,9 +27,7 @@ contract ERC7498_Revert is BaseRedeemablesTest { uint256 invalidTokenId = tokenId + 1; _mintToken(erc7498Tokens[0], invalidTokenId, dillon.addr); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 1 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](1); requirements[0] = CampaignRequirements({ offer: defaultCampaignOffer, consideration: defaultCampaignConsideration, @@ -71,10 +69,7 @@ contract ERC7498_Revert is BaseRedeemablesTest { function testRevertConsiderationLengthNotMet() public { _mintToken(erc7498Tokens[0], tokenId); - ERC721ShipyardRedeemableOwnerMintable secondRedeemToken = new ERC721ShipyardRedeemableOwnerMintable( - "", - "" - ); + ERC721ShipyardRedeemableOwnerMintable secondRedeemToken = new ERC721ShipyardRedeemableOwnerMintable("", ""); ConsiderationItem[] memory consideration = new ConsiderationItem[](2); consideration[0] = ConsiderationItem({ itemType: ItemType.ERC721_WITH_CRITERIA, @@ -92,9 +87,7 @@ contract ERC7498_Revert is BaseRedeemablesTest { endAmount: 1, recipient: payable(BURN_ADDRESS) }); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 1 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](1); requirements[0].offer = defaultCampaignOffer; requirements[0].consideration = consideration; CampaignParams memory params = CampaignParams({ @@ -153,9 +146,7 @@ contract ERC7498_Revert is BaseRedeemablesTest { endAmount: 0.1 ether, recipient: payable(dillon.addr) }); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 1 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](1); requirements[0].offer = offer; requirements[0].consideration = consideration; CampaignParams memory params = CampaignParams({ @@ -215,9 +206,7 @@ contract ERC7498_Revert is BaseRedeemablesTest { endAmount: 0.1 ether, recipient: payable(dillon.addr) }); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 1 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](1); requirements[0].offer = offer; requirements[0].consideration = consideration; CampaignParams memory params = CampaignParams({ @@ -255,9 +244,7 @@ contract ERC7498_Revert is BaseRedeemablesTest { uint256 considerationTokenId = 1; _mintToken(erc7498Tokens[0], tokenId); _mintToken(erc7498Tokens[0], considerationTokenId); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 1 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](1); ConsiderationItem[] memory consideration = new ConsiderationItem[](1); consideration[0] = defaultCampaignConsideration[0].withIdentifierOrCriteria(considerationTokenId); requirements[0] = CampaignRequirements({ @@ -300,9 +287,7 @@ contract ERC7498_Revert is BaseRedeemablesTest { uint256 considerationTokenId = 1; _mintToken(address(erc1155s[0]), tokenId); _mintToken(address(erc1155s[0]), considerationTokenId); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 1 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](1); ConsiderationItem[] memory consideration = new ConsiderationItem[](1); consideration[0] = defaultCampaignConsideration[0].withToken(address(erc1155s[0])).withItemType( ItemType.ERC1155 diff --git a/test/ERC7498-SimpleRedeem.t.sol b/test/ERC7498-SimpleRedeem.t.sol index 63ed102..8451511 100644 --- a/test/ERC7498-SimpleRedeem.t.sol +++ b/test/ERC7498-SimpleRedeem.t.sol @@ -34,9 +34,7 @@ contract ERC7498_SimpleRedeem is BaseRedeemablesTest { _mintToken(address(context.erc7498Token), tokenId); ConsiderationItem[] memory consideration = new ConsiderationItem[](1); consideration[0] = _getCampaignConsiderationItem(address(context.erc7498Token)); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 1 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](1); requirements[0] = CampaignRequirements({ offer: defaultCampaignOffer, consideration: consideration, @@ -118,9 +116,7 @@ contract ERC7498_SimpleRedeem is BaseRedeemablesTest { // Set consideration recipient to greg. address greg = makeAddr("greg"); consideration[0].recipient = payable(greg); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 1 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](1); requirements[0] = CampaignRequirements({ offer: defaultCampaignOffer, consideration: consideration, @@ -166,10 +162,8 @@ contract ERC7498_SimpleRedeem is BaseRedeemablesTest { } function burnErc721OrErc1155RedeemErc721WithSecondRequirementsIndex(RedeemablesContext memory context) public { - ERC721ShipyardRedeemableOwnerMintable firstRequirementRedeemToken = new ERC721ShipyardRedeemableOwnerMintable( - "", - "" - ); + ERC721ShipyardRedeemableOwnerMintable firstRequirementRedeemToken = + new ERC721ShipyardRedeemableOwnerMintable("", ""); vm.label(address(firstRequirementRedeemToken), "firstRequirementRedeemToken"); firstRequirementRedeemToken.setApprovalForAll(address(context.erc7498Token), true); @@ -187,9 +181,7 @@ contract ERC7498_SimpleRedeem is BaseRedeemablesTest { }); ConsiderationItem[] memory secondRequirementConsideration = new ConsiderationItem[](1); secondRequirementConsideration[0] = _getCampaignConsiderationItem(address(context.erc7498Token)); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 2 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](2); requirements[0] = CampaignRequirements({ offer: defaultCampaignOffer, consideration: firstRequirementConsideration, @@ -241,9 +233,7 @@ contract ERC7498_SimpleRedeem is BaseRedeemablesTest { function testBurnErc20RedeemErc721() public { erc20s[0].mint(address(this), 0.5 ether); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 1 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](1); ConsiderationItem[] memory consideration = new ConsiderationItem[](1); consideration[0] = defaultCampaignConsideration[0].withToken(address(erc20s[0])).withItemType(ItemType.ERC20) .withStartAmount(0.5 ether).withEndAmount(0.5 ether); @@ -284,9 +274,7 @@ contract ERC7498_SimpleRedeem is BaseRedeemablesTest { function testSendErc20RedeemErc721() public { erc20s[0].mint(address(this), 0.5 ether); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 1 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](1); ConsiderationItem[] memory consideration = new ConsiderationItem[](1); consideration[0] = defaultCampaignConsideration[0].withToken(address(erc20s[0])).withItemType(ItemType.ERC20) .withStartAmount(0.5 ether).withEndAmount(0.5 ether); @@ -329,9 +317,7 @@ contract ERC7498_SimpleRedeem is BaseRedeemablesTest { function testBurnErc721RedeemErc1155() public { _mintToken(address(erc7498Tokens[0]), tokenId); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 1 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](1); OfferItem[] memory offer = new OfferItem[](1); offer[0] = defaultCampaignOffer[0].withItemType(ItemType.ERC1155).withToken(address(receiveToken1155)); requirements[0] = CampaignRequirements({ diff --git a/test/ERC7498-TraitRedemption.t.sol b/test/ERC7498-TraitRedemption.t.sol index 36a1266..66b2ee4 100644 --- a/test/ERC7498-TraitRedemption.t.sol +++ b/test/ERC7498-TraitRedemption.t.sol @@ -66,10 +66,7 @@ contract ERC7498_TraitRedemption is BaseRedeemablesTest { function erc721TraitRedemptionSubstandardOneForErc721(RedeemablesContext memory context) public { address[] memory allowedTraitSetters = Solarray.addresses(address(context.erc7498Token)); - ERC721ShipyardRedeemableTraitSetters redeemToken = new ERC721ShipyardRedeemableTraitSetters( - "", - "" - ); + ERC721ShipyardRedeemableTraitSetters redeemToken = new ERC721ShipyardRedeemableTraitSetters("", ""); assertEq(redeemToken.getAllowedTraitSetters(), new address[](0)); redeemToken.setAllowedTraitSetters(allowedTraitSetters); assertEq(redeemToken.getAllowedTraitSetters(), allowedTraitSetters); @@ -84,9 +81,7 @@ contract ERC7498_TraitRedemption is BaseRedeemablesTest { traitValue: bytes32(uint256(1)), substandardValue: bytes32(uint256(0)) }); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 1 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](1); // consideration is empty ConsiderationItem[] memory consideration = new ConsiderationItem[](0); requirements[0] = CampaignRequirements({ @@ -157,10 +152,7 @@ contract ERC7498_TraitRedemption is BaseRedeemablesTest { function erc721TraitRedemptionSubstandardTwoForErc721(RedeemablesContext memory context) public { address[] memory allowedTraitSetters = Solarray.addresses(address(context.erc7498Token), address(this)); - ERC721ShipyardRedeemableTraitSetters redeemToken = new ERC721ShipyardRedeemableTraitSetters( - "", - "" - ); + ERC721ShipyardRedeemableTraitSetters redeemToken = new ERC721ShipyardRedeemableTraitSetters("", ""); redeemToken.setAllowedTraitSetters(allowedTraitSetters); _mintToken(address(redeemToken), tokenId); redeemToken.setTrait(tokenId, traitKey, bytes32(uint256(1))); @@ -174,9 +166,7 @@ contract ERC7498_TraitRedemption is BaseRedeemablesTest { traitValue: bytes32(uint256(1)), substandardValue: bytes32(uint256(1)) }); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 1 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](1); // consideration is empty ConsiderationItem[] memory consideration = new ConsiderationItem[](0); requirements[0] = CampaignRequirements({ @@ -237,10 +227,7 @@ contract ERC7498_TraitRedemption is BaseRedeemablesTest { function erc721TraitRedemptionSubstandardThreeForErc721(RedeemablesContext memory context) public { address[] memory allowedTraitSetters = Solarray.addresses(address(context.erc7498Token), address(this)); - ERC721ShipyardRedeemableTraitSetters redeemToken = new ERC721ShipyardRedeemableTraitSetters( - "", - "" - ); + ERC721ShipyardRedeemableTraitSetters redeemToken = new ERC721ShipyardRedeemableTraitSetters("", ""); redeemToken.setAllowedTraitSetters(allowedTraitSetters); _mintToken(address(redeemToken), tokenId); redeemToken.setTrait(tokenId, traitKey, bytes32(uint256(5))); @@ -254,9 +241,7 @@ contract ERC7498_TraitRedemption is BaseRedeemablesTest { traitValue: bytes32(uint256(1)), substandardValue: bytes32(uint256(5)) }); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 1 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](1); // consideration is empty ConsiderationItem[] memory consideration = new ConsiderationItem[](0); requirements[0] = CampaignRequirements({ @@ -317,10 +302,7 @@ contract ERC7498_TraitRedemption is BaseRedeemablesTest { function erc721TraitRedemptionSubstandardFourForErc721(RedeemablesContext memory context) public { address[] memory allowedTraitSetters = Solarray.addresses(address(context.erc7498Token), address(this)); - ERC721ShipyardRedeemableTraitSetters redeemToken = new ERC721ShipyardRedeemableTraitSetters( - "", - "" - ); + ERC721ShipyardRedeemableTraitSetters redeemToken = new ERC721ShipyardRedeemableTraitSetters("", ""); redeemToken.setAllowedTraitSetters(allowedTraitSetters); _mintToken(address(redeemToken), tokenId); redeemToken.setTrait(tokenId, traitKey, bytes32(uint256(4))); @@ -334,9 +316,7 @@ contract ERC7498_TraitRedemption is BaseRedeemablesTest { traitValue: bytes32(uint256(5)), substandardValue: bytes32(0) // unused in substandard 4 }); - CampaignRequirements[] memory requirements = new CampaignRequirements[]( - 1 - ); + CampaignRequirements[] memory requirements = new CampaignRequirements[](1); // consideration is empty ConsiderationItem[] memory consideration = new ConsiderationItem[](0); requirements[0] = CampaignRequirements({ diff --git a/test/utils/BaseRedeemablesTest.sol b/test/utils/BaseRedeemablesTest.sol index 908f92e..baced84 100644 --- a/test/utils/BaseRedeemablesTest.sol +++ b/test/utils/BaseRedeemablesTest.sol @@ -72,30 +72,12 @@ contract BaseRedeemablesTest is RedeemablesErrors, BaseOrderTest { function setUp() public virtual override { super.setUp(); - erc721ShipyardRedeemable = new ERC721ShipyardRedeemableOwnerMintable( - "", - "" - ); - erc721SeaDropRedeemable = new ERC721SeaDropRedeemableOwnerMintable( - address(1), - address(1), - "", - "" - ); - erc1155ShipyardRedeemable = new ERC1155ShipyardRedeemableOwnerMintable( - "", - "" - ); - erc1155SeaDropRedeemable = new ERC1155SeaDropRedeemableOwnerMintable( - address(1), - address(1), - "", - "" - ); - erc721ShipyardRedeemableWithoutInternalBurn = new ERC721ShipyardRedeemableOwnerMintableWithoutInternalBurn( - "", - "" - ); + erc721ShipyardRedeemable = new ERC721ShipyardRedeemableOwnerMintable("", ""); + erc721SeaDropRedeemable = new ERC721SeaDropRedeemableOwnerMintable(address(1), address(1), "", ""); + erc1155ShipyardRedeemable = new ERC1155ShipyardRedeemableOwnerMintable("", ""); + erc1155SeaDropRedeemable = new ERC1155SeaDropRedeemableOwnerMintable(address(1), address(1), "", ""); + erc721ShipyardRedeemableWithoutInternalBurn = + new ERC721ShipyardRedeemableOwnerMintableWithoutInternalBurn("", ""); // Not using internal burn needs approval for the contract itself to transfer tokens on users' behalf. erc721ShipyardRedeemableWithoutInternalBurn.setApprovalForAll( address(erc721ShipyardRedeemableWithoutInternalBurn), true