Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
@BCLeFevre
BCLeFevre committed Jun 7, 2022
1 parent 27baa56 commit 6b60400
Show file tree
Hide file tree
Showing 9 changed files with 56 additions and 56 deletions.
4 changes: 2 additions & 2 deletions reference/ReferenceConsideration.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ contract ReferenceConsideration is

/**
* @notice Cancel all orders from a given offerer with a given zone in bulk
* by incrementing a counter. Note that only the offerer may
* by incrementing a counter. Note that only the offerer may
* increment the counter.
*
* @return newCounter The new counter.
Expand Down Expand Up @@ -543,7 +543,7 @@ contract ReferenceConsideration is
override
returns (bytes32 orderHash)
{
// Derive order hash by supplying order parameters along with the
// Derive order hash by supplying order parameters along with the
// counter.
// prettier-ignore
orderHash = _deriveOrderHash(
Expand Down
2 changes: 1 addition & 1 deletion reference/lib/ReferenceAssertions.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ contract ReferenceAssertions is
* @dev Internal view function to to ensure that the supplied consideration
* array length on a given set of order parameters is not less than the
* original consideration array length for that order and to retrieve
* the current counter for a given order's offerer and zone and use it
* the current counter for a given order's offerer and zone and use it
* to derive the order hash.
*
* @param orderParameters The parameters of the order to hash.
Expand Down
10 changes: 5 additions & 5 deletions reference/lib/ReferenceBasicOrderFulfiller.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ contract ReferenceBasicOrderFulfiller is ReferenceOrderValidator {
// Memory to store hashes.
BasicFulfillmentHashes memory hashes;

// Store ItemType/Token parameters in a struct in memory to avoid stack
// Store ItemType/Token parameters in a struct in memory to avoid stack
// issues.
FulfillmentItemTypes memory fulfillmentItemTypes = FulfillmentItemTypes(
orderType,
Expand Down Expand Up @@ -673,7 +673,7 @@ contract ReferenceBasicOrderFulfiller is ReferenceOrderValidator {
continue;
}

// Create a new consideration item for each additional
// Create a new consideration item for each additional
// recipient.
additionalRecipientItem = ConsiderationItem(
fulfillmentItemTypes.additionalRecipientsItemType,
Expand Down Expand Up @@ -766,7 +766,7 @@ contract ReferenceBasicOrderFulfiller is ReferenceOrderValidator {
offerItem.identifier,
offerItem.amount,
// Assembly uses OfferItem instead of SpentItem.
offerItem.amount
offerItem.amount
)
)
];
Expand Down Expand Up @@ -884,9 +884,9 @@ contract ReferenceBasicOrderFulfiller is ReferenceOrderValidator {
* @param erc20Token The ERC20 token to transfer.
* @param amount The amount of ERC20 tokens to transfer.
* @param parameters The parameters of the order.
* @param fromOfferer Whether to decrement amount from the
* @param fromOfferer Whether to decrement amount from the
* offered amount.
* @param accumulatorStruct A struct containing conduit transfer data
* @param accumulatorStruct A struct containing conduit transfer data
* and its corresponding conduitKey.
*/
function _transferERC20AndFinalize(
Expand Down
34 changes: 17 additions & 17 deletions reference/lib/ReferenceExecutor.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ contract ReferenceExecutor is ReferenceVerifiers, ReferenceTokenTransferrer {
* @param item The item to transfer including an amount and recipient.
* @param offerer The account offering the item, i.e. the from address.
* @param conduitKey A bytes32 value indicating what corresponding
* conduit, if any, to source token approvals
* conduit, if any, to source token approvals
* from. The zero hash signifies that no conduit
* should be used (and direct approvals set on
* Consideration)
Expand Down Expand Up @@ -133,11 +133,11 @@ contract ReferenceExecutor is ReferenceVerifiers, ReferenceTokenTransferrer {
* @param from The originator of the transfer.
* @param to The recipient of the transfer.
* @param amount The amount to transfer.
* @param conduitKey A bytes32 value indicating what corresponding
* @param conduitKey A bytes32 value indicating what corresponding
* conduit, if any, to source token approvals from.
* The zero hash signifies that no conduit should
* be used (and direct approvals set on Consideration).
* @param accumulatorStruct A struct containing conduit transfer data
* @param accumulatorStruct A struct containing conduit transfer data
* and its corresponding conduitKey.
*/
function _transferERC20(
Expand Down Expand Up @@ -183,11 +183,11 @@ contract ReferenceExecutor is ReferenceVerifiers, ReferenceTokenTransferrer {
* @param to The recipient of the transfer.
* @param identifier The tokenId to transfer.
* @param amount The "amount" (this value must be equal to one).
* @param conduitKey A bytes32 value indicating what corresponding
* @param conduitKey A bytes32 value indicating what corresponding
* conduit, if any, to source token approvals from.
* The zero hash signifies that no conduit should
* The zero hash signifies that no conduit should
* be used (and direct approvals set on Consideration).
* @param accumulatorStruct A struct containing conduit transfer data
* @param accumulatorStruct A struct containing conduit transfer data
* and its corresponding conduitKey.
*/
function _transferERC721(
Expand Down Expand Up @@ -236,11 +236,11 @@ contract ReferenceExecutor is ReferenceVerifiers, ReferenceTokenTransferrer {
* @param to The recipient of the transfer.
* @param identifier The tokenId to transfer.
* @param amount The amount to transfer.
* @param conduitKey A bytes32 value indicating what corresponding
* @param conduitKey A bytes32 value indicating what corresponding
* conduit, if any, to source token approvals from.
* The zero hash signifies that no conduit should
* The zero hash signifies that no conduit should
* be used (and direct approvals set on Consideration).
* @param accumulatorStruct A struct containing conduit transfer data
* @param accumulatorStruct A struct containing conduit transfer data
* and its corresponding conduitKey.
*/
function _transferERC1155(
Expand Down Expand Up @@ -283,11 +283,11 @@ contract ReferenceExecutor is ReferenceVerifiers, ReferenceTokenTransferrer {
* is "armed") and the supplied conduit key does not match the key held
* by the accumulator.
*
* @param accumulatorStruct A struct containing conduit transfer data
* @param accumulatorStruct A struct containing conduit transfer data
* and its corresponding conduitKey.
* @param conduitKey A bytes32 value indicating what corresponding
* @param conduitKey A bytes32 value indicating what corresponding
* conduit, if any, to source token approvals from.
* The zero hash signifies that no conduit should
* The zero hash signifies that no conduit should
* be used (and direct approvals set on Consideration).
*/
function _triggerIfArmedAndNotAccumulatable(
Expand All @@ -305,7 +305,7 @@ contract ReferenceExecutor is ReferenceVerifiers, ReferenceTokenTransferrer {
* the accumulator if the accumulator contains item transfers (i.e. it
* is "armed").
*
* @param accumulatorStruct A struct containing conduit transfer data
* @param accumulatorStruct A struct containing conduit transfer data
* and its corresponding conduitKey.
*/
function _triggerIfArmed(AccumulatorStruct memory accumulatorStruct)
Expand All @@ -325,7 +325,7 @@ contract ReferenceExecutor is ReferenceVerifiers, ReferenceTokenTransferrer {
* a given conduit key, supplying all accumulated item transfers. The
* accumulator will be "disarmed" and reset in the process.
*
* @param accumulatorStruct A struct containing conduit transfer data
* @param accumulatorStruct A struct containing conduit transfer data
* and its corresponding conduitKey.
*/
function _trigger(AccumulatorStruct memory accumulatorStruct) internal {
Expand All @@ -343,11 +343,11 @@ contract ReferenceExecutor is ReferenceVerifiers, ReferenceTokenTransferrer {
* that collects a series of transfers to execute against a given
* conduit in a single call.
*
* @param conduitKey A bytes32 value indicating what corresponding
* @param conduitKey A bytes32 value indicating what corresponding
* conduit, if any, to source token approvals from.
* The zero hash signifies that no conduit should
* The zero hash signifies that no conduit should
* be used (and direct approvals set on Consideration).
* @param accumulatorStruct A struct containing conduit transfer data
* @param accumulatorStruct A struct containing conduit transfer data
* and its corresponding conduitKey.
* @param itemType The type of the item to transfer.
* @param token The token to transfer.
Expand Down
20 changes: 10 additions & 10 deletions reference/lib/ReferenceFulfillmentApplier.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,14 +234,14 @@ contract ReferenceFulfillmentApplier is FulfillmentApplicationErrors {
}

/**
* @dev Internal pure function to check the indicated offer item
* @dev Internal pure function to check the indicated offer item
* matches original item.
*
* @param orderToExecute The order to compare.
* @param offer The offer to compare
* @param execution The aggregated offer item
*
* @return invalidFulfillment A boolean indicating whether the
* @return invalidFulfillment A boolean indicating whether the
* fulfillment is invalid.
*/
function _checkMatchingOffer(
Expand Down Expand Up @@ -318,7 +318,7 @@ contract ReferenceFulfillmentApplier is FulfillmentApplicationErrors {
i < offerComponents.length;
++i
) {
// Get the order index and item index of the offer
// Get the order index and item index of the offer
// component.
orderIndex = offerComponents[i].orderIndex;
itemIndex = offerComponents[i].itemIndex;
Expand All @@ -339,17 +339,17 @@ contract ReferenceFulfillmentApplier is FulfillmentApplicationErrors {
if (invalidFulfillment) {
break;
}
// Get the spent item based on the offer components
// Get the spent item based on the offer components
// item index.
offer = orderToExecute.spentItems[itemIndex];
// Update the Received Item Amount.
execution.item.amount =
execution.item.amount +
offer.amount;
// Zero out amount on original offerItem to indicate
// Zero out amount on original offerItem to indicate
// it is spent,
offer.amount = 0;
// Ensure the indicated offer item matches original
// Ensure the indicated offer item matches original
// item.
invalidFulfillment = _checkMatchingOffer(
orderToExecute,
Expand Down Expand Up @@ -415,7 +415,7 @@ contract ReferenceFulfillmentApplier is FulfillmentApplicationErrors {
}

/**
* @dev Internal pure function to check the indicated consideration item
* @dev Internal pure function to check the indicated consideration item
* matches original item.
*
* @param consideration The consideration to compare
Expand Down Expand Up @@ -501,7 +501,7 @@ contract ReferenceFulfillmentApplier is FulfillmentApplicationErrors {
i < considerationComponents.length;
++i
) {
// Get the order index and item index of the consideration
// Get the order index and item index of the consideration
// component.
potentialCandidate.orderIndex = considerationComponents[i]
.orderIndex;
Expand All @@ -515,7 +515,7 @@ contract ReferenceFulfillmentApplier is FulfillmentApplicationErrors {
if (potentialCandidate.invalidFulfillment) {
break;
}
// Get the order based on consideration components order
// Get the order based on consideration components order
// index.
orderToExecute = ordersToExecute[
potentialCandidate.orderIndex
Expand All @@ -538,7 +538,7 @@ contract ReferenceFulfillmentApplier is FulfillmentApplicationErrors {
receivedItem.amount =
receivedItem.amount +
consideration.amount;
// Zero out amount on original consideration item to
// Zero out amount on original consideration item to
// indicate it is spent
consideration.amount = 0;
// Ensure the indicated consideration item matches
Expand Down
2 changes: 1 addition & 1 deletion reference/lib/ReferenceGettersAndDerivers.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ contract ReferenceGettersAndDerivers is ReferenceConsiderationBase {
}

/**
* @dev Internal view function to derive the EIP-712 hash for a
* @dev Internal view function to derive the EIP-712 hash for a
* consideration item.
*
* @param considerationItem The consideration item to hash.
Expand Down
30 changes: 15 additions & 15 deletions reference/lib/ReferenceOrderCombiner.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ contract ReferenceOrderCombiner is
* considered valid.
*
* @param ordersToExecute The orders to execute. This is an
* explicit version of advancedOrders
* without memory optimization, that
* provides an array of spentItems and
* receivedItems for fulfillment and
* explicit version of advancedOrders
* without memory optimization, that
* provides an array of spentItems and
* receivedItems for fulfillment and
* event emission.
*
* @param criteriaResolvers An array where each element contains a
Expand Down Expand Up @@ -114,11 +114,11 @@ contract ReferenceOrderCombiner is
* items.
* @param maximumFulfilled The maximum number of orders to fulfill.
*
* @return availableOrders An array of booleans indicating if each
* @return availableOrders An array of booleans indicating if each
* order with an index corresponding to the
* index of the returned boolean was
* index of the returned boolean was
* fulfillable or not.
* @return executions An array of elements indicating the
* @return executions An array of elements indicating the
* sequence of transfers performed as part
* of matching the given orders.
*/
Expand Down Expand Up @@ -374,7 +374,7 @@ contract ReferenceOrderCombiner is
// Get the array of spentItems from the orderToExecute struct.
SpentItem[] memory spentItems = ordersToExecute[i].spentItems;

// Get the array of spent receivedItems from the
// Get the array of spent receivedItems from the
// orderToExecute struct.
ReceivedItem[] memory receivedItems = ordersToExecute[i]
.receivedItems;
Expand Down Expand Up @@ -404,10 +404,10 @@ contract ReferenceOrderCombiner is
* order formatting will cause the entire batch to fail.
*
* @param ordersToExecute The orders to execute. This is an
* explicit version of advancedOrders
* without memory optimization, that
* provides an array of spentItems and
* receivedItems for fulfillment and
* explicit version of advancedOrders
* without memory optimization, that
* provides an array of spentItems and
* receivedItems for fulfillment and
* event emission.
* Note that both the offerer and the
* fulfiller must first approve this
Expand Down Expand Up @@ -440,9 +440,9 @@ contract ReferenceOrderCombiner is
*
* @return availableOrders An array of booleans indicating if each
* order with an index corresponding to the
* index of the returned boolean was
* index of the returned boolean was
* fulfillable or not.
* @return executions An array of elements indicating the
* @return executions An array of elements indicating the
* sequence of transfers performed as part
* of matching the given orders.
*/
Expand Down Expand Up @@ -705,7 +705,7 @@ contract ReferenceOrderCombiner is
* order for the match operation to be valid.
*
* @return executions An array of elements indicating the sequence of
* transfers performed as part of matching the
* transfers performed as part of matching the
* given orders.
*/
function _matchAdvancedOrders(
Expand Down
Loading

0 comments on commit 6b60400

Please sign in to comment.