Skip to content
This repository was archived by the owner on Aug 20, 2025. It is now read-only.

Commit 6860365

Browse files
committed
remove unused identifier field from TraitRedemption
1 parent 756761a commit 6860365

6 files changed

+1
-9
lines changed

script/DeployAndRedeemTrait.s.sol

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ contract DeployAndRedeemTrait is Script, Test {
6363
traitRedemptions[0] = TraitRedemption({
6464
substandard: 1,
6565
token: address(redeemToken),
66-
identifier: 0, // unused field
6766
traitKey: traitKey,
6867
traitValue: traitValue,
6968
substandardValue: substandardValue

src/lib/ERC7498NFTRedeemables.sol

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -458,9 +458,7 @@ contract ERC7498NFTRedeemables is IERC165, IERC7498, DynamicTraits, RedeemablesE
458458
uint256 newTraitValue = uint256(currentTraitValue) - uint256(traitValue);
459459

460460
// Decrement the trait by the trait value.
461-
IERC7496(token).setTrait(
462-
traitRedemptions[i].identifier, traitRedemptions[i].traitKey, bytes32(newTraitValue)
463-
);
461+
IERC7496(token).setTrait(identifier, traitRedemptions[i].traitKey, bytes32(newTraitValue));
464462
} else if (substandard == 4) {
465463
// Revert if the current trait value is not equal to the substandard value.
466464
if (currentTraitValue != substandardValue) {

src/lib/RedeemablesStructs.sol

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ struct CampaignRequirements {
2121
struct TraitRedemption {
2222
uint8 substandard;
2323
address token;
24-
uint256 identifier;
2524
bytes32 traitKey;
2625
bytes32 traitValue;
2726
bytes32 substandardValue;

test/ERC7498-DynamicTraits.t.sol

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ contract ERC7498_DynamicTraits is BaseRedeemablesTest {
7777
traitRedemptions[0] = TraitRedemption({
7878
substandard: 1,
7979
token: address(redeemToken),
80-
identifier: 0, // unused field
8180
traitKey: traitKey,
8281
traitValue: bytes32(uint256(1)),
8382
substandardValue: bytes32(uint256(0))

test/RedeemableContractOfferer-1155.t.sol.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,6 @@ contract TestRedeemableContractOfferer_1155 is BaseOrderTest, RedeemablesErrors
10711071
// TraitRedemption memory traitRedemption = TraitRedemption({
10721072
// substandard: 0, // set value to traitValue
10731073
// token: address(dynamicTraitsToken),
1074-
// identifier: redeemableTokenId0,
10751074
// traitKey: "isRedeemed",
10761075
// traitValue: bytes32(abi.encode(1)),
10771076
// substandardValue: bytes32(abi.encode(0))

test/RedeemableContractOfferer-721.t.sol.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,7 +1022,6 @@ contract TestRedeemableContractOfferer_721 is BaseOrderTest, RedeemablesErrors {
10221022
// traitRedemption: TraitRedemption({
10231023
// substandard: 0, // set value to traitValue
10241024
// token: address(dynamicTraitsToken),
1025-
// identifier: redeemableTokenId0,
10261025
// traitKey: "isRedeemed",
10271026
// traitValue: bytes32(abi.encode(1)),
10281027
// substandardValue: bytes32(abi.encode(0))
@@ -1036,7 +1035,6 @@ contract TestRedeemableContractOfferer_721 is BaseOrderTest, RedeemablesErrors {
10361035
TraitRedemption memory traitRedemption = TraitRedemption({
10371036
substandard: 0, // set value to traitValue
10381037
token: address(dynamicTraitsToken),
1039-
identifier: redeemableTokenId0,
10401038
traitKey: "isRedeemed",
10411039
traitValue: bytes32(abi.encode(1)),
10421040
substandardValue: bytes32(abi.encode(0))

0 commit comments

Comments
 (0)