delete ErrInvalidAmount in staking

action/protocol/staking/candidate.go

@@ -70,7 +70,7 @@ func (d *Candidate) Equal(c *Candidate) bool {
 // Validate does the sanity check
 func (d *Candidate) Validate() error {
 	if d.Votes == nil {
-		return ErrInvalidAmount
+		return action.ErrInvalidAmount
 	}
 
 	if d.Name == "" {
@@ -90,7 +90,7 @@ func (d *Candidate) Validate() error {
 	}
 
 	if d.SelfStake == nil {
-		return ErrInvalidAmount
+		return action.ErrInvalidAmount
 	}
 	return nil
 }
@@ -115,7 +115,7 @@ func (d *Candidate) Collision(c *Candidate) error {
 // AddVote adds vote
 func (d *Candidate) AddVote(amount *big.Int) error {
 	if amount.Sign() < 0 {
-		return ErrInvalidAmount
+		return action.ErrInvalidAmount
 	}
 	d.Votes.Add(d.Votes, amount)
 	return nil
@@ -124,11 +124,11 @@ func (d *Candidate) AddVote(amount *big.Int) error {
 // SubVote subtracts vote
 func (d *Candidate) SubVote(amount *big.Int) error {
 	if amount.Sign() < 0 {
-		return ErrInvalidAmount
+		return action.ErrInvalidAmount
 	}
 
 	if d.Votes.Cmp(amount) == -1 {
-		return ErrInvalidAmount
+		return action.ErrInvalidAmount
 	}
 	d.Votes.Sub(d.Votes, amount)
 	return nil
@@ -137,7 +137,7 @@ func (d *Candidate) SubVote(amount *big.Int) error {
 // AddSelfStake adds self stake
 func (d *Candidate) AddSelfStake(amount *big.Int) error {
 	if amount.Sign() < 0 {
-		return ErrInvalidAmount
+		return action.ErrInvalidAmount
 	}
 	d.SelfStake.Add(d.SelfStake, amount)
 	return nil
@@ -146,11 +146,11 @@ func (d *Candidate) AddSelfStake(amount *big.Int) error {
 // SubSelfStake subtracts self stake
 func (d *Candidate) SubSelfStake(amount *big.Int) error {
 	if amount.Sign() < 0 {
-		return ErrInvalidAmount
+		return action.ErrInvalidAmount
 	}
 
 	if d.Votes.Cmp(amount) == -1 {
-		return ErrInvalidAmount
+		return action.ErrInvalidAmount
 	}
 	d.SelfStake.Sub(d.SelfStake, amount)
 	return nil
@@ -216,13 +216,13 @@ func (d *Candidate) fromProto(pb *stakingpb.Candidate) error {
 	var ok bool
 	d.Votes, ok = new(big.Int).SetString(pb.GetVotes(), 10)
 	if !ok {
-		return ErrInvalidAmount
+		return action.ErrInvalidAmount
 	}
 
 	d.SelfStakeBucketIdx = pb.GetSelfStakeBucketIdx()
 	d.SelfStake, ok = new(big.Int).SetString(pb.GetSelfStake(), 10)
 	if !ok {
-		return ErrInvalidAmount
+		return action.ErrInvalidAmount
 	}
 	return nil
 }

action/protocol/staking/handlers.go

@@ -852,7 +852,7 @@ func csmErrorToHandleError(caller string, err error) error {
 	case ErrInvalidSelfStkIndex:
 		hErr.failureStatus = iotextypes.ReceiptStatus_ErrCandidateConflict
 		return hErr
-	case ErrInvalidAmount:
+	case action.ErrInvalidAmount:
 		hErr.failureStatus = iotextypes.ReceiptStatus_ErrCandidateNotExist
 		return hErr
 	case ErrInvalidOwner:

action/protocol/staking/handlers_test.go

@@ -162,7 +162,7 @@ func TestProtocol_HandleCreateStake(t *testing.T) {
 			1,
 			time.Now(),
 			10000,
-			ErrInvalidAmount,
+			action.ErrInvalidAmount,
 			iotextypes.ReceiptStatus_Failure,
 		},
 		{
@@ -358,7 +358,7 @@ func TestProtocol_HandleCandidateRegister(t *testing.T) {
 			uint64(1000000),
 			big.NewInt(1),
 			true,
-			ErrInvalidAmount,
+			action.ErrInvalidAmount,
 			iotextypes.ReceiptStatus_Failure,
 		},
 		// invalid candidate name

action/protocol/staking/protocol.go

@@ -129,17 +129,17 @@ func NewProtocol(
 
 	minStakeAmount, ok := new(big.Int).SetString(cfg.Staking.MinStakeAmount, 10)
 	if !ok {
-		return nil, ErrInvalidAmount
+		return nil, action.ErrInvalidAmount
 	}
 
 	regFee, ok := new(big.Int).SetString(cfg.Staking.RegistrationConsts.Fee, 10)
 	if !ok {
-		return nil, ErrInvalidAmount
+		return nil, action.ErrInvalidAmount
 	}
 
 	minSelfStake, ok := new(big.Int).SetString(cfg.Staking.RegistrationConsts.MinSelfStake, 10)
 	if !ok {
-		return nil, ErrInvalidAmount
+		return nil, action.ErrInvalidAmount
 	}
 
 	// new vote reviser, revise ate greenland
@@ -231,7 +231,7 @@ func (p *Protocol) CreateGenesisStates(
 
 		selfStake, ok := new(big.Int).SetString(bc.SelfStakingTokens, 10)
 		if !ok {
-			return ErrInvalidAmount
+			return action.ErrInvalidAmount
 		}
 		bucket := NewVoteBucket(owner, owner, selfStake, 7, time.Now(), true)
 		bucketIdx, err := csm.putBucketAndIndex(bucket)

action/protocol/staking/protocol_test.go

@@ -341,7 +341,7 @@ func Test_CreateGenesisStates(t *testing.T) {
 					SelfStakingTokens: "test123",
 				},
 			},
-			"invalid staking amount",
+			"invalid amount",
 		},
 		{
 			[]genesis.BootstrapCandidate{

action/protocol/staking/receipt_log_test.go

@@ -132,7 +132,7 @@ func TestReceiptLog(t *testing.T) {
 		log.AddAddress(v.cand)
 		log.AddAddress(v.voter)
 		log.SetData(v.data)
-		r.Nil(log.Build(ctx, ErrInvalidAmount))
+		r.Nil(log.Build(ctx, action.ErrInvalidAmount))
 		r.Equal(createLog(ctx, v.name, v.cand, v.voter, v.data), log.Build(ctx, nil))
 
 		log = newReceiptLog(v.addr, v.name, true)
@@ -144,7 +144,7 @@ func TestReceiptLog(t *testing.T) {
 		for i := range v.topics {
 			postFb.Topics = append(postFb.Topics, hash.BytesToHash256(v.topics[i]))
 		}
-		r.Equal(postFb, log.Build(ctx, ErrInvalidAmount))
+		r.Equal(postFb, log.Build(ctx, action.ErrInvalidAmount))
 		r.Equal(postFb, log.Build(ctx, nil))
 	}
 }

action/protocol/staking/validations.go

@@ -16,7 +16,6 @@ import (
 
 // Errors
 var (
-	ErrInvalidAmount       = errors.New("invalid staking amount")
 	ErrInvalidOwner        = errors.New("invalid owner address")
 	ErrInvalidOperator     = errors.New("invalid operator address")
 	ErrInvalidReward       = errors.New("invalid reward address")
@@ -30,7 +29,7 @@ func (p *Protocol) validateCreateStake(ctx context.Context, act *action.CreateSt
 		return action.ErrInvalidCanName
 	}
 	if act.Amount().Cmp(p.config.MinStakeAmount) == -1 {
-		return errors.Wrap(ErrInvalidAmount, "stake amount is less than the minimum requirement")
+		return errors.Wrap(action.ErrInvalidAmount, "stake amount is less than the minimum requirement")
 	}
 	return nil
 }
@@ -68,7 +67,7 @@ func (p *Protocol) validateCandidateRegister(ctx context.Context, act *action.Ca
 	}
 
 	if act.Amount().Cmp(p.config.RegistrationConsts.MinSelfStake) < 0 {
-		return errors.Wrap(ErrInvalidAmount, "self staking amount is not valid")
+		return errors.Wrap(action.ErrInvalidAmount, "self staking amount is not valid")
 	}
 	return nil
 }

action/protocol/staking/vote_bucket.go

@@ -17,6 +17,7 @@ import (
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
+	"github.com/iotexproject/iotex-core/action"
 	"github.com/iotexproject/iotex-core/action/protocol/staking/stakingpb"
 	"github.com/iotexproject/iotex-core/blockchain/genesis"
 	"github.com/iotexproject/iotex-core/pkg/util/byteutil"
@@ -69,11 +70,11 @@ func (vb *VoteBucket) Deserialize(buf []byte) error {
 func (vb *VoteBucket) fromProto(pb *stakingpb.Bucket) error {
 	vote, ok := new(big.Int).SetString(pb.GetStakedAmount(), 10)
 	if !ok {
-		return ErrInvalidAmount
+		return action.ErrInvalidAmount
 	}
 
 	if vote.Sign() <= 0 {
-		return ErrInvalidAmount
+		return action.ErrInvalidAmount
 	}
 
 	candAddr, err := address.FromString(pb.GetCandidateAddress())