Skip to content

chore: rename shadowed variables (OZ N-09) #1155

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

Open
wants to merge 1 commit into
base: horizon-oz2/n08-docstrings
Choose a base branch
from
Open

chore: rename shadowed variables (OZ N-09) #1155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions packages/subgraph-service/contracts/DisputeManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,18 +104,18 @@ contract DisputeManager is
/// @inheritdoc IDisputeManager
function initialize(
address owner,
address arbitrator,
uint64 disputePeriod,
uint256 disputeDeposit,
address arbitrator_,
uint64 disputePeriod_,
uint256 disputeDeposit_,
uint32 fishermanRewardCut_,
uint32 maxSlashingCut_
) external override initializer {
__Ownable_init(owner);
__AttestationManager_init();

_setArbitrator(arbitrator);
_setDisputePeriod(disputePeriod);
_setDisputeDeposit(disputeDeposit);
_setArbitrator(arbitrator_);
_setDisputePeriod(disputePeriod_);
_setDisputeDeposit(disputeDeposit_);
_setFishermanRewardCut(fishermanRewardCut_);
_setMaxSlashingCut(maxSlashingCut_);
}
Expand Down Expand Up @@ -320,8 +320,8 @@ contract DisputeManager is
}

/// @inheritdoc IDisputeManager
function setSubgraphService(address subgraphService) external override onlyOwner {
_setSubgraphService(subgraphService);
function setSubgraphService(address subgraphService_) external override onlyOwner {
_setSubgraphService(subgraphService_);
}

/// @inheritdoc IDisputeManager
Expand Down
18 changes: 9 additions & 9 deletions packages/subgraph-service/contracts/SubgraphService.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ contract SubgraphService is
address owner,
uint256 minimumProvisionTokens,
uint32 maximumDelegationRatio,
uint256 stakeToFeesRatio
uint256 stakeToFeesRatio_
) external initializer {
__Ownable_init(owner);
__Multicall_init();
Expand All @@ -87,7 +87,7 @@ contract SubgraphService is

_setProvisionTokensRange(minimumProvisionTokens, type(uint256).max);
_setDelegationRatio(maximumDelegationRatio);
_setStakeToFeesRatio(stakeToFeesRatio);
_setStakeToFeesRatio(stakeToFeesRatio_);
}

/**
Expand All @@ -113,7 +113,7 @@ contract SubgraphService is
address indexer,
bytes calldata data
) external override onlyAuthorizedForProvision(indexer) onlyValidProvision(indexer) whenNotPaused {
(string memory url, string memory geohash, address rewardsDestination) = abi.decode(
(string memory url, string memory geohash, address rewardsDestination_) = abi.decode(
data,
(string, string, address)
);
Expand All @@ -124,8 +124,8 @@ contract SubgraphService is

// Register the indexer
indexers[indexer] = Indexer({ registeredAt: block.timestamp, url: url, geoHash: geohash });
if (rewardsDestination != address(0)) {
_setRewardsDestination(indexer, rewardsDestination);
if (rewardsDestination_ != address(0)) {
_setRewardsDestination(indexer, rewardsDestination_);
}

emit ServiceProviderRegistered(indexer, data);
Expand Down Expand Up @@ -345,8 +345,8 @@ contract SubgraphService is
}

/// @inheritdoc ISubgraphService
function setRewardsDestination(address rewardsDestination) external override {
_setRewardsDestination(msg.sender, rewardsDestination);
function setRewardsDestination(address rewardsDestination_) external override {
_setRewardsDestination(msg.sender, rewardsDestination_);
}

/// @inheritdoc ISubgraphService
Expand All @@ -365,8 +365,8 @@ contract SubgraphService is
}

/// @inheritdoc ISubgraphService
function setMaxPOIStaleness(uint256 maxPOIStaleness) external override onlyOwner {
_setMaxPOIStaleness(maxPOIStaleness);
function setMaxPOIStaleness(uint256 maxPOIStaleness_) external override onlyOwner {
_setMaxPOIStaleness(maxPOIStaleness_);
}

/// @inheritdoc ISubgraphService
Expand Down