Nucypher
/
nucypher
mirror of https://github.com/nucypher/nucypher.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Apply suggestions from code review #1544 

Co-Authored-By: derekpierre <derek.pierre@gmail.com>
pull/1544/head
vzotova 2019-12-24 13:38:46 +03:00
parent 1cf543f0f1
commit 486447068b
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nucypher/blockchain/eth/actors.py
View File

@ -813,7 +813,7 @@ class Staker(NucypherTokenActor):
@only_me
@save_receipt
def _set_restaking_value(self, value: bool) -> dict:
def _set_restaking(self, value: bool) -> dict:
if self.is_contract:
receipt = self.preallocation_escrow_agent.set_restaking(value=value)
else:
@ -821,7 +821,7 @@ class Staker(NucypherTokenActor):
return receipt
def enable_restaking(self) -> dict:
receipt = self._set_restaking_value(value=True)
receipt = self._set_restaking(value=True)
return receipt
@only_me
@ -844,7 +844,7 @@ class Staker(NucypherTokenActor):
return status
def disable_restaking(self) -> dict:
receipt = self._set_restaking_value(value=False)
receipt = self._set_restaking(value=False)
return receipt
@property
@ -854,7 +854,7 @@ class Staker(NucypherTokenActor):
@only_me
@save_receipt
def _set_winding_down_value(self, value: bool) -> dict:
def _set_winding_down(self, value: bool) -> dict:
if self.is_contract:
receipt = self.preallocation_escrow_agent.set_winding_down(value=value)
else:
@ -862,11 +862,11 @@ class Staker(NucypherTokenActor):
return receipt
def enable_winding_down(self) -> dict:
receipt = self._set_winding_down_value(value=True)
receipt = self._set_winding_down(value=True)
return receipt
def disable_winding_down(self) -> dict:
receipt = self._set_winding_down_value(value=False)
receipt = self._set_winding_down(value=False)
return receipt
#

2
nucypher/blockchain/eth/sol/source/contracts/StakingEscrow.sol
View File

@ -332,7 +332,7 @@ contract StakingEscrow is Issuer {
}
/**
* @notice Get the value of locked tokens for active stakersdin (getCurrentPeriod() + _periods) period
* @notice Get the value of locked tokens for active stakers in (getCurrentPeriod() + _periods) period
* as well as stakers and their locked tokens
* @param _periods Amount of periods for locked tokens calculation
* @param _startIndex Start index for looking in stakers array

5
nucypher/cli/painting.py
View File

@ -587,10 +587,7 @@ def paint_stakers(emitter, stakers: List[str], staking_agent, policy_agent) -> N
emitter.echo(f"{tab} {'Re-staking:':10} Yes (Unlocked)")
else:
emitter.echo(f"{tab} {'Re-staking:':10} No")
if is_winding_down:
emitter.echo(f"{tab} {'Winding down:':10} Yes")
else:
emitter.echo(f"{tab} {'Winding down:':10} No")
emitter.echo(f"{tab} {'Winding down:':10} {'Yes' if is_winding_down else 'No'}")
emitter.echo(f"{tab} {'Activity:':10} ", nl=False)
if missing_confirmations == -1:
emitter.echo(f"Next period confirmed (#{last_confirmed_period})", color='green')