address comments

ProjectOpenSea · Oct 13, 2023 · 73aeed8 · 73aeed8
1 parent f979101
commit 73aeed8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/lib/ERC7498NFTRedeemables.sol b/src/lib/ERC7498NFTRedeemables.sol
@@ -190,6 +190,7 @@ contract ERC7498NFTRedeemables is IERC7498, RedeemablesErrors {
         ) {
             revert InvalidConsiderationTokenIdSupplied(c.token, id, c.identifierOrCriteria);
         }
+
         // If consideration item is this contract, recipient is burn address, and _useInternalBurn() fn returns true,
         // call the internal burn function and return.
         if (c.token == address(this) && c.recipient == payable(_BURN_ADDRESS) && _useInternalBurn()) {

diff --git a/test/ERC721ShipyardRedeemable.t.sol b/test/ERC721ShipyardRedeemable.t.sol
@@ -46,7 +46,7 @@ contract TestERC721ShipyardRedeemable is BaseRedeemablesTest {
         requirements[0] = CampaignRequirements({
             offer: defaultCampaignOffer,
             consideration: defaultCampaignConsideration,
-            traitRedemptions: new TraitRedemption[](0)
+            traitRedemptions: defaultTraitRedemptions
         });
 
         CampaignParams memory params = CampaignParams({
@@ -90,7 +90,7 @@ contract TestERC721ShipyardRedeemable is BaseRedeemablesTest {
         requirements[0] = CampaignRequirements({
             offer: defaultCampaignOffer,
             consideration: defaultCampaignConsideration,
-            traitRedemptions: new TraitRedemption[](0)
+            traitRedemptions: defaultTraitRedemptions
         });
 
         CampaignParams memory params = CampaignParams({
@@ -576,7 +576,7 @@ contract TestERC721ShipyardRedeemable is BaseRedeemablesTest {
         requirements[0] = CampaignRequirements({
             offer: defaultCampaignOffer,
             consideration: consideration,
-            traitRedemptions: new TraitRedemption[](0)
+            traitRedemptions: defaultTraitRedemptions
         });
 
         CampaignParams memory params = CampaignParams({
@@ -629,7 +629,7 @@ contract TestERC721ShipyardRedeemable is BaseRedeemablesTest {
         requirements[0] = CampaignRequirements({
             offer: defaultCampaignOffer,
             consideration: consideration,
-            traitRedemptions: new TraitRedemption[](0)
+            traitRedemptions: defaultTraitRedemptions
         });
 
         CampaignParams memory params = CampaignParams({

diff --git a/test/utils/BaseRedeemablesTest.sol b/test/utils/BaseRedeemablesTest.sol
@@ -22,6 +22,7 @@ contract BaseRedeemablesTest is RedeemablesErrors, BaseOrderTest {
 
     OfferItem[] defaultCampaignOffer;
     ConsiderationItem[] defaultCampaignConsideration;
+    TraitRedemption[] defaultTraitRedemptions;
     uint256[] defaultTraitRedemptionTokenIds = new uint256[](0);
 
     CampaignRequirements[] defaultCampaignRequirements;