adapt validate bucket split

iotexproject · Jan 12, 2024 · 57e706b · 57e706b
1 parent eb2ef67
commit 57e706b
Showing 1 changed file with 23 additions and 11 deletions.
diff --git a/action/protocol/staking/handler_candidate_endorsement.go b/action/protocol/staking/handler_candidate_endorsement.go
@@ -63,7 +63,7 @@ func (p *Protocol) endorseCandidate(ctx context.Context, csm CandidateStateManag
 func (p *Protocol) unEndorseCandidate(ctx context.Context, csm CandidateStateManager, esm *EndorsementStateManager, caller address.Address, bucket *VoteBucket, cand *Candidate) error {
  blkCtx := protocol.MustGetBlockCtx(ctx)
 
- if err := p.validateUnEndorse(ctx, csm, esm, caller, bucket); err != nil {
+ if err := p.validateUnEndorse(ctx, esm, caller, bucket); err != nil {
  return err
  }
  if err := esm.Put(bucket.Index, &Endorsement{
@@ -75,17 +75,29 @@ func (p *Protocol) unEndorseCandidate(ctx context.Context, csm CandidateStateMan
 }
 
 func (p *Protocol) validateEndorse(ctx context.Context, csm CandidateStateManager, esm *EndorsementStateManager, caller address.Address, bucket *VoteBucket, cand *Candidate) ReceiptError {
- validators := []bucketValidator{
- withBucketOwner(caller),
- withBucketMinAmount(p.config.RegistrationConsts.MinSelfStake),
- withBucketStake(true),
- withBucketCandidate(cand.Owner),
- withBucketSelfStaked(false),
- withBucketEndorsed(false),
+ blkCtx := protocol.MustGetBlockCtx(ctx)
+ if err := validateBucketOwner(bucket, caller); err != nil {
+ return err
+ }
+ if err := validateBucketMinAmount(bucket, p.config.RegistrationConsts.MinSelfStake); err != nil {
+ return err
  }
- return validateBucket(ctx, csm, esm, bucket, validators...)
+ if err := validateBucketStake(bucket, true); err != nil {
+ return err
+ }
+ if err := validateBucketCandidate(bucket, cand.Owner); err != nil {
+ return err
+ }
+ if err := validateBucketSelfStake(csm, bucket, false); err != nil {
+ return err
+ }
+ return validateBucketEndorsement(esm, bucket, false, blkCtx.BlockHeight)
 }
 
-func (p *Protocol) validateUnEndorse(ctx context.Context, csm CandidateStateManager, esm *EndorsementStateManager, caller address.Address, bucket *VoteBucket) ReceiptError {
- return validateBucket(ctx, csm, esm, bucket, withBucketOwner(caller), withBucketEndorsed(true))
+func (p *Protocol) validateUnEndorse(ctx context.Context, esm *EndorsementStateManager, caller address.Address, bucket *VoteBucket) ReceiptError {
+ blkCtx := protocol.MustGetBlockCtx(ctx)
+ if err := validateBucketOwner(bucket, caller); err != nil {
+ return err
+ }
+ return validateBucketEndorsement(esm, bucket, true, blkCtx.BlockHeight)
 }