Move all waiting list related code from staking.go to stakingWaitingList.go #3866
Conversation
mariusmihaic
changed the title
…st-from-staking # Conflicts: # vm/systemSmartContracts/staking.go
…st-from-staking # Conflicts: # vm/systemSmartContracts/staking.go
|
there seems to be some tests that are directly related to waitingList, and i think they can be moved to another test file, or maybe you already planned to handle unit tests (if needed) in another PR |
| return vmcommon.Ok | ||
| } | ||
|
|
||
| func (s *stakingSC) getTotalNumberOfRegisteredNodes(args *vmcommon.ContractCallInput) vmcommon.ReturnCode { |
There was a problem hiding this comment.
this is not old code - this can be moved back.
There was a problem hiding this comment.
Right, this is not old, it just used the waiting list, but it is not legacy. Moved it back
| return vmcommon.Ok | ||
| } | ||
|
|
||
| func (s *stakingSC) unStake(args *vmcommon.ContractCallInput) vmcommon.ReturnCode { |
There was a problem hiding this comment.
unStake should be in the base file - not here.
There was a problem hiding this comment.
maybe make a refactor - unStakeV1 and unStakeV2 -> and call them depending on flag.
There was a problem hiding this comment.
Good suggestion with unStakeV1 & unStakeV2. Applied it !
| return nil | ||
| } | ||
|
|
||
| func (s *stakingSC) unStakeAtEndOfEpoch(args *vmcommon.ContractCallInput) vmcommon.ReturnCode { |
There was a problem hiding this comment.
this again should be in the base file - this is not legacy - this will work with stakingV4 as well.
There was a problem hiding this comment.
Right, when I started this refactor, I just had in mind "files with/without waiting list", not legacy. Will move it back
| afterLastJailed bool | ||
| } | ||
|
|
||
| func (s *stakingSC) processStake(blsKey []byte, registrationData *StakedDataV2_0, addFirst bool) error { |
There was a problem hiding this comment.
make processStakeV1 and V2 - one with legacy only with v4 in mind. in v4 you need to set the registernonce - line31 and the last 2 lines - like 51 and 52.
There was a problem hiding this comment.
Good suggestion, thank you, applied it !
| return nil | ||
| } | ||
|
|
||
| if !s.flagStakingV4.IsSet() { |
There was a problem hiding this comment.
this is not needed - this is duplicated check
There was a problem hiding this comment.
Good catch, deleted it, thank you
staking.gowhich is related to the staking queue/waiting list, which is going to be obsolete since staking v4 has been moved to a new file:stakingWaitingList.go