Skip to content

fix(protocol-contracts): remove unused function parameters in staking (N-06) #1689

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
melanciani wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −7
Open

fix(protocol-contracts): remove unused function parameters in staking (N-06) #1689

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
6 changes: 3 additions & 3 deletions protocol-contracts/staking/contracts/OperatorStaking.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ contract OperatorStaking is ERC1363Upgradeable, ReentrancyGuardTransient, UUPSUp
* @param controller The controller address.
* @return Amount of shares pending redeem.
*/
function pendingRedeemRequest(uint256, address controller) public view virtual returns (uint256) {
function pendingRedeemRequest(address controller) public view virtual returns (uint256) {
OperatorStakingStorage storage $ = _getOperatorStakingStorage();
return $._redeemRequests[controller].latest() - $._redeemRequests[controller].upperLookup(Time.timestamp());
}
Expand All @@ -333,7 +333,7 @@ contract OperatorStaking is ERC1363Upgradeable, ReentrancyGuardTransient, UUPSUp
* @param controller The controller address.
* @return Amount of claimable shares.
*/
function claimableRedeemRequest(uint256, address controller) public view virtual returns (uint256) {
function claimableRedeemRequest(address controller) public view virtual returns (uint256) {
OperatorStakingStorage storage $ = _getOperatorStakingStorage();
return $._redeemRequests[controller].upperLookup(Time.timestamp()) - $._sharesReleased[controller];
}
Expand All @@ -360,7 +360,7 @@ contract OperatorStaking is ERC1363Upgradeable, ReentrancyGuardTransient, UUPSUp
* @return The maximum redeemable shares.
*/
function maxRedeem(address ownerRedeem) public view virtual returns (uint256) {
return claimableRedeemRequest(0, ownerRedeem);
return claimableRedeemRequest(ownerRedeem);
}

/**
Expand Down
8 changes: 4 additions & 4 deletions protocol-contracts/staking/test/OperatorStaking.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,13 +214,13 @@ describe('OperatorStaking', function () {
.connect(this.delegator1)
.requestRedeem(await this.mock.balanceOf(this.delegator1), this.delegator1, this.delegator1);

await expect(this.mock.pendingRedeemRequest(0, this.delegator1)).to.eventually.eq(ethers.parseEther('1'));
await expect(this.mock.claimableRedeemRequest(0, this.delegator1)).to.eventually.eq(0);
await expect(this.mock.pendingRedeemRequest(this.delegator1)).to.eventually.eq(ethers.parseEther('1'));
await expect(this.mock.claimableRedeemRequest(this.delegator1)).to.eventually.eq(0);

await time.increase(60);

await expect(this.mock.pendingRedeemRequest(0, this.delegator1)).to.eventually.eq(0);
await expect(this.mock.claimableRedeemRequest(0, this.delegator1)).to.eventually.eq(ethers.parseEther('1'));
await expect(this.mock.pendingRedeemRequest(this.delegator1)).to.eventually.eq(0);
await expect(this.mock.claimableRedeemRequest(this.delegator1)).to.eventually.eq(ethers.parseEther('1'));

await expect(this.mock.connect(this.delegator1).redeem(ethers.parseEther('1'), this.delegator1, this.delegator1))
.to.emit(this.token, 'Transfer')
Expand Down