Skip to content

Avoid local variable shadowing #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: Merge develop 1.1.0 into main
merged 2 commits into from
Mar 21, 2025
Merged

Avoid local variable shadowing #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c38c2c
Avoid local variable shadowing
zajck Mar 20, 2025
9fc6c55
Merge branch 'develop-1.1.0' into 422-local-variable-shadowing
zajck Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions contracts/protocol/facets/Entity.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,12 +473,9 @@ contract EntityFacet is Context, EntityErrors, Access, IEntityEvents {
*
* @param _sellerId - the seller's entity ID
* @param _facilitatorId - the facilitator's entity ID
* @return isSellersFacilitator - the facilitator's status
* @return status - the facilitator's status
*/
function isSellersFacilitator(
uint256 _sellerId,
uint256 _facilitatorId
) external view returns (bool isSellersFacilitator) {
function isSellersFacilitator(uint256 _sellerId, uint256 _facilitatorId) external view returns (bool status) {
return FermionStorage.protocolLookups().sellerLookups[_sellerId].isSellersFacilitator[_facilitatorId];
}

Expand All @@ -497,12 +494,12 @@ contract EntityFacet is Context, EntityErrors, Access, IEntityEvents {
*
* @param _sellerId - the seller's entity ID
* @param _royaltyRecipientId - the royalty recipient's entity ID
* @return isSellersRoyaltyRecipient - the royalty recipient's status
* @return status - the royalty recipient's status
*/
function isSellersRoyaltyRecipient(
uint256 _sellerId,
uint256 _royaltyRecipientId
) external view returns (bool isSellersRoyaltyRecipient) {
) external view returns (bool status) {
return FermionStorage.protocolLookups().sellerLookups[_sellerId].isSellersRoyaltyRecipient[_royaltyRecipientId];
}

Expand Down
8 changes: 4 additions & 4 deletions contracts/protocol/facets/Verification.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,14 +573,14 @@ contract VerificationFacet is Context, Access, FundsManager, EIP712, Verificatio
* @param _tokenId - the token ID
* @param _buyerPercent - the percentage the buyer will receive
* @param _metadataURIDigest - keccak256 of the revised metadata URI
* @param _msgSender - the caller
* @param _caller - the caller
* @param _otherSigner - the other party's address (0 if not present)
*/
function submitProposalInternal(
uint256 _tokenId,
uint16 _buyerPercent,
bytes32 _metadataURIDigest,
address _msgSender,
address _caller,
address _otherSigner
) internal notPaused(FermionTypes.PausableRegion.Verification) nonReentrant {
if (_buyerPercent > HUNDRED_PERCENT) revert FermionGeneralErrors.InvalidPercentage(_buyerPercent);
Expand All @@ -605,7 +605,7 @@ contract VerificationFacet is Context, Access, FundsManager, EIP712, Verificatio
initialBuyer = IFermionFNFT(pl.offerLookups[offerId].fermionFNFTAddress).ownerOf(_tokenId);
tokenLookups.initialBuyer = initialBuyer;
}
if (_msgSender == initialBuyer) {
if (_caller == initialBuyer) {
tokenLookups.buyerSplitProposal = _buyerPercent;

splitProposal.buyer = _buyerPercent;
Expand All @@ -621,7 +621,7 @@ contract VerificationFacet is Context, Access, FundsManager, EIP712, Verificatio
}
} else {
// check the caller is the seller
EntityLib.validateSellerAssistantOrFacilitator(offer.sellerId, offer.facilitatorId, _msgSender);
EntityLib.validateSellerAssistantOrFacilitator(offer.sellerId, offer.facilitatorId, _caller);

tokenLookups.sellerSplitProposal = _buyerPercent;
splitProposal.seller = _buyerPercent;
Expand Down
Loading