@bananapus/721-hook-v6 0.0.41 → 0.0.43

package/test/unit/adjustTier_Unit.t.sol

@@ -1,1942 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-// forge-lint: disable-next-line(unaliased-plain-import)
-import "../utils/UnitTestSetup.sol";
-import {JB721TierConfigFlags} from "../../src/structs/JB721TierConfigFlags.sol";
-import {JB721TierFlags} from "../../src/structs/JB721TierFlags.sol";
-
-contract Test_adjustTier_Unit is UnitTestSetup {
-    using stdStorage for StdStorage;
-
-    function test_adjustTiers_removeTiersMultipleTimes(
-        uint256 initialNumberOfTiers,
-        uint256 numberOfTiersToAdd,
-        uint256 seed
-    )
-        public
-    {
-        // Include adding X new tiers with 0 current tiers.
-        initialNumberOfTiers = bound(initialNumberOfTiers, 0, 10);
-
-        numberOfTiersToAdd = bound(numberOfTiersToAdd, 4, 14);
-        uint16[] memory pricesForTiersToAdd = _createArray(numberOfTiersToAdd, seed);
-
-        // Sort tiers in ascending order.
-        pricesForTiersToAdd = _sortArray(pricesForTiersToAdd);
-
-        // Initialize the hook with default tiers.
-        JB721TiersHook hook = _initHookDefaultTiers(initialNumberOfTiers);
-
-        // Create the configs for the new tiers to add.
-        (JB721TierConfig[] memory tierConfigs,) =
-            _createTiers(defaultTierConfig, numberOfTiersToAdd, initialNumberOfTiers, pricesForTiersToAdd);
-
-        // Remove 2 tiers and add the new ones. `_addDeleteTiers` calls `adjustTiers`.
-        uint256 tiersLeft = initialNumberOfTiers;
-        tiersLeft = _addDeleteTiers(hook, tiersLeft, 2, tierConfigs);
-
-        // Remove another 2 tiers but don't add any new ones.
-        _addDeleteTiers(hook, tiersLeft, 2, new JB721TierConfig[](0));
-
-        // Fecth a maximum of 100 tiers (will downsize).
-        JB721Tier[] memory storedTiers = hook.STORE().tiersOf(address(hook), new uint256[](0), false, 0, 100);
-        // If the tiers have same category, then the the tiers added last will have a lower index in the array.
-        // Otherwise, the tiers would be sorted by categories.
-        for (uint256 i = 1; i < storedTiers.length; i++) {
-            if (storedTiers[i - 1].category == storedTiers[i].category) {
-                assertGt(storedTiers[i - 1].id, storedTiers[i].id, "Sorting error (if same category).");
-            } else {
-                assertLt(storedTiers[i - 1].category, storedTiers[i].category, "Sorting error (if different category).");
-            }
-        }
-    }
-
-    function test_tiersOf_recentlyAddedTiersFetchedFirstWhenSortedAfterTiersCleaned(
-        uint256 initialNumberOfTiers,
-        uint256 numberOfTiersToAdd,
-        uint256 seed
-    )
-        public
-    {
-        initialNumberOfTiers = bound(initialNumberOfTiers, 3, 14);
-        numberOfTiersToAdd = bound(numberOfTiersToAdd, 1, 15);
-        uint16[] memory pricesForTiersToAdd = _createArray(numberOfTiersToAdd, seed);
-
-        // Sort tiers in ascending order.
-        pricesForTiersToAdd = _sortArray(pricesForTiersToAdd);
-
-        JB721TiersHook hook = _initHookDefaultTiers(initialNumberOfTiers);
-
-        // Create the new tiers to add.
-        uint256 currentNumberOfTiers = initialNumberOfTiers;
-
-        (JB721TierConfig[] memory tierConfigsToAdd,) =
-            _createTiers(defaultTierConfig, numberOfTiersToAdd, initialNumberOfTiers, pricesForTiersToAdd);
-
-        currentNumberOfTiers = _addDeleteTiers(hook, currentNumberOfTiers, 0, tierConfigsToAdd);
-        currentNumberOfTiers = _addDeleteTiers(hook, currentNumberOfTiers, 2, tierConfigsToAdd);
-
-        JB721Tier[] memory storedTiers = hook.STORE().tiersOf(address(hook), new uint256[](0), false, 0, 100);
-
-        assertEq(storedTiers.length, currentNumberOfTiers, "Length mismatch.");
-        // If the tiers have same category, then the tiers added last will have a lower index in the array.
-        // Otherwise, the tiers would be sorted by categories.
-        for (uint256 i = 1; i < storedTiers.length; i++) {
-            if (storedTiers[i - 1].category == storedTiers[i].category) {
-                assertGt(storedTiers[i - 1].id, storedTiers[i].id, "Sorting error (if same category).");
-            } else {
-                assertLt(storedTiers[i - 1].category, storedTiers[i].category, "Sorting error (if different category).");
-            }
-        }
-    }
-
-    function test_tiersOf_recentlyAddedTiersFetchedFirstWhenSorted(
-        uint256 initialNumberOfTiers,
-        uint256 numberOfTiersToAdd,
-        uint256 seed
-    )
-        public
-    {
-        // Include adding X new tiers with 0 current tiers.
-        initialNumberOfTiers = bound(initialNumberOfTiers, 0, 10);
-
-        numberOfTiersToAdd = bound(numberOfTiersToAdd, 4, 14);
-        uint16[] memory pricesForTiersToAdd = _createArray(numberOfTiersToAdd, seed);
-
-        // Sort tiers in ascending order.
-        pricesForTiersToAdd = _sortArray(pricesForTiersToAdd);
-
-        // Initialize the hook with default tiers.
-        JB721TiersHook hook = _initHookDefaultTiers(initialNumberOfTiers);
-
-        // Create the new tiers to add.
-        (JB721TierConfig[] memory tierConfigs,) =
-            _createTiers(defaultTierConfig, numberOfTiersToAdd, initialNumberOfTiers, pricesForTiersToAdd);
-
-        // Add the new tiers.
-        uint256 tiersLeft = initialNumberOfTiers;
-
-        tiersLeft = _addDeleteTiers(hook, tiersLeft, 0, tierConfigs);
-
-        JB721Tier[] memory storedTiers = hook.STORE().tiersOf(address(hook), new uint256[](0), false, 0, 100);
-        // If the tiers have same category, then the tiers added last will have a lower index in the array.
-        // Otherwise, the tiers would be sorted by categories.
-        for (uint256 i = 1; i < storedTiers.length; i++) {
-            if (storedTiers[i - 1].category == storedTiers[i].category) {
-                assertGt(storedTiers[i - 1].id, storedTiers[i].id, "Sorting error (if same category).");
-            } else {
-                assertLt(storedTiers[i - 1].category, storedTiers[i].category, "Sorting error (if different category).");
-            }
-        }
-    }
-
-    function test_adjustTiers_addNewTiersWithNonSequentialCategories(
-        uint256 initialNumberOfTiers,
-        uint256 numberOfTiersToAdd,
-        uint256 seed
-    )
-        public
-    {
-        initialNumberOfTiers = bound(initialNumberOfTiers, 2, 10);
-
-        numberOfTiersToAdd = bound(numberOfTiersToAdd, 4, 14);
-        uint16[] memory pricesForTiersToAdd = _createArray(numberOfTiersToAdd, seed);
-
-        // Sort tiers in ascending order.
-        pricesForTiersToAdd = _sortArray(pricesForTiersToAdd);
-
-        // Initialize the hook with default tiers.
-        JB721TiersHook hook = _initHookDefaultTiers(initialNumberOfTiers);
-
-        JB721Tier[] memory defaultStoredTiers = hook.STORE().tiersOf(address(hook), new uint256[](0), false, 0, 100);
-
-        // Create the new tiers to add.
-        (JB721TierConfig[] memory tierConfigsToAdd, JB721Tier[] memory tiersToAdd) =
-            _createTiers(defaultTierConfig, numberOfTiersToAdd, initialNumberOfTiers, pricesForTiersToAdd, 2);
-
-        // Add the new tiers.
-        uint256 tiersLeft = initialNumberOfTiers;
-
-        tiersLeft = _addDeleteTiers(hook, tiersLeft, 0, tierConfigsToAdd);
-
-        JB721Tier[] memory storedTiers = hook.STORE().tiersOf(address(hook), new uint256[](0), false, 0, 100);
-
-        // Check: was the expected number of tiers returned?
-        assertEq(storedTiers.length, tiersLeft, "Length mismatch.");
-
-        // Check: are all tiers in the new tiers (unsorted)?
-        assertTrue(_isIn(defaultStoredTiers, storedTiers), "Original tiers not stored."); // Original tiers
-        assertTrue(_isIn(tiersToAdd, storedTiers), "Added tiers not stored."); // New tiers
-
-        // Check: are all the tiers sorted?
-        for (uint256 i = 1; i < storedTiers.length; i++) {
-            assertLt(storedTiers[i - 1].category, storedTiers[i].category, "Sorting error.");
-        }
-    }
-
-    function test_adjustTiers_addNewTiers(
-        uint256 initialNumberOfTiers,
-        uint256 numberOfTiersToAdd,
-        uint256 seed
-    )
-        public
-    {
-        // Include adding X new tiers with 0 current tiers.
-        initialNumberOfTiers = bound(initialNumberOfTiers, 0, 10);
-
-        numberOfTiersToAdd = bound(numberOfTiersToAdd, 4, 14);
-        uint16[] memory pricesForTiersToAdd = _createArray(numberOfTiersToAdd, seed);
-
-        // Sort tiers in ascending order.
-        pricesForTiersToAdd = _sortArray(pricesForTiersToAdd);
-
-        // Initialize the hook with default tiers.
-        JB721TiersHook hook = _initHookDefaultTiers(initialNumberOfTiers);
-
-        JB721Tier[] memory intialTiers = hook.STORE().tiersOf(address(hook), new uint256[](0), false, 0, 100);
-
-        // Create the new tiers to add.
-        (JB721TierConfig[] memory tierConfigs, JB721Tier[] memory tiersAdded) =
-            _createTiers(defaultTierConfig, numberOfTiersToAdd, initialNumberOfTiers, pricesForTiersToAdd);
-
-        // Add the new tiers.
-        uint256 tiersLeft = initialNumberOfTiers;
-
-        _addDeleteTiers(hook, tiersLeft, 0, tierConfigs);
-
-        JB721Tier[] memory storedTiers = hook.STORE().tiersOf(address(hook), new uint256[](0), false, 0, 100);
-
-        // Check: was the expected number of tiers returned?
-        assertEq(storedTiers.length, intialTiers.length + tiersAdded.length, "Length mismatch.");
-
-        // Check: are all tiers in the new tiers (unsorted)?
-        assertTrue(_isIn(intialTiers, storedTiers), "original tiers not found"); // Original tiers
-        assertTrue(_isIn(tiersAdded, storedTiers), "new tiers not found"); // New tiers
-
-        // Check: are all the tiers sorted?
-        for (uint256 i = 1; i < storedTiers.length; i++) {
-            assertLe(storedTiers[i - 1].category, storedTiers[i].category, "Sorting error");
-        }
-    }
-
-    function test_adjustTiers_withSameCategoryMultipleTimes(
-        uint256 initialNumberOfTiers,
-        uint256 numberOfTiersToAdd,
-        uint256 seed
-    )
-        public
-    {
-        initialNumberOfTiers = bound(initialNumberOfTiers, 2, 10);
-        numberOfTiersToAdd = bound(numberOfTiersToAdd, 4, 14);
-
-        uint16[] memory pricesForTiersToAdd = _createArray(numberOfTiersToAdd, seed);
-
-        // Sort tiers in ascending order.
-        pricesForTiersToAdd = _sortArray(pricesForTiersToAdd);
-
-        // Initialize the hook with default tiers of a given category.
-        defaultTierConfig.category = 100;
-        JB721TiersHook hook = _initHookDefaultTiers(initialNumberOfTiers);
-
-        // Create new tiers to add with a new category.
-        defaultTierConfig.category = 101;
-        (JB721TierConfig[] memory tierConfigsToAdd, JB721Tier[] memory tiersToAdd) =
-            _createTiers(defaultTierConfig, numberOfTiersToAdd, initialNumberOfTiers, pricesForTiersToAdd);
-
-        // Add the new tiers.
-        _addDeleteTiers(hook, 0, 0, tierConfigsToAdd);
-
-        (tierConfigsToAdd, tiersToAdd) = _createTiers(defaultTierConfig, numberOfTiersToAdd);
-
-        _addDeleteTiers(hook, 0, 0, tierConfigsToAdd);
-
-        // Check: are all tiers stored?
-        JB721Tier[] memory storedTiers = hook.STORE().tiersOf(address(hook), new uint256[](0), false, 0, 100);
-        assertEq(storedTiers.length, initialNumberOfTiers + pricesForTiersToAdd.length * 2);
-
-        // Check: are all tiers in the new tiers (unsorted)?
-        uint256[] memory categories = new uint256[](1);
-        categories[0] = 101;
-
-        JB721Tier[] memory stored101Tiers =
-            hook.STORE().tiersOf(address(hook), categories, false, 0, pricesForTiersToAdd.length * 2);
-
-        assertEq(stored101Tiers.length, pricesForTiersToAdd.length * 2);
-
-        // Check: are all the tiers in the initial tiers?
-        categories[0] = 100;
-        JB721Tier[] memory stored100Tiers = hook.STORE().tiersOf(address(hook), categories, false, 0, 100);
-        assertEq(stored100Tiers.length, initialNumberOfTiers);
-
-        // Check: are the tiers sorted correctly?
-        for (uint256 i; i < pricesForTiersToAdd.length; i++) {
-            assertGt(stored101Tiers[i].id, stored101Tiers[i + pricesForTiersToAdd.length].id);
-        }
-    }
-
-    function test_adjustTiers_withDifferentCategories(
-        uint256 initialNumberOfTiers,
-        uint256 numberOfTiersToAdd,
-        uint256 seed
-    )
-        public
-    {
-        // Include adding X new tiers with 0 current tiers.
-        initialNumberOfTiers = bound(initialNumberOfTiers, 1, 10);
-
-        numberOfTiersToAdd = bound(numberOfTiersToAdd, 1, 10);
-        uint16[] memory pricesForTiersToAdd = _createArray(numberOfTiersToAdd, seed);
-
-        // Sort tiers in ascending order.
-        pricesForTiersToAdd = _sortArray(pricesForTiersToAdd);
-
-        // Initialize the hook with default tiers.
-        defaultTierConfig.category = 100;
-        JB721TiersHook hook = _initHookDefaultTiers(initialNumberOfTiers);
-
-        // Create new tiers to add.
-        defaultTierConfig.category = 101;
-        (JB721TierConfig[] memory tierConfigs, JB721Tier[] memory tiersAdded) =
-            _createTiers(defaultTierConfig, numberOfTiersToAdd, initialNumberOfTiers, pricesForTiersToAdd);
-
-        // Add the new tiers.
-        uint256 tiersLeft = initialNumberOfTiers;
-
-        tiersLeft = _addDeleteTiers(hook, tiersLeft, 0, tierConfigs);
-
-        defaultTierConfig.category = 102;
-        (tierConfigs, tiersAdded) =
-            _createTiers(defaultTierConfig, numberOfTiersToAdd, initialNumberOfTiers, pricesForTiersToAdd);
-
-        // Add the new tiers.
-        tiersLeft = _addDeleteTiers(hook, tiersLeft, 0, tierConfigs);
-
-        JB721Tier[] memory allStoredTiers = hook.STORE().tiersOf(address(hook), new uint256[](0), false, 0, 100);
-
-        uint256[] memory categories = new uint256[](1);
-        categories[0] = 102;
-        JB721Tier[] memory stored102Tiers = hook.STORE().tiersOf(address(hook), categories, false, 0, 100);
-
-        // Check: does the number of stored 102 tiers match the number of tiers that were added?
-        assertEq(stored102Tiers.length, pricesForTiersToAdd.length);
-
-        // Ensure that each stored 102 tier has category `102`.
-        for (uint256 i = 0; i < stored102Tiers.length; i++) {
-            assertEq(stored102Tiers[i].category, uint8(102));
-        }
-
-        categories[0] = 101;
-
-        JB721Tier[] memory stored101Tiers = hook.STORE().tiersOf(address(hook), categories, false, 0, 100);
-
-        // Check: does the number of stored 101 tiers match the number of tiers that were added?
-        assertEq(stored101Tiers.length, pricesForTiersToAdd.length);
-
-        // Check: does each stored 101 tier have category `101`?
-        for (uint256 i = 0; i < stored101Tiers.length; i++) {
-            assertEq(stored101Tiers[i].category, uint8(101));
-        }
-
-        // Ensure that the tiers are sorted.
-        for (uint256 i = 1; i < initialNumberOfTiers + pricesForTiersToAdd.length * 2; i++) {
-            assertGt(allStoredTiers[i].id, allStoredTiers[i - 1].id);
-            assertLe(allStoredTiers[i - 1].category, allStoredTiers[i].category);
-        }
-    }
-
-    function test_adjustTiers_withZeroCategory(
-        uint256 initialNumberOfTiers,
-        uint256 numberOfTiersToAdd,
-        uint256 seed
-    )
-        public
-    {
-        initialNumberOfTiers = bound(initialNumberOfTiers, 2, 10);
-
-        numberOfTiersToAdd = bound(numberOfTiersToAdd, 4, 14);
-        uint16[] memory pricesForTiersToAdd = _createArray(numberOfTiersToAdd, seed);
-
-        // Sort tiers in ascending order.
-        pricesForTiersToAdd = _sortArray(pricesForTiersToAdd);
-
-        // Use category 0 for the default tiers.
-        defaultTierConfig.category = 0;
-
-        // Initialize the hook with default tiers.
-        JB721TiersHook hook = _initHookDefaultTiers(initialNumberOfTiers);
-
-        // Create new tiers to add.
-        defaultTierConfig.category = 5;
-        (JB721TierConfig[] memory tierConfigsToAdd,) =
-            _createTiers(defaultTierConfig, numberOfTiersToAdd, initialNumberOfTiers, pricesForTiersToAdd, 2);
-
-        // Add the new tiers.
-        uint256 tiersLeft = initialNumberOfTiers;
-        tiersLeft = _addDeleteTiers(hook, tiersLeft, 0, tierConfigsToAdd);
-
-        // Get all stored tiers (category 0 gets all).
-        uint256[] memory categories = new uint256[](1);
-        categories[0] = 0;
-        JB721Tier[] memory allStoredTiers = hook.STORE().tiersOf(address(hook), categories, false, 0, 100);
-
-        // Check: does the number of stored tiers match the number of tiers that were added?
-        assertEq(allStoredTiers.length, initialNumberOfTiers);
-        // Check: does each stored tier have category `0`?
-        for (uint256 i = 0; i < allStoredTiers.length; i++) {
-            assertEq(allStoredTiers[i].category, uint8(0));
-        }
-    }
-
-    function test_adjustTiers_withDifferentCategoriesAndFetchedTogether(
-        uint256 initialNumberOfTiers,
-        uint256 numberOfTiersToAdd,
-        uint256 seed
-    )
-        public
-    {
-        initialNumberOfTiers = bound(initialNumberOfTiers, 1, 14);
-
-        numberOfTiersToAdd = bound(numberOfTiersToAdd, 1, 14);
-        uint16[] memory pricesForTiersToAdd = _createArray(numberOfTiersToAdd, seed);
-
-        // Sort tiers in ascending order.
-        pricesForTiersToAdd = _sortArray(pricesForTiersToAdd);
-
-        // Initialize the hook with default tiers of category 100.
-        defaultTierConfig.category = 100;
-        JB721TiersHook hook = _initHookDefaultTiers(initialNumberOfTiers);
-
-        // Create new tiers to add (with category 101).
-        defaultTierConfig.category = 101;
-        (JB721TierConfig[] memory tierConfigsToAdd,) =
-            _createTiers(defaultTierConfig, numberOfTiersToAdd, initialNumberOfTiers, pricesForTiersToAdd);
-
-        // Add the 101 tiers.
-        uint256 tiersLeft = initialNumberOfTiers;
-        tiersLeft = _addDeleteTiers(hook, tiersLeft, 0, tierConfigsToAdd);
-
-        // Create new tiers to add (with category 102).
-        defaultTierConfig.category = 102;
-        (tierConfigsToAdd,) =
-            _createTiers(defaultTierConfig, numberOfTiersToAdd, initialNumberOfTiers, pricesForTiersToAdd);
-
-        // Add the 102 tiers.
-        tiersLeft = _addDeleteTiers(hook, tiersLeft, 0, tierConfigsToAdd);
-
-        // Get the stored tiers with categories 100-102.
-        uint256[] memory categories = new uint256[](3);
-        categories[0] = 102;
-        categories[1] = 100;
-        categories[2] = 101;
-        JB721Tier[] memory allStoredTiers = hook.STORE().tiersOf(address(hook), categories, false, 0, 100);
-
-        // Check: are the correct number of tiers stored?
-        assertEq(
-            allStoredTiers.length, initialNumberOfTiers + pricesForTiersToAdd.length * 2, "Wrong total number of tiers."
-        );
-
-        uint256 maxIndexForTier100 = allStoredTiers.length - pricesForTiersToAdd.length;
-
-        // Check: do the tiers have the correct categories?
-        for (uint256 i = 0; i < pricesForTiersToAdd.length; i++) {
-            assertEq(allStoredTiers[i].category, uint8(102), "Wrong, first category (102).");
-        }
-
-        for (uint256 i = pricesForTiersToAdd.length; i < maxIndexForTier100; i++) {
-            assertEq(allStoredTiers[i].category, uint8(100), "Wrong, second category (100).");
-        }
-
-        for (uint256 i = maxIndexForTier100; i < allStoredTiers.length; i++) {
-            assertEq(allStoredTiers[i].category, uint8(101), "Wrong, third category (101).");
-        }
-    }
-
-    function test_adjustTiers_addNewTiers_fetchSpecificTier(
-        uint256 initialNumberOfTiers,
-        uint256 numberOfTiersToAdd,
-        uint256 seed
-    )
-        public
-    {
-        initialNumberOfTiers = bound(initialNumberOfTiers, 1, 14);
-
-        numberOfTiersToAdd = bound(numberOfTiersToAdd, 1, 14);
-        uint16[] memory pricesForTiersToAdd = _createArray(numberOfTiersToAdd, seed);
-
-        // Sort tiers in ascending order.
-        pricesForTiersToAdd = _sortArray(pricesForTiersToAdd);
-
-        // Initialize hook with default tiers from category 100.
-        defaultTierConfig.category = 100;
-        JB721TiersHook hook = _initHookDefaultTiers(initialNumberOfTiers);
-
-        // Create new tiers to add (with category 101).
-        defaultTierConfig.category = 101;
-        (JB721TierConfig[] memory tierConfigsToAdd,) =
-            _createTiers(defaultTierConfig, numberOfTiersToAdd, initialNumberOfTiers, pricesForTiersToAdd);
-
-        // Add the new tiers
-        uint256 tiersLeft = initialNumberOfTiers;
-        tiersLeft = _addDeleteTiers(hook, tiersLeft, 0, tierConfigsToAdd);
-
-        // Get the tiers from category 101.
-        uint256[] memory categories = new uint256[](1);
-        categories[0] = 101;
-        JB721Tier[] memory storedTiers = hook.STORE()
-            .tiersOf(address(hook), categories, false, 0, initialNumberOfTiers + pricesForTiersToAdd.length);
-
-        // Check: does the number of stored tiers match the number of tiers that were added?
-        assertEq(storedTiers.length, pricesForTiersToAdd.length);
-
-        // Check: do the tiers have category 101?
-        for (uint256 i = 0; i < storedTiers.length; i++) {
-            assertEq(storedTiers[i].category, uint8(101));
-        }
-    }
-
-    function test_adjustTiers_removeTiers(
-        uint256 initialNumberOfTiers,
-        uint256 seed,
-        uint256 numberOfTiersToRemove
-    )
-        public
-    {
-        initialNumberOfTiers = bound(initialNumberOfTiers, 0, 14);
-        numberOfTiersToRemove = bound(numberOfTiersToRemove, 0, initialNumberOfTiers);
-
-        // Create random tiers to remove.
-        uint256[] memory tiersToRemove = new uint256[](numberOfTiersToRemove);
-
-        // Use the `seed` to generate new random tiers, and iterate on `i` to fill the `tiersToRemove` array.
-        for (uint256 i; i < numberOfTiersToRemove;) {
-            uint256 newTierCandidate = uint256(keccak256(abi.encode(seed))) % initialNumberOfTiers + 1;
-            bool invalidTier;
-            if (newTierCandidate != 0) {
-                for (uint256 j; j < numberOfTiersToRemove; j++) {
-                    // Same value twice?
-                    if (newTierCandidate == tiersToRemove[j]) {
-                        invalidTier = true;
-                        break;
-                    }
-                }
-                if (!invalidTier) {
-                    tiersToRemove[i] = newTierCandidate;
-                    i++;
-                }
-            }
-            // Overflow to loop over (seed is fuzzed, and could start at `max(uint256)`).
-            unchecked {
-                seed++;
-            }
-        }
-
-        // Order the tiers to remove for event matching (which are ordered too).
-        tiersToRemove = _sortArray(tiersToRemove);
-        JB721TierConfig[] memory tierConfigs = new JB721TierConfig[](initialNumberOfTiers);
-        JB721Tier[] memory tiers = new JB721Tier[](initialNumberOfTiers);
-
-        for (uint256 i; i < initialNumberOfTiers; i++) {
-            tierConfigs[i] = JB721TierConfig({
-                price: uint104((i + 1) * 10),
-                initialSupply: uint32(100),
-                votingUnits: uint16(0),
-                // forge-lint: disable-next-line(unsafe-typecast)
-                reserveFrequency: uint16(i),
-                reserveBeneficiary: reserveBeneficiary,
-                encodedIPFSUri: tokenUris[0],
-                category: uint24(100),
-                discountPercent: uint8(0),
-                flags: JB721TierConfigFlags({
-                    allowOwnerMint: false,
-                    useReserveBeneficiaryAsDefault: false,
-                    transfersPausable: false,
-                    useVotingUnits: true,
-                    cantBeRemoved: false,
-                    cantIncreaseDiscountPercent: false,
-                    cantBuyWithCredits: false
-                }),
-                splitPercent: 0,
-                splits: new JBSplit[](0)
-            });
-            tiers[i] = JB721Tier({
-                // forge-lint: disable-next-line(unsafe-typecast)
-                id: uint32(i + 1),
-                price: tierConfigs[i].price,
-                remainingSupply: tierConfigs[i].initialSupply,
-                initialSupply: tierConfigs[i].initialSupply,
-                votingUnits: tierConfigs[i].votingUnits,
-                reserveFrequency: tierConfigs[i].reserveFrequency,
-                reserveBeneficiary: i == 0 ? address(0) : tierConfigs[i].reserveBeneficiary,
-                encodedIPFSUri: tierConfigs[i].encodedIPFSUri,
-                category: tierConfigs[i].category,
-                discountPercent: tierConfigs[i].discountPercent,
-                flags: JB721TierFlags({
-                    allowOwnerMint: tierConfigs[i].flags.allowOwnerMint,
-                    transfersPausable: tierConfigs[i].flags.transfersPausable,
-                    cantBeRemoved: tierConfigs[i].flags.cantBeRemoved,
-                    cantIncreaseDiscountPercent: tierConfigs[i].flags.cantIncreaseDiscountPercent,
-                    cantBuyWithCredits: tierConfigs[i].flags.cantBuyWithCredits
-                }),
-                splitPercent: 0,
-                resolvedUri: ""
-            });
-        }
-        ForTest_JB721TiersHookStore store = new ForTest_JB721TiersHookStore();
-        ForTest_JB721TiersHook hook = new ForTest_JB721TiersHook(
-            ForTest_JB721TiersHook.ForTestInitConfig({
-                projectId: projectId,
-                name: name,
-                symbol: symbol,
-                baseUri: baseUri,
-                tokenUriResolver: IJB721TokenUriResolver(mockTokenUriResolver),
-                contractUri: contractUri,
-                tiers: tierConfigs,
-                flags: JB721TiersHookFlags({
-                    preventOverspending: false,
-                    issueTokensForSplits: false,
-                    noNewTiersWithReserves: false,
-                    noNewTiersWithVotes: false,
-                    noNewTiersWithOwnerMinting: true
-                })
-            }),
-            IJBDirectory(mockJBDirectory),
-            IJBPrices(mockJBPrices),
-            IJBRulesets(mockJBRulesets),
-            IJB721TiersHookStore(address(store)),
-            IJBSplits(mockJBSplits)
-        );
-        hook.transferOwnership(owner);
-
-        // Will be resized later.
-        JB721TierConfig[] memory tierConfigsRemaining = new JB721TierConfig[](initialNumberOfTiers);
-        JB721Tier[] memory tiersRemaining = new JB721Tier[](initialNumberOfTiers);
-        for (uint256 i; i < tiers.length; i++) {
-            tierConfigsRemaining[i] = tierConfigs[i];
-            tiersRemaining[i] = tiers[i];
-        }
-
-        // Iterate through the remaining tiers and remove the ones in `tiersToRemove`.
-        // Do this by "swapping" the tier to remove with the last element in the array, and then "popping" that last
-        // element.
-        for (uint256 i; i < tiersRemaining.length;) {
-            bool swappedAndPopped;
-            for (uint256 j; j < tiersToRemove.length; j++) {
-                if (tiersRemaining[i].id == tiersToRemove[j]) {
-                    // Swap and pop removed tiers.
-                    tiersRemaining[i] = tiersRemaining[tiersRemaining.length - 1];
-                    tierConfigsRemaining[i] = tierConfigsRemaining[tierConfigsRemaining.length - 1];
-                    // Remove the last elelment / reduce array length by 1.
-                    assembly ("memory-safe") {
-                        mstore(tiersRemaining, sub(mload(tiersRemaining), 1))
-                        mstore(tierConfigsRemaining, sub(mload(tierConfigsRemaining), 1))
-                    }
-                    swappedAndPopped = true;
-                    break;
-                }
-            }
-            if (!swappedAndPopped) i++;
-        }
-
-        // Check: was `RemoveTier` emitted with the correct values?
-        for (uint256 i; i < tiersToRemove.length; i++) {
-            vm.expectEmit(true, false, false, true, address(hook));
-            emit RemoveTier(tiersToRemove[i], owner);
-        }
-        vm.prank(owner);
-        hook.adjustTiers(new JB721TierConfig[](0), tiersToRemove);
-        {
-            uint256 finalNumberOfTiers = initialNumberOfTiers - tiersToRemove.length;
-            JB721Tier[] memory storedTiers =
-                hook.test_store().tiersOf(address(hook), new uint256[](0), false, 0, finalNumberOfTiers);
-            // Check: are the expected number of tiers stored?
-            assertEq(storedTiers.length, finalNumberOfTiers);
-            // Check: are all of the remaining tiers still stored?
-            assertTrue(_isIn(tiersRemaining, storedTiers));
-            // Check: have all the removed tiers tiers been removed from storage?
-            assertTrue(_isIn(storedTiers, tiersRemaining));
-        }
-    }
-
-    function test_adjustTiers_addAndRemoveTiers() public {
-        uint256 initialNumberOfTiers = 5;
-        uint256 numberOfTiersToAdd = 5;
-        uint256 numberOfTiersToRemove = 3;
-        uint256[] memory tiersToAdd = new uint256[](numberOfTiersToAdd);
-        tiersToAdd[0] = 1;
-        tiersToAdd[1] = 4;
-        tiersToAdd[2] = 5;
-        tiersToAdd[3] = 6;
-        tiersToAdd[4] = 10;
-        uint256[] memory tierIdsToRemove = new uint256[](numberOfTiersToRemove);
-        tierIdsToRemove[0] = 1;
-        tierIdsToRemove[1] = 3;
-        tierIdsToRemove[2] = 4;
-        // Initial tiers configs and data.
-        JB721TierConfig[] memory tierConfigs = new JB721TierConfig[](initialNumberOfTiers);
-        JB721Tier[] memory tiers = new JB721Tier[](initialNumberOfTiers);
-        for (uint256 i; i < initialNumberOfTiers; i++) {
-            tierConfigs[i] = JB721TierConfig({
-                price: uint104((i + 1) * 10),
-                initialSupply: uint32(100),
-                votingUnits: uint16(0),
-                // forge-lint: disable-next-line(unsafe-typecast)
-                reserveFrequency: uint16(i),
-                reserveBeneficiary: reserveBeneficiary,
-                encodedIPFSUri: tokenUris[0],
-                category: uint24(100),
-                discountPercent: uint8(0),
-                flags: JB721TierConfigFlags({
-                    allowOwnerMint: false,
-                    useReserveBeneficiaryAsDefault: false,
-                    transfersPausable: false,
-                    useVotingUnits: true,
-                    cantBeRemoved: false,
-                    cantIncreaseDiscountPercent: false,
-                    cantBuyWithCredits: false
-                }),
-                splitPercent: 0,
-                splits: new JBSplit[](0)
-            });
-            tiers[i] = JB721Tier({
-                // forge-lint: disable-next-line(unsafe-typecast)
-                id: uint32(i + 1),
-                price: tierConfigs[i].price,
-                remainingSupply: tierConfigs[i].initialSupply,
-                initialSupply: tierConfigs[i].initialSupply,
-                votingUnits: tierConfigs[i].votingUnits,
-                reserveFrequency: tierConfigs[i].reserveFrequency,
-                reserveBeneficiary: i == 0 ? address(0) : tierConfigs[i].reserveBeneficiary,
-                encodedIPFSUri: tierConfigs[i].encodedIPFSUri,
-                category: tierConfigs[i].category,
-                discountPercent: tierConfigs[i].discountPercent,
-                flags: JB721TierFlags({
-                    allowOwnerMint: tierConfigs[i].flags.allowOwnerMint,
-                    transfersPausable: tierConfigs[i].flags.transfersPausable,
-                    cantBeRemoved: tierConfigs[i].flags.cantBeRemoved,
-                    cantIncreaseDiscountPercent: tierConfigs[i].flags.cantIncreaseDiscountPercent,
-                    cantBuyWithCredits: tierConfigs[i].flags.cantBuyWithCredits
-                }),
-                splitPercent: 0,
-                resolvedUri: ""
-            });
-        }
-        //  Deploy the hook and its store with the initial tiers.
-        vm.etch(hook_i, address(hook).code);
-        JB721TiersHook hook = JB721TiersHook(hook_i);
-        hook.initialize(
-            projectId,
-            name,
-            symbol,
-            baseUri,
-            IJB721TokenUriResolver(mockTokenUriResolver),
-            contractUri,
-            JB721InitTiersConfig({
-                tiers: tierConfigs, currency: uint32(uint160(JBConstants.NATIVE_TOKEN)), decimals: 18
-            }),
-            JB721TiersHookFlags({
-                    preventOverspending: false,
-                    issueTokensForSplits: false,
-                    noNewTiersWithReserves: false,
-                    noNewTiersWithVotes: false,
-                    noNewTiersWithOwnerMinting: true
-                })
-        );
-        hook.transferOwnership(owner);
-
-        // -- Build expected removed/remaining tiers -- //
-        JB721TierConfig[] memory tierConfigsRemaining = new JB721TierConfig[](2);
-        JB721Tier[] memory tiersRemaining = new JB721Tier[](2);
-        uint256 arrayIndex;
-        for (uint256 i; i < initialNumberOfTiers; i++) {
-            // Tiers which will remain.
-            if (i + 1 != 1 && i + 1 != 3 && i + 1 != 4) {
-                tierConfigsRemaining[arrayIndex] = JB721TierConfig({
-                    price: uint104((i + 1) * 10),
-                    initialSupply: uint32(100),
-                    votingUnits: uint16(0),
-                    // forge-lint: disable-next-line(unsafe-typecast)
-                    reserveFrequency: uint16(i),
-                    reserveBeneficiary: reserveBeneficiary,
-                    encodedIPFSUri: tokenUris[0],
-                    category: uint24(100),
-                    discountPercent: uint8(0),
-                    flags: JB721TierConfigFlags({
-                        allowOwnerMint: false,
-                        useReserveBeneficiaryAsDefault: false,
-                        transfersPausable: false,
-                        useVotingUnits: true,
-                        cantBeRemoved: false,
-                        cantIncreaseDiscountPercent: false,
-                        cantBuyWithCredits: false
-                    }),
-                    splitPercent: 0,
-                    splits: new JBSplit[](0)
-                });
-                tiersRemaining[arrayIndex] = JB721Tier({
-                    // forge-lint: disable-next-line(unsafe-typecast)
-                    id: uint32(i + 1),
-                    price: tierConfigsRemaining[arrayIndex].price,
-                    remainingSupply: tierConfigsRemaining[arrayIndex].initialSupply,
-                    initialSupply: tierConfigsRemaining[arrayIndex].initialSupply,
-                    votingUnits: tierConfigsRemaining[arrayIndex].votingUnits,
-                    reserveFrequency: tierConfigsRemaining[arrayIndex].reserveFrequency,
-                    reserveBeneficiary: i == 0 ? address(0) : tierConfigsRemaining[arrayIndex].reserveBeneficiary,
-                    encodedIPFSUri: tierConfigsRemaining[arrayIndex].encodedIPFSUri,
-                    category: tierConfigsRemaining[arrayIndex].category,
-                    discountPercent: tierConfigsRemaining[arrayIndex].discountPercent,
-                    flags: JB721TierFlags({
-                        allowOwnerMint: tierConfigsRemaining[arrayIndex].flags.allowOwnerMint,
-                        transfersPausable: tierConfigsRemaining[arrayIndex].flags.transfersPausable,
-                        cantBeRemoved: tierConfigsRemaining[arrayIndex].flags.cantBeRemoved,
-                        cantIncreaseDiscountPercent: tierConfigsRemaining[arrayIndex].flags.cantIncreaseDiscountPercent,
-                        cantBuyWithCredits: tierConfigsRemaining[arrayIndex].flags.cantBuyWithCredits
-                    }),
-                    splitPercent: 0,
-                    resolvedUri: ""
-                });
-                arrayIndex++;
-            } else {
-                // Otherwise, part of the tiers removed:
-                // Check: was `RemoveTier` emitted with the correct values?
-                vm.expectEmit(true, false, false, true, address(hook));
-                emit RemoveTier(i + 1, owner);
-            }
-        }
-
-        // -- Build expected added tiers -- //
-        JB721TierConfig[] memory tierConfigsToAdd = new JB721TierConfig[](numberOfTiersToAdd);
-        JB721Tier[] memory tiersAdded = new JB721Tier[](numberOfTiersToAdd);
-        for (uint256 i; i < numberOfTiersToAdd; i++) {
-            tierConfigsToAdd[i] = JB721TierConfig({
-                price: uint104(tiersToAdd[i]) * 11,
-                initialSupply: uint32(100),
-                votingUnits: uint16(0),
-                reserveFrequency: uint16(0),
-                reserveBeneficiary: reserveBeneficiary,
-                encodedIPFSUri: tokenUris[0],
-                // forge-lint: disable-next-line(unsafe-typecast)
-                category: uint24(100 + i),
-                discountPercent: uint8(0),
-                flags: JB721TierConfigFlags({
-                    allowOwnerMint: false,
-                    useReserveBeneficiaryAsDefault: false,
-                    transfersPausable: false,
-                    useVotingUnits: true,
-                    cantBeRemoved: false,
-                    cantIncreaseDiscountPercent: false,
-                    cantBuyWithCredits: false
-                }),
-                splitPercent: 0,
-                splits: new JBSplit[](0)
-            });
-            tiersAdded[i] = JB721Tier({
-                id: uint32(tiers.length + (i + 1)),
-                price: tierConfigsToAdd[i].price,
-                remainingSupply: tierConfigsToAdd[i].initialSupply,
-                initialSupply: tierConfigsToAdd[i].initialSupply,
-                votingUnits: tierConfigsToAdd[i].votingUnits,
-                reserveFrequency: tierConfigsToAdd[i].reserveFrequency,
-                reserveBeneficiary: address(0),
-                encodedIPFSUri: tierConfigsToAdd[i].encodedIPFSUri,
-                category: tierConfigsToAdd[i].category,
-                discountPercent: tierConfigsToAdd[i].discountPercent,
-                flags: JB721TierFlags({
-                    allowOwnerMint: tierConfigsToAdd[i].flags.allowOwnerMint,
-                    transfersPausable: tierConfigsToAdd[i].flags.transfersPausable,
-                    cantBeRemoved: tierConfigsToAdd[i].flags.cantBeRemoved,
-                    cantIncreaseDiscountPercent: tierConfigsToAdd[i].flags.cantIncreaseDiscountPercent,
-                    cantBuyWithCredits: tierConfigsToAdd[i].flags.cantBuyWithCredits
-                }),
-                splitPercent: 0,
-                resolvedUri: ""
-            });
-            vm.expectEmit(true, true, true, true, address(hook));
-            emit AddTier(tiersAdded[i].id, tierConfigsToAdd[i], owner);
-        }
-        vm.prank(owner);
-        hook.adjustTiers(tierConfigsToAdd, tierIdsToRemove);
-        JB721Tier[] memory storedTiers = hook.STORE()
-            .tiersOf(
-                address(hook),
-                new uint256[](0),
-                false,
-                0,
-                7 // 7 tiers remaining - hard-coded to avoid stack too deep.
-            );
-        // Check: are the expected number of tiers stored?
-        assertEq(storedTiers.length, 7);
-        // Check: are all non-deleted and added tiers in the new tiers (unsorted)?
-        assertTrue(_isIn(tiersRemaining, storedTiers)); // Original tiers
-        assertTrue(_isIn(tiersAdded, storedTiers)); // New tiers
-        // Check: are all the deleted tiers removed?
-        assertFalse(_isIn(tiers, storedTiers)); // Will emit `_isIn: incomplete inclusion but without failing assertion`
-        // Check: are all the tiers sorted?
-        for (uint256 j = 1; j < storedTiers.length; j++) {
-            assertLe(storedTiers[j - 1].category, storedTiers[j].category);
-        }
-    }
-
-    function test_adjustTiers_revertIfAddingWithVotingPower(
-        uint256 initialNumberOfTiers,
-        uint256 numberTiersToAdd
-    )
-        public
-    {
-        // Include adding X new tiers with 0 current tiers.
-        initialNumberOfTiers = bound(initialNumberOfTiers, 0, 15);
-        numberTiersToAdd = bound(numberTiersToAdd, 1, 15);
-
-        JB721TierConfig[] memory tierConfigs = new JB721TierConfig[](initialNumberOfTiers);
-        JB721Tier[] memory tiers = new JB721Tier[](initialNumberOfTiers);
-        for (uint256 i; i < initialNumberOfTiers; i++) {
-            tierConfigs[i] = JB721TierConfig({
-                price: uint104((i + 1) * 10),
-                initialSupply: uint32(100),
-                votingUnits: uint16(0),
-                // forge-lint: disable-next-line(unsafe-typecast)
-                reserveFrequency: uint16(i),
-                reserveBeneficiary: reserveBeneficiary,
-                encodedIPFSUri: tokenUris[0],
-                category: uint24(100),
-                discountPercent: uint8(0),
-                flags: JB721TierConfigFlags({
-                    allowOwnerMint: false,
-                    useReserveBeneficiaryAsDefault: false,
-                    transfersPausable: false,
-                    useVotingUnits: true,
-                    cantBeRemoved: false,
-                    cantIncreaseDiscountPercent: false,
-                    cantBuyWithCredits: false
-                }),
-                splitPercent: 0,
-                splits: new JBSplit[](0)
-            });
-            tiers[i] = JB721Tier({
-                // forge-lint: disable-next-line(unsafe-typecast)
-                id: uint32(i + 1),
-                price: tierConfigs[i].price,
-                remainingSupply: tierConfigs[i].initialSupply,
-                initialSupply: tierConfigs[i].initialSupply,
-                votingUnits: tierConfigs[i].votingUnits,
-                reserveFrequency: tierConfigs[i].reserveFrequency,
-                reserveBeneficiary: tierConfigs[i].reserveBeneficiary,
-                encodedIPFSUri: tierConfigs[i].encodedIPFSUri,
-                category: tierConfigs[i].category,
-                discountPercent: tierConfigs[i].discountPercent,
-                flags: JB721TierFlags({
-                    allowOwnerMint: tierConfigs[i].flags.allowOwnerMint,
-                    transfersPausable: tierConfigs[i].flags.transfersPausable,
-                    cantBeRemoved: tierConfigs[i].flags.cantBeRemoved,
-                    cantIncreaseDiscountPercent: tierConfigs[i].flags.cantIncreaseDiscountPercent,
-                    cantBuyWithCredits: tierConfigs[i].flags.cantBuyWithCredits
-                }),
-                splitPercent: 0,
-                resolvedUri: ""
-            });
-        }
-        ForTest_JB721TiersHookStore store = new ForTest_JB721TiersHookStore();
-        ForTest_JB721TiersHook hook = new ForTest_JB721TiersHook(
-            ForTest_JB721TiersHook.ForTestInitConfig({
-                projectId: projectId,
-                name: name,
-                symbol: symbol,
-                baseUri: baseUri,
-                tokenUriResolver: IJB721TokenUriResolver(mockTokenUriResolver),
-                contractUri: contractUri,
-                tiers: tierConfigs,
-                flags: JB721TiersHookFlags({
-                    preventOverspending: false,
-                    issueTokensForSplits: false,
-                    noNewTiersWithReserves: false,
-                    noNewTiersWithVotes: true,
-                    noNewTiersWithOwnerMinting: true
-                })
-            }),
-            IJBDirectory(mockJBDirectory),
-            IJBPrices(mockJBPrices),
-            IJBRulesets(mockJBRulesets),
-            IJB721TiersHookStore(address(store)),
-            IJBSplits(mockJBSplits)
-        );
-        hook.transferOwnership(owner);
-        JB721TierConfig[] memory tierConfigsToAdd = new JB721TierConfig[](numberTiersToAdd);
-        JB721Tier[] memory tiersAdded = new JB721Tier[](numberTiersToAdd);
-        for (uint256 i; i < numberTiersToAdd; i++) {
-            tierConfigsToAdd[i] = JB721TierConfig({
-                price: uint104(0),
-                initialSupply: uint32(100),
-                // forge-lint: disable-next-line(unsafe-typecast)
-                votingUnits: uint16(i + 1),
-                // forge-lint: disable-next-line(unsafe-typecast)
-                reserveFrequency: uint16(i),
-                reserveBeneficiary: reserveBeneficiary,
-                encodedIPFSUri: tokenUris[0],
-                category: uint24(100),
-                discountPercent: uint8(0),
-                flags: JB721TierConfigFlags({
-                    allowOwnerMint: false,
-                    useReserveBeneficiaryAsDefault: false,
-                    transfersPausable: false,
-                    useVotingUnits: true,
-                    cantBeRemoved: false,
-                    cantIncreaseDiscountPercent: false,
-                    cantBuyWithCredits: false
-                }),
-                splitPercent: 0,
-                splits: new JBSplit[](0)
-            });
-            tiersAdded[i] = JB721Tier({
-                id: uint32(tiers.length + (i + 1)),
-                price: tierConfigsToAdd[i].price,
-                remainingSupply: tierConfigsToAdd[i].initialSupply,
-                initialSupply: tierConfigsToAdd[i].initialSupply,
-                votingUnits: tierConfigsToAdd[i].votingUnits,
-                reserveFrequency: tierConfigsToAdd[i].reserveFrequency,
-                reserveBeneficiary: tierConfigsToAdd[i].reserveBeneficiary,
-                encodedIPFSUri: tierConfigsToAdd[i].encodedIPFSUri,
-                category: tierConfigsToAdd[i].category,
-                discountPercent: tierConfigsToAdd[i].discountPercent,
-                flags: JB721TierFlags({
-                    allowOwnerMint: tierConfigsToAdd[i].flags.allowOwnerMint,
-                    transfersPausable: tierConfigsToAdd[i].flags.transfersPausable,
-                    cantBeRemoved: tierConfigsToAdd[i].flags.cantBeRemoved,
-                    cantIncreaseDiscountPercent: tierConfigsToAdd[i].flags.cantIncreaseDiscountPercent,
-                    cantBuyWithCredits: tierConfigsToAdd[i].flags.cantBuyWithCredits
-                }),
-                splitPercent: 0,
-                resolvedUri: ""
-            });
-        }
-        vm.expectRevert(
-            abi.encodeWithSelector(
-                JB721TiersHookStore.JB721TiersHookStore_VotingUnitsNotAllowed.selector, initialNumberOfTiers + 1
-            )
-        );
-        vm.prank(owner);
-        hook.adjustTiers(tierConfigsToAdd, new uint256[](0));
-    }
-
-    function test_adjustTiers_revertIfAddingWithReserveFrequency(
-        uint256 initialNumberOfTiers,
-        uint256 numberTiersToAdd
-    )
-        public
-    {
-        // Include adding X new tiers with 0 current tiers.
-        initialNumberOfTiers = bound(initialNumberOfTiers, 0, 15);
-        numberTiersToAdd = bound(numberTiersToAdd, 1, 15);
-
-        JB721TierConfig[] memory tierConfigs = new JB721TierConfig[](initialNumberOfTiers);
-        JB721Tier[] memory tiers = new JB721Tier[](initialNumberOfTiers);
-        for (uint256 i; i < initialNumberOfTiers; i++) {
-            tierConfigs[i] = JB721TierConfig({
-                price: uint104((i + 1) * 10),
-                initialSupply: uint32(100),
-                votingUnits: uint16(0),
-                // forge-lint: disable-next-line(unsafe-typecast)
-                reserveFrequency: uint16(i),
-                reserveBeneficiary: reserveBeneficiary,
-                encodedIPFSUri: tokenUris[0],
-                category: uint24(100),
-                discountPercent: uint8(0),
-                flags: JB721TierConfigFlags({
-                    allowOwnerMint: false,
-                    useReserveBeneficiaryAsDefault: false,
-                    transfersPausable: false,
-                    useVotingUnits: true,
-                    cantBeRemoved: false,
-                    cantIncreaseDiscountPercent: false,
-                    cantBuyWithCredits: false
-                }),
-                splitPercent: 0,
-                splits: new JBSplit[](0)
-            });
-            tiers[i] = JB721Tier({
-                // forge-lint: disable-next-line(unsafe-typecast)
-                id: uint32(i + 1),
-                price: tierConfigs[i].price,
-                remainingSupply: tierConfigs[i].initialSupply,
-                initialSupply: tierConfigs[i].initialSupply,
-                votingUnits: tierConfigs[i].votingUnits,
-                reserveFrequency: tierConfigs[i].reserveFrequency,
-                reserveBeneficiary: tierConfigs[i].reserveBeneficiary,
-                encodedIPFSUri: tierConfigs[i].encodedIPFSUri,
-                category: tierConfigs[i].category,
-                discountPercent: tierConfigs[i].discountPercent,
-                flags: JB721TierFlags({
-                    allowOwnerMint: tierConfigs[i].flags.allowOwnerMint,
-                    transfersPausable: tierConfigs[i].flags.transfersPausable,
-                    cantBeRemoved: tierConfigs[i].flags.cantBeRemoved,
-                    cantIncreaseDiscountPercent: tierConfigs[i].flags.cantIncreaseDiscountPercent,
-                    cantBuyWithCredits: tierConfigs[i].flags.cantBuyWithCredits
-                }),
-                splitPercent: 0,
-                resolvedUri: ""
-            });
-        }
-        ForTest_JB721TiersHookStore store = new ForTest_JB721TiersHookStore();
-        ForTest_JB721TiersHook hook = new ForTest_JB721TiersHook(
-            ForTest_JB721TiersHook.ForTestInitConfig({
-                projectId: projectId,
-                name: name,
-                symbol: symbol,
-                baseUri: baseUri,
-                tokenUriResolver: IJB721TokenUriResolver(mockTokenUriResolver),
-                contractUri: contractUri,
-                tiers: tierConfigs,
-                flags: JB721TiersHookFlags({
-                    preventOverspending: false,
-                    issueTokensForSplits: false,
-                    noNewTiersWithReserves: true, // <-- This is the flag we're testing.
-                    noNewTiersWithVotes: false,
-                    noNewTiersWithOwnerMinting: true
-                })
-            }),
-            IJBDirectory(mockJBDirectory),
-            IJBPrices(mockJBPrices),
-            IJBRulesets(mockJBRulesets),
-            IJB721TiersHookStore(address(store)),
-            IJBSplits(mockJBSplits)
-        );
-        hook.transferOwnership(owner);
-        JB721TierConfig[] memory tierConfigsToAdd = new JB721TierConfig[](numberTiersToAdd);
-        JB721Tier[] memory tiersAdded = new JB721Tier[](numberTiersToAdd);
-        for (uint256 i; i < numberTiersToAdd; i++) {
-            tierConfigsToAdd[i] = JB721TierConfig({
-                price: uint104((i + 1) * 100),
-                initialSupply: uint32(100),
-                votingUnits: uint16(0),
-                // forge-lint: disable-next-line(unsafe-typecast)
-                reserveFrequency: uint16(i + 1),
-                reserveBeneficiary: reserveBeneficiary,
-                encodedIPFSUri: tokenUris[0],
-                category: uint24(100),
-                discountPercent: uint8(0),
-                flags: JB721TierConfigFlags({
-                    allowOwnerMint: false,
-                    useReserveBeneficiaryAsDefault: false,
-                    transfersPausable: false,
-                    useVotingUnits: true,
-                    cantBeRemoved: false,
-                    cantIncreaseDiscountPercent: false,
-                    cantBuyWithCredits: false
-                }),
-                splitPercent: 0,
-                splits: new JBSplit[](0)
-            });
-            tiersAdded[i] = JB721Tier({
-                id: uint32(tiers.length + (i + 1)),
-                price: tierConfigsToAdd[i].price,
-                remainingSupply: tierConfigsToAdd[i].initialSupply,
-                initialSupply: tierConfigsToAdd[i].initialSupply,
-                votingUnits: tierConfigsToAdd[i].votingUnits,
-                reserveFrequency: tierConfigsToAdd[i].reserveFrequency,
-                reserveBeneficiary: tierConfigsToAdd[i].reserveBeneficiary,
-                encodedIPFSUri: tierConfigsToAdd[i].encodedIPFSUri,
-                category: tierConfigsToAdd[i].category,
-                discountPercent: tierConfigsToAdd[i].discountPercent,
-                flags: JB721TierFlags({
-                    allowOwnerMint: tierConfigsToAdd[i].flags.allowOwnerMint,
-                    transfersPausable: tierConfigsToAdd[i].flags.transfersPausable,
-                    cantBeRemoved: tierConfigsToAdd[i].flags.cantBeRemoved,
-                    cantIncreaseDiscountPercent: tierConfigsToAdd[i].flags.cantIncreaseDiscountPercent,
-                    cantBuyWithCredits: tierConfigsToAdd[i].flags.cantBuyWithCredits
-                }),
-                splitPercent: 0,
-                resolvedUri: ""
-            });
-        }
-
-        // Expect the `adjustTiers` call to revert because of the `noNewTiersWithReserves` flag.
-        vm.expectRevert(
-            abi.encodeWithSelector(
-                JB721TiersHookStore.JB721TiersHookStore_ReserveFrequencyNotAllowed.selector, initialNumberOfTiers + 1
-            )
-        );
-        vm.prank(owner);
-        hook.adjustTiers(tierConfigsToAdd, new uint256[](0));
-    }
-
-    function test_adjustTiers_revertIfCannotRemoveTier() public {
-        uint256 initialNumberOfTiers = 2;
-        uint256 numberOfTiersToRemove = 1;
-        uint256[] memory tierIdsToRemove = new uint256[](numberOfTiersToRemove);
-        tierIdsToRemove[0] = 1;
-        // Initial tiers configs and data.
-        JB721TierConfig[] memory tierConfigs = new JB721TierConfig[](initialNumberOfTiers);
-        tierConfigs[0] = JB721TierConfig({
-            price: 10,
-            initialSupply: uint32(100),
-            votingUnits: uint16(0),
-            reserveFrequency: uint16(0),
-            reserveBeneficiary: reserveBeneficiary,
-            encodedIPFSUri: tokenUris[0],
-            category: uint24(100),
-            discountPercent: uint8(0),
-            flags: JB721TierConfigFlags({
-                allowOwnerMint: false,
-                useReserveBeneficiaryAsDefault: false,
-                transfersPausable: false,
-                useVotingUnits: true,
-                cantBeRemoved: true,
-                cantIncreaseDiscountPercent: false,
-                cantBuyWithCredits: false
-            }),
-            splitPercent: 0,
-            splits: new JBSplit[](0)
-        });
-        tierConfigs[1] = JB721TierConfig({
-            price: 10,
-            initialSupply: uint32(100),
-            votingUnits: uint16(0),
-            reserveFrequency: uint16(0),
-            reserveBeneficiary: reserveBeneficiary,
-            encodedIPFSUri: tokenUris[0],
-            category: uint24(100),
-            discountPercent: uint8(0),
-            flags: JB721TierConfigFlags({
-                allowOwnerMint: false,
-                useReserveBeneficiaryAsDefault: false,
-                transfersPausable: false,
-                useVotingUnits: true,
-                cantBeRemoved: false,
-                cantIncreaseDiscountPercent: false,
-                cantBuyWithCredits: false
-            }),
-            splitPercent: 0,
-            splits: new JBSplit[](0)
-        });
-        //  Deploy the hook and its store with the initial tiers.
-        vm.etch(hook_i, address(hook).code);
-        JB721TiersHook hook = JB721TiersHook(hook_i);
-        hook.initialize(
-            projectId,
-            name,
-            symbol,
-            baseUri,
-            IJB721TokenUriResolver(mockTokenUriResolver),
-            contractUri,
-            JB721InitTiersConfig({
-                tiers: tierConfigs, currency: uint32(uint160(JBConstants.NATIVE_TOKEN)), decimals: 18
-            }),
-            JB721TiersHookFlags({
-                    preventOverspending: false,
-                    issueTokensForSplits: false,
-                    noNewTiersWithReserves: false,
-                    noNewTiersWithVotes: false,
-                    noNewTiersWithOwnerMinting: true
-                })
-        );
-        hook.transferOwnership(owner);
-
-        // Expect the `adjustTiers` call to revert because cannot remove tier.
-        vm.expectRevert(abi.encodeWithSelector(JB721TiersHookStore.JB721TiersHookStore_CantRemoveTier.selector, 1));
-        vm.prank(owner);
-        hook.adjustTiers(new JB721TierConfig[](0), tierIdsToRemove);
-    }
-
-    function test_adjustTiers_revertIfEmptyQuantity(uint256 initialNumberOfTiers, uint256 numberTiersToAdd) public {
-        // Include adding X new tiers with 0 current tiers.
-        initialNumberOfTiers = bound(initialNumberOfTiers, 0, 15);
-        numberTiersToAdd = bound(numberTiersToAdd, 1, 15);
-
-        JB721TierConfig[] memory tierConfigs = new JB721TierConfig[](initialNumberOfTiers);
-        JB721Tier[] memory tiers = new JB721Tier[](initialNumberOfTiers);
-        for (uint256 i; i < initialNumberOfTiers; i++) {
-            tierConfigs[i] = JB721TierConfig({
-                price: uint104((i + 1) * 10),
-                initialSupply: uint32(100),
-                votingUnits: uint16(0),
-                // forge-lint: disable-next-line(unsafe-typecast)
-                reserveFrequency: uint16(i),
-                reserveBeneficiary: reserveBeneficiary,
-                encodedIPFSUri: tokenUris[0],
-                category: uint24(100),
-                discountPercent: uint8(0),
-                flags: JB721TierConfigFlags({
-                    allowOwnerMint: false,
-                    useReserveBeneficiaryAsDefault: false,
-                    transfersPausable: false,
-                    useVotingUnits: true,
-                    cantBeRemoved: false,
-                    cantIncreaseDiscountPercent: false,
-                    cantBuyWithCredits: false
-                }),
-                splitPercent: 0,
-                splits: new JBSplit[](0)
-            });
-            tiers[i] = JB721Tier({
-                // forge-lint: disable-next-line(unsafe-typecast)
-                id: uint32(i + 1),
-                price: tierConfigs[i].price,
-                remainingSupply: tierConfigs[i].initialSupply,
-                initialSupply: tierConfigs[i].initialSupply,
-                votingUnits: tierConfigs[i].votingUnits,
-                reserveFrequency: tierConfigs[i].reserveFrequency,
-                reserveBeneficiary: tierConfigs[i].reserveBeneficiary,
-                encodedIPFSUri: tierConfigs[i].encodedIPFSUri,
-                category: tierConfigs[i].category,
-                discountPercent: tierConfigs[i].discountPercent,
-                flags: JB721TierFlags({
-                    allowOwnerMint: tierConfigs[i].flags.allowOwnerMint,
-                    transfersPausable: tierConfigs[i].flags.transfersPausable,
-                    cantBeRemoved: tierConfigs[i].flags.cantBeRemoved,
-                    cantIncreaseDiscountPercent: tierConfigs[i].flags.cantIncreaseDiscountPercent,
-                    cantBuyWithCredits: tierConfigs[i].flags.cantBuyWithCredits
-                }),
-                splitPercent: 0,
-                resolvedUri: ""
-            });
-        }
-        ForTest_JB721TiersHookStore store = new ForTest_JB721TiersHookStore();
-        ForTest_JB721TiersHook hook = new ForTest_JB721TiersHook(
-            ForTest_JB721TiersHook.ForTestInitConfig({
-                projectId: projectId,
-                name: name,
-                symbol: symbol,
-                baseUri: baseUri,
-                tokenUriResolver: IJB721TokenUriResolver(mockTokenUriResolver),
-                contractUri: contractUri,
-                tiers: tierConfigs,
-                flags: JB721TiersHookFlags({
-                    preventOverspending: false,
-                    issueTokensForSplits: false,
-                    noNewTiersWithReserves: false,
-                    noNewTiersWithVotes: false,
-                    noNewTiersWithOwnerMinting: true
-                })
-            }),
-            IJBDirectory(mockJBDirectory),
-            IJBPrices(mockJBPrices),
-            IJBRulesets(mockJBRulesets),
-            IJB721TiersHookStore(address(store)),
-            IJBSplits(mockJBSplits)
-        );
-        hook.transferOwnership(owner);
-        JB721TierConfig[] memory tierConfigsToAdd = new JB721TierConfig[](numberTiersToAdd);
-        JB721Tier[] memory tiersAdded = new JB721Tier[](numberTiersToAdd);
-        for (uint256 i; i < numberTiersToAdd; i++) {
-            tierConfigsToAdd[i] = JB721TierConfig({
-                price: uint104((i + 1) * 100),
-                initialSupply: uint32(0), // <-- This is the value we're testing.
-                votingUnits: uint16(0),
-                reserveFrequency: uint16(0),
-                reserveBeneficiary: reserveBeneficiary,
-                encodedIPFSUri: tokenUris[0],
-                category: uint24(100),
-                discountPercent: uint8(0),
-                flags: JB721TierConfigFlags({
-                    allowOwnerMint: false,
-                    useReserveBeneficiaryAsDefault: false,
-                    transfersPausable: false,
-                    useVotingUnits: false,
-                    cantBeRemoved: false,
-                    cantIncreaseDiscountPercent: false,
-                    cantBuyWithCredits: false
-                }),
-                splitPercent: 0,
-                splits: new JBSplit[](0)
-            });
-            tiersAdded[i] = JB721Tier({
-                id: uint32(tiers.length + (i + 1)),
-                price: tierConfigsToAdd[i].price,
-                remainingSupply: tierConfigsToAdd[i].initialSupply,
-                initialSupply: tierConfigsToAdd[i].initialSupply,
-                votingUnits: tierConfigsToAdd[i].votingUnits,
-                reserveFrequency: tierConfigsToAdd[i].reserveFrequency,
-                reserveBeneficiary: tierConfigsToAdd[i].reserveBeneficiary,
-                encodedIPFSUri: tierConfigsToAdd[i].encodedIPFSUri,
-                category: tierConfigsToAdd[i].category,
-                discountPercent: tierConfigsToAdd[i].discountPercent,
-                flags: JB721TierFlags({
-                    allowOwnerMint: tierConfigsToAdd[i].flags.allowOwnerMint,
-                    transfersPausable: tierConfigsToAdd[i].flags.transfersPausable,
-                    cantBeRemoved: tierConfigsToAdd[i].flags.cantBeRemoved,
-                    cantIncreaseDiscountPercent: tierConfigsToAdd[i].flags.cantIncreaseDiscountPercent,
-                    cantBuyWithCredits: tierConfigsToAdd[i].flags.cantBuyWithCredits
-                }),
-                splitPercent: 0,
-                resolvedUri: ""
-            });
-        }
-
-        // Expect the `adjustTiers` call to revert because of the `initialSupply` of 0.
-        vm.expectRevert(
-            abi.encodeWithSelector(
-                JB721TiersHookStore.JB721TiersHookStore_ZeroInitialSupply.selector, initialNumberOfTiers + 1
-            )
-        );
-        vm.prank(owner);
-        hook.adjustTiers(tierConfigsToAdd, new uint256[](0));
-    }
-
-    function test_adjustTiers_revertIfInvalidCategorySortOrder(
-        uint256 initialNumberOfTiers,
-        uint256 numberTiersToAdd
-    )
-        public
-    {
-        initialNumberOfTiers = bound(initialNumberOfTiers, 0, 15);
-        numberTiersToAdd = bound(numberTiersToAdd, 2, 15);
-
-        ForTest_JB721TiersHook hook = _initializeForTestHook(initialNumberOfTiers);
-
-        JB721TierConfig[] memory tierConfigsToAdd = new JB721TierConfig[](numberTiersToAdd);
-        for (uint256 i; i < numberTiersToAdd; i++) {
-            tierConfigsToAdd[i] = JB721TierConfig({
-                price: uint104((i + 1) * 100),
-                initialSupply: uint32(100),
-                votingUnits: uint16(0),
-                // forge-lint: disable-next-line(unsafe-typecast)
-                reserveFrequency: uint16(i),
-                reserveBeneficiary: reserveBeneficiary,
-                encodedIPFSUri: tokenUris[0],
-                category: uint24(100),
-                discountPercent: uint8(0),
-                flags: JB721TierConfigFlags({
-                    allowOwnerMint: false,
-                    useReserveBeneficiaryAsDefault: false,
-                    transfersPausable: false,
-                    useVotingUnits: true,
-                    cantBeRemoved: false,
-                    cantIncreaseDiscountPercent: false,
-                    cantBuyWithCredits: false
-                }),
-                splitPercent: 0,
-                splits: new JBSplit[](0)
-            });
-        }
-        // Set the second to last tier to have a category of `99`, which is less than the last tier's category of `100`.
-        tierConfigsToAdd[numberTiersToAdd - 1].category = uint8(99);
-
-        // Expect the `adjustTiers` call to revert because of the invalid category sort order.
-        vm.expectRevert(
-            abi.encodeWithSelector(JB721TiersHookStore.JB721TiersHookStore_InvalidCategorySortOrder.selector, 99, 100)
-        );
-        vm.prank(owner);
-        hook.adjustTiers(tierConfigsToAdd, new uint256[](0));
-    }
-
-    function test_adjustTiers_revertIfMoreVotingUnitsNotAllowedWithPriceChange(
-        uint256 initialNumberOfTiers,
-        uint256 numberTiersToAdd
-    )
-        public
-    {
-        // Include adding X new tiers with 0 current tiers.
-        initialNumberOfTiers = bound(initialNumberOfTiers, 0, 15);
-        numberTiersToAdd = bound(numberTiersToAdd, 1, 15);
-
-        JB721TierConfig[] memory tierConfigs = new JB721TierConfig[](initialNumberOfTiers);
-        for (uint256 i; i < initialNumberOfTiers; i++) {
-            tierConfigs[i] = JB721TierConfig({
-                price: uint104((i + 1) * 10),
-                initialSupply: uint32(100),
-                votingUnits: uint16(0),
-                // forge-lint: disable-next-line(unsafe-typecast)
-                reserveFrequency: uint16(i),
-                reserveBeneficiary: reserveBeneficiary,
-                encodedIPFSUri: tokenUris[0],
-                category: uint24(100),
-                discountPercent: uint8(0),
-                flags: JB721TierConfigFlags({
-                    allowOwnerMint: false,
-                    useReserveBeneficiaryAsDefault: false,
-                    transfersPausable: false,
-                    useVotingUnits: false,
-                    cantBeRemoved: false,
-                    cantIncreaseDiscountPercent: false,
-                    cantBuyWithCredits: false
-                }),
-                splitPercent: 0,
-                splits: new JBSplit[](0)
-            });
-        }
-
-        ForTest_JB721TiersHookStore store = new ForTest_JB721TiersHookStore();
-        ForTest_JB721TiersHook hook = new ForTest_JB721TiersHook(
-            ForTest_JB721TiersHook.ForTestInitConfig({
-                projectId: projectId,
-                name: name,
-                symbol: symbol,
-                baseUri: baseUri,
-                tokenUriResolver: IJB721TokenUriResolver(mockTokenUriResolver),
-                contractUri: contractUri,
-                tiers: tierConfigs,
-                flags: JB721TiersHookFlags({
-                    preventOverspending: false,
-                    issueTokensForSplits: false,
-                    noNewTiersWithReserves: false,
-                    noNewTiersWithVotes: true, // <-- This is the flag we're testing.
-                    noNewTiersWithOwnerMinting: true
-                })
-            }),
-            IJBDirectory(mockJBDirectory),
-            IJBPrices(mockJBPrices),
-            IJBRulesets(mockJBRulesets),
-            IJB721TiersHookStore(address(store)),
-            IJBSplits(mockJBSplits)
-        );
-        hook.transferOwnership(owner);
-
-        JB721TierConfig[] memory tierConfigsToAdd = new JB721TierConfig[](numberTiersToAdd);
-        for (uint256 i; i < numberTiersToAdd; i++) {
-            tierConfigsToAdd[i] = JB721TierConfig({
-                price: uint104((i + 1) * 100),
-                initialSupply: uint32(100),
-                votingUnits: uint16(0),
-                // forge-lint: disable-next-line(unsafe-typecast)
-                reserveFrequency: uint16(i),
-                reserveBeneficiary: reserveBeneficiary,
-                encodedIPFSUri: tokenUris[0],
-                category: uint24(100),
-                discountPercent: uint8(0),
-                flags: JB721TierConfigFlags({
-                    allowOwnerMint: false,
-                    useReserveBeneficiaryAsDefault: false,
-                    transfersPausable: false,
-                    useVotingUnits: false, // <-- If false, voting power is based on tier price
-                    cantBeRemoved: false,
-                    cantIncreaseDiscountPercent: false,
-                    cantBuyWithCredits: false
-                }),
-                splitPercent: 0,
-                splits: new JBSplit[](0)
-            });
-        }
-
-        // Expect the `adjustTiers` call to revert because of the `noNewTiersWithVotes` flag.
-        vm.expectRevert(
-            abi.encodeWithSelector(
-                JB721TiersHookStore.JB721TiersHookStore_VotingUnitsNotAllowed.selector, initialNumberOfTiers + 1
-            )
-        );
-        vm.prank(owner);
-        hook.adjustTiers(tierConfigsToAdd, new uint256[](0));
-    }
-
-    function test_adjustTiers_revertIfMoreVotingUnitsNotAllowedUsingVotingUnits(
-        uint256 initialNumberOfTiers,
-        uint256 numberTiersToAdd
-    )
-        public
-    {
-        // Include adding X new tiers with 0 current tiers.
-        initialNumberOfTiers = bound(initialNumberOfTiers, 0, 15);
-        numberTiersToAdd = bound(numberTiersToAdd, 1, 15);
-
-        JB721TierConfig[] memory tierConfigs = new JB721TierConfig[](initialNumberOfTiers);
-        for (uint256 i; i < initialNumberOfTiers; i++) {
-            tierConfigs[i] = JB721TierConfig({
-                price: uint104((i + 1) * 10),
-                initialSupply: uint32(100),
-                votingUnits: uint16(0),
-                // forge-lint: disable-next-line(unsafe-typecast)
-                reserveFrequency: uint16(i),
-                reserveBeneficiary: reserveBeneficiary,
-                encodedIPFSUri: tokenUris[0],
-                category: uint24(100),
-                discountPercent: uint8(0),
-                flags: JB721TierConfigFlags({
-                    allowOwnerMint: false,
-                    useReserveBeneficiaryAsDefault: false,
-                    transfersPausable: false,
-                    useVotingUnits: true,
-                    cantBeRemoved: false,
-                    cantIncreaseDiscountPercent: false,
-                    cantBuyWithCredits: false
-                }),
-                splitPercent: 0,
-                splits: new JBSplit[](0)
-            });
-        }
-
-        ForTest_JB721TiersHookStore store = new ForTest_JB721TiersHookStore();
-        ForTest_JB721TiersHook hook = new ForTest_JB721TiersHook(
-            ForTest_JB721TiersHook.ForTestInitConfig({
-                projectId: projectId,
-                name: name,
-                symbol: symbol,
-                baseUri: baseUri,
-                tokenUriResolver: IJB721TokenUriResolver(mockTokenUriResolver),
-                contractUri: contractUri,
-                tiers: tierConfigs,
-                flags: JB721TiersHookFlags({
-                    preventOverspending: false,
-                    issueTokensForSplits: false,
-                    noNewTiersWithReserves: false,
-                    noNewTiersWithVotes: true, // <-- This is the flag we're testing.
-                    noNewTiersWithOwnerMinting: true
-                })
-            }),
-            IJBDirectory(mockJBDirectory),
-            IJBPrices(mockJBPrices),
-            IJBRulesets(mockJBRulesets),
-            IJB721TiersHookStore(address(store)),
-            IJBSplits(mockJBSplits)
-        );
-        hook.transferOwnership(owner);
-
-        JB721TierConfig[] memory tierConfigsToAdd = new JB721TierConfig[](numberTiersToAdd);
-        for (uint256 i; i < numberTiersToAdd; i++) {
-            tierConfigsToAdd[i] = JB721TierConfig({
-                price: uint104((i + 1) * 100),
-                initialSupply: uint32(100),
-                votingUnits: uint16(0),
-                // forge-lint: disable-next-line(unsafe-typecast)
-                reserveFrequency: uint16(i),
-                reserveBeneficiary: reserveBeneficiary,
-                encodedIPFSUri: tokenUris[0],
-                category: uint24(100),
-                discountPercent: uint8(0),
-                flags: JB721TierConfigFlags({
-                    allowOwnerMint: false,
-                    useReserveBeneficiaryAsDefault: false,
-                    transfersPausable: false,
-                    useVotingUnits: true, // <-- If false, voting power is based on tier price
-                    cantBeRemoved: false,
-                    cantIncreaseDiscountPercent: false,
-                    cantBuyWithCredits: false
-                }),
-                splitPercent: 0,
-                splits: new JBSplit[](0)
-            });
-        }
-
-        // One new tier has a non-0 voting power
-        tierConfigsToAdd[numberTiersToAdd - 1].votingUnits = uint16(1);
-
-        // Expect the `adjustTiers` call to revert because of the `noNewTiersWithVotes` flag.
-        vm.expectRevert(
-            abi.encodeWithSelector(
-                JB721TiersHookStore.JB721TiersHookStore_VotingUnitsNotAllowed.selector,
-                initialNumberOfTiers + numberTiersToAdd
-            )
-        );
-        vm.prank(owner);
-        hook.adjustTiers(tierConfigsToAdd, new uint256[](0));
-    }
-
-    function test_cleanTiers_removeInactiveTiers(
-        uint256 initialNumberOfTiers,
-        uint256 seed,
-        uint256 numberOfTiersToRemove
-    )
-        public
-    {
-        // Include adding X new tiers with 0 current tiers.
-        initialNumberOfTiers = bound(initialNumberOfTiers, 1, 15);
-        numberOfTiersToRemove = bound(numberOfTiersToRemove, 0, initialNumberOfTiers - 1);
-
-        // Create random tiers to remove.
-        uint256[] memory tiersToRemove = new uint256[](numberOfTiersToRemove);
-        // Use `seed` to generate new random tiers, and iterate on `i` to fill the `tiersToRemove` array.
-        for (uint256 i; i < numberOfTiersToRemove;) {
-            uint256 newTierCandidate = uint256(keccak256(abi.encode(seed))) % initialNumberOfTiers;
-            bool invalidTier;
-            if (newTierCandidate != 0) {
-                for (uint256 j; j < numberOfTiersToRemove; j++) {
-                    // Same value twice?
-                    if (newTierCandidate == tiersToRemove[j]) {
-                        invalidTier = true;
-                        break;
-                    }
-                }
-                if (!invalidTier) {
-                    tiersToRemove[i] = newTierCandidate;
-                    i++;
-                }
-            }
-            // Overflow to loop over (the seed is fuzzed, and may start at max(uint256)).
-            unchecked {
-                seed++;
-            }
-        }
-        // Order the tiers to remove for event matching (which are ordered too).
-        tiersToRemove = _sortArray(tiersToRemove);
-        JB721TierConfig[] memory tierConfigs = new JB721TierConfig[](initialNumberOfTiers);
-        JB721Tier[] memory tiers = new JB721Tier[](initialNumberOfTiers);
-        for (uint256 i; i < initialNumberOfTiers; i++) {
-            tierConfigs[i] = JB721TierConfig({
-                price: uint104((i + 1) * 10),
-                initialSupply: uint32(100),
-                votingUnits: uint16(0),
-                // forge-lint: disable-next-line(unsafe-typecast)
-                reserveFrequency: uint16(i),
-                reserveBeneficiary: reserveBeneficiary,
-                encodedIPFSUri: tokenUris[0],
-                category: uint24(100),
-                discountPercent: uint8(0),
-                flags: JB721TierConfigFlags({
-                    allowOwnerMint: false,
-                    useReserveBeneficiaryAsDefault: false,
-                    transfersPausable: false,
-                    useVotingUnits: false,
-                    cantBeRemoved: false,
-                    cantIncreaseDiscountPercent: false,
-                    cantBuyWithCredits: false
-                }),
-                splitPercent: 0,
-                splits: new JBSplit[](0)
-            });
-            tiers[i] = JB721Tier({
-                // forge-lint: disable-next-line(unsafe-typecast)
-                id: uint32(i + 1),
-                price: tierConfigs[i].price,
-                remainingSupply: tierConfigs[i].initialSupply,
-                initialSupply: tierConfigs[i].initialSupply,
-                votingUnits: tierConfigs[i].price,
-                reserveFrequency: tierConfigs[i].reserveFrequency,
-                reserveBeneficiary: i == 0 ? address(0) : tierConfigs[i].reserveBeneficiary,
-                encodedIPFSUri: tierConfigs[i].encodedIPFSUri,
-                category: tierConfigs[i].category,
-                discountPercent: tierConfigs[i].discountPercent,
-                flags: JB721TierFlags({
-                    allowOwnerMint: tierConfigs[i].flags.allowOwnerMint,
-                    transfersPausable: tierConfigs[i].flags.transfersPausable,
-                    cantBeRemoved: tierConfigs[i].flags.cantBeRemoved,
-                    cantIncreaseDiscountPercent: tierConfigs[i].flags.cantIncreaseDiscountPercent,
-                    cantBuyWithCredits: tierConfigs[i].flags.cantBuyWithCredits
-                }),
-                splitPercent: 0,
-                resolvedUri: ""
-            });
-        }
-        ForTest_JB721TiersHookStore store = new ForTest_JB721TiersHookStore();
-        ForTest_JB721TiersHook hook = new ForTest_JB721TiersHook(
-            ForTest_JB721TiersHook.ForTestInitConfig({
-                projectId: projectId,
-                name: name,
-                symbol: symbol,
-                baseUri: baseUri,
-                tokenUriResolver: IJB721TokenUriResolver(mockTokenUriResolver),
-                contractUri: contractUri,
-                tiers: tierConfigs,
-                flags: JB721TiersHookFlags({
-                    preventOverspending: false,
-                    issueTokensForSplits: false,
-                    noNewTiersWithReserves: false,
-                    noNewTiersWithVotes: false,
-                    noNewTiersWithOwnerMinting: true
-                })
-            }),
-            IJBDirectory(mockJBDirectory),
-            IJBPrices(mockJBPrices),
-            IJBRulesets(mockJBRulesets),
-            IJB721TiersHookStore(address(store)),
-            IJBSplits(mockJBSplits)
-        );
-        hook.transferOwnership(owner);
-        // Will be resized later
-        JB721TierConfig[] memory tierConfigsRemaining = new JB721TierConfig[](initialNumberOfTiers);
-        JB721Tier[] memory tiersRemaining = new JB721Tier[](initialNumberOfTiers);
-        for (uint256 i; i < tiers.length; i++) {
-            tierConfigsRemaining[i] = tierConfigs[i];
-            tiersRemaining[i] = tiers[i];
-        }
-
-        // Iterate through the remaining tiers and remove the ones in `tiersToRemove`.
-        // Do this by "swapping" the tier to remove with the last element in the array, and then "popping" that last
-        // element.
-        for (uint256 i; i < tiersRemaining.length;) {
-            bool swappedAndPopped;
-            for (uint256 j; j < tiersToRemove.length; j++) {
-                if (tiersRemaining[i].id == tiersToRemove[j]) {
-                    // Swap and pop tiers removed
-                    tiersRemaining[i] = tiersRemaining[tiersRemaining.length - 1];
-                    tierConfigsRemaining[i] = tierConfigsRemaining[tierConfigsRemaining.length - 1];
-                    // Remove the last elelment / reduce array length by 1
-                    assembly ("memory-safe") {
-                        mstore(tiersRemaining, sub(mload(tiersRemaining), 1))
-                        mstore(tierConfigsRemaining, sub(mload(tierConfigsRemaining), 1))
-                    }
-                    swappedAndPopped = true;
-                    break;
-                }
-            }
-            if (!swappedAndPopped) i++;
-        }
-
-        vm.prank(owner);
-        hook.adjustTiers(new JB721TierConfig[](0), tiersToRemove);
-        JB721Tier[] memory tiersListDump = hook.test_store().ForTest_dumpTiersList(address(hook));
-        // Check: are all of the tiers are still in the linked list (both active and inactive)?
-        assertTrue(_isIn(tiers, tiersListDump));
-        // Check: does the linked list include only the tiers (active and inactives)?
-        assertTrue(_isIn(tiersListDump, tiers));
-        // Check: was the correct event emitted?
-        vm.expectEmit(true, false, false, true, address(hook.test_store()));
-        emit CleanTiers(address(hook), beneficiary);
-        vm.startPrank(beneficiary);
-        hook.test_store().cleanTiers(address(hook));
-        vm.stopPrank();
-        tiersListDump = hook.test_store().ForTest_dumpTiersList(address(hook));
-        // Check: is the correct number of tiers remaining?
-        assertEq(tiersListDump.length, initialNumberOfTiers - numberOfTiersToRemove);
-        // Check: are all of the remaining tiers in the dump?
-        assertTrue(_isIn(tiersRemaining, tiersListDump));
-        // Check: does the dump include any tiers which shouldn't be remaining?
-        assertTrue(_isIn(tiersListDump, tiersRemaining));
-    }
-
-    function test_tiersOf_emptyArrayIfNoInitializedTiers(uint256 size) public {
-        // Initialize a hook without default tiers.
-        JB721TiersHook hook = _initHookDefaultTiers(0);
-
-        // Try to get `size` tiers
-        JB721Tier[] memory intialTiers = hook.STORE().tiersOf(address(hook), new uint256[](0), false, 0, size);
-
-        // Check: does the array have a length of 0?
-        assertEq(intialTiers.length, 0, "Length mismatch.");
-    }
-
-    function test_setDiscountPercentOf_revertIfCannotIncreaseDiscount() public {
-        // Initial tier config and data.
-        JB721TierConfig[] memory tierConfigs = new JB721TierConfig[](1);
-        tierConfigs[0] = JB721TierConfig({
-            price: 10,
-            initialSupply: uint32(100),
-            votingUnits: uint16(0),
-            reserveFrequency: uint16(0),
-            reserveBeneficiary: reserveBeneficiary,
-            encodedIPFSUri: tokenUris[0],
-            category: uint24(100),
-            discountPercent: uint8(0),
-            flags: JB721TierConfigFlags({
-                allowOwnerMint: false,
-                useReserveBeneficiaryAsDefault: false,
-                transfersPausable: false,
-                useVotingUnits: true,
-                cantBeRemoved: true,
-                cantIncreaseDiscountPercent: true,
-                cantBuyWithCredits: false
-            }),
-            splitPercent: 0,
-            splits: new JBSplit[](0)
-        });
-        //  Deploy the hook and its store with the initial tiers.
-        vm.etch(hook_i, address(hook).code);
-        JB721TiersHook hook = JB721TiersHook(hook_i);
-        hook.initialize(
-            projectId,
-            name,
-            symbol,
-            baseUri,
-            IJB721TokenUriResolver(mockTokenUriResolver),
-            contractUri,
-            JB721InitTiersConfig({
-                tiers: tierConfigs, currency: uint32(uint160(JBConstants.NATIVE_TOKEN)), decimals: 18
-            }),
-            JB721TiersHookFlags({
-                    preventOverspending: false,
-                    issueTokensForSplits: false,
-                    noNewTiersWithReserves: false,
-                    noNewTiersWithVotes: false,
-                    noNewTiersWithOwnerMinting: true
-                })
-        );
-        hook.transferOwnership(owner);
-
-        // Expect the `setDiscountPercentOf` call to revert because of the flag.
-        vm.expectRevert(
-            abi.encodeWithSelector(
-                JB721TiersHookStore.JB721TiersHookStore_DiscountPercentIncreaseNotAllowed.selector, 100, 0
-            )
-        );
-        vm.prank(owner);
-        // Attempt to increase the discount of the first tier to 100%
-        hook.setDiscountPercentOf(1, 100);
-    }
-
-    function test_setDiscountPercentsOf_revertIfCannotIncreaseDiscounts() public {
-        // Initial tier config and data.
-        JB721TierConfig[] memory initialConfig = new JB721TierConfig[](2);
-        initialConfig[0] = JB721TierConfig({
-            price: 10,
-            initialSupply: uint32(100),
-            votingUnits: uint16(0),
-            reserveFrequency: uint16(0),
-            reserveBeneficiary: reserveBeneficiary,
-            encodedIPFSUri: tokenUris[0],
-            category: uint24(100),
-            discountPercent: uint8(0),
-            flags: JB721TierConfigFlags({
-                allowOwnerMint: false,
-                useReserveBeneficiaryAsDefault: false,
-                transfersPausable: false,
-                useVotingUnits: true,
-                cantBeRemoved: true,
-                cantIncreaseDiscountPercent: true,
-                cantBuyWithCredits: false
-            }),
-            splitPercent: 0,
-            splits: new JBSplit[](0)
-        });
-        initialConfig[1] = JB721TierConfig({
-            price: 10,
-            initialSupply: uint32(100),
-            votingUnits: uint16(0),
-            reserveFrequency: uint16(0),
-            reserveBeneficiary: reserveBeneficiary,
-            encodedIPFSUri: tokenUris[0],
-            category: uint24(100),
-            discountPercent: uint8(0),
-            flags: JB721TierConfigFlags({
-                allowOwnerMint: false,
-                useReserveBeneficiaryAsDefault: false,
-                transfersPausable: false,
-                useVotingUnits: true,
-                cantBeRemoved: true,
-                cantIncreaseDiscountPercent: false,
-                cantBuyWithCredits: false
-            }),
-            splitPercent: 0,
-            splits: new JBSplit[](0)
-        });
-
-        //  Deploy the hook and its store with the initial tiers.
-        vm.etch(hook_i, address(hook).code);
-        JB721TiersHook hook = JB721TiersHook(hook_i);
-        hook.initialize(
-            projectId,
-            name,
-            symbol,
-            baseUri,
-            IJB721TokenUriResolver(mockTokenUriResolver),
-            contractUri,
-            JB721InitTiersConfig({
-                tiers: initialConfig, currency: uint32(uint160(JBConstants.NATIVE_TOKEN)), decimals: 18
-            }),
-            JB721TiersHookFlags({
-                preventOverspending: false,
-                issueTokensForSplits: false,
-                noNewTiersWithReserves: false,
-                noNewTiersWithVotes: false,
-                noNewTiersWithOwnerMinting: true
-            })
-        );
-        hook.transferOwnership(owner);
-
-        // Build calldata for increasing multiple tier discounts at once.
-        JB721TiersSetDiscountPercentConfig[] memory discountCalldata = new JB721TiersSetDiscountPercentConfig[](2);
-        discountCalldata[0] = JB721TiersSetDiscountPercentConfig({
-            tierId: 1,
-            discountPercent: 100 // invalid
-        });
-
-        discountCalldata[1] = JB721TiersSetDiscountPercentConfig({
-            tierId: 2,
-            discountPercent: 100 // valid
-        });
-
-        // Expect the `setDiscountPercentsOf` call to revert because of the flag.
-        vm.expectRevert(
-            abi.encodeWithSelector(
-                JB721TiersHookStore.JB721TiersHookStore_DiscountPercentIncreaseNotAllowed.selector, 100, 0
-            )
-        );
-        vm.prank(owner);
-        hook.setDiscountPercentsOf(discountCalldata);
-    }
-}