smeb_y/0g-chain
1
0
Fork 0
mirror of https://github.com/0glabs/0g-chain.git synced 2024-12-26 00:05:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: replace is zero time check (#787)

Browse Source
This commit is contained in:
Kevin Davis 2021-02-02 14:42:51 -07:00 committed by GitHub
parent 71f60ec4d9
commit 37be34b4d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 30 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x/auction/types/auctions.go
View File

@ -90,7 +90,7 @@ func (a BaseAuction) Validate() error {
if !a.Bid.IsValid() { if !a.Bid.IsValid() {
return fmt.Errorf("invalid bid: %s", a.Bid) return fmt.Errorf("invalid bid: %s", a.Bid)
} }
if a.EndTime.IsZero() || a.MaxEndTime.IsZero() { if a.EndTime.Unix() <= 0 || a.MaxEndTime.Unix() <= 0 {
return errors.New("end time cannot be zero") return errors.New("end time cannot be zero")
} }
if a.EndTime.After(a.MaxEndTime) { if a.EndTime.After(a.MaxEndTime) {

2
x/bep3/types/params.go
View File

@ -23,7 +23,7 @@ var (
DefaultMaxAmount sdk.Int = sdk.NewInt(1000000000000) // 10,000 BNB DefaultMaxAmount sdk.Int = sdk.NewInt(1000000000000) // 10,000 BNB
DefaultMinBlockLock uint64 = 220 DefaultMinBlockLock uint64 = 220
DefaultMaxBlockLock uint64 = 270 DefaultMaxBlockLock uint64 = 270
DefaultPreviousBlockTime = tmtime.Canonical(time.Unix(0, 0)) DefaultPreviousBlockTime = tmtime.Canonical(time.Unix(1, 0))
) )
// Params governance parameters for bep3 module // Params governance parameters for bep3 module

2
x/cdp/genesis.go
View File

@ -55,7 +55,7 @@ func InitGenesis(ctx sdk.Context, k Keeper, pk types.PricefeedKeeper, sk types.S
for _, gat := range gs.PreviousAccumulationTimes { for _, gat := range gs.PreviousAccumulationTimes {
k.SetInterestFactor(ctx, gat.CollateralType, gat.InterestFactor) k.SetInterestFactor(ctx, gat.CollateralType, gat.InterestFactor)
if !gat.PreviousAccumulationTime.IsZero() { if gat.PreviousAccumulationTime.Unix() > 0 {
k.SetPreviousAccrualTime(ctx, gat.CollateralType, gat.PreviousAccumulationTime) k.SetPreviousAccrualTime(ctx, gat.CollateralType, gat.PreviousAccumulationTime)
} }
} }

5
x/cdp/legacy/v0_11/types.go
View File

@ -109,6 +109,7 @@ func NewCDPWithFees(id uint64, owner sdk.AccAddress, collateral sdk.Coin, collat
} }
} }
// Validate performs stateless validation of cdp object state
func (cdp CDP) Validate() error { func (cdp CDP) Validate() error {
if cdp.ID == 0 { if cdp.ID == 0 {
return errors.New("cdp id cannot be 0") return errors.New("cdp id cannot be 0")
@ -125,7 +126,7 @@ func (cdp CDP) Validate() error {
if !cdp.AccumulatedFees.IsValid() { if !cdp.AccumulatedFees.IsValid() {
return sdkerrors.Wrapf(sdkerrors.ErrInvalidCoins, "accumulated fees %s", cdp.AccumulatedFees) return sdkerrors.Wrapf(sdkerrors.ErrInvalidCoins, "accumulated fees %s", cdp.AccumulatedFees)
} }
if cdp.FeesUpdated.IsZero() { if cdp.FeesUpdated.Unix() <= 0 {
return errors.New("cdp updated fee time cannot be zero") return errors.New("cdp updated fee time cannot be zero")
} }
if strings.TrimSpace(cdp.Type) == "" { if strings.TrimSpace(cdp.Type) == "" {
@ -631,7 +632,7 @@ func (gs GenesisState) Validate() error {
return err return err
} }
if gs.PreviousDistributionTime.IsZero() { if gs.PreviousDistributionTime.Unix() <= 0 {
return fmt.Errorf("previous distribution time not set") return fmt.Errorf("previous distribution time not set")
} }

2
x/cdp/legacy/v0_13/types.go
View File

@ -586,7 +586,7 @@ func (cdp CDP) Validate() error {
if !cdp.AccumulatedFees.IsValid() { if !cdp.AccumulatedFees.IsValid() {
return sdkerrors.Wrapf(sdkerrors.ErrInvalidCoins, "accumulated fees %s", cdp.AccumulatedFees) return sdkerrors.Wrapf(sdkerrors.ErrInvalidCoins, "accumulated fees %s", cdp.AccumulatedFees)
} }
if cdp.FeesUpdated.IsZero() { if cdp.FeesUpdated.Unix() <= 0 {
return errors.New("cdp updated fee time cannot be zero") return errors.New("cdp updated fee time cannot be zero")
} }
if strings.TrimSpace(cdp.Type) == "" { if strings.TrimSpace(cdp.Type) == "" {

2
x/cdp/types/cdp.go
View File

@ -90,7 +90,7 @@ func (cdp CDP) Validate() error {
if !cdp.AccumulatedFees.IsValid() { if !cdp.AccumulatedFees.IsValid() {
return sdkerrors.Wrapf(sdkerrors.ErrInvalidCoins, "accumulated fees %s", cdp.AccumulatedFees) return sdkerrors.Wrapf(sdkerrors.ErrInvalidCoins, "accumulated fees %s", cdp.AccumulatedFees)
} }
if cdp.FeesUpdated.IsZero() { if cdp.FeesUpdated.Unix() <= 0 {
return errors.New("cdp updated fee time cannot be zero") return errors.New("cdp updated fee time cannot be zero")
} }
if strings.TrimSpace(cdp.Type) == "" { if strings.TrimSpace(cdp.Type) == "" {

1
x/hard/alias.go
View File

@ -94,7 +94,6 @@ var (
DefaultCheckLtvIndexCount = types.DefaultCheckLtvIndexCount DefaultCheckLtvIndexCount = types.DefaultCheckLtvIndexCount
DefaultDeposits = types.DefaultDeposits DefaultDeposits = types.DefaultDeposits
DefaultMoneyMarkets = types.DefaultMoneyMarkets DefaultMoneyMarkets = types.DefaultMoneyMarkets
DefaultPreviousBlockTime = types.DefaultPreviousBlockTime
DefaultTotalBorrowed = types.DefaultTotalBorrowed DefaultTotalBorrowed = types.DefaultTotalBorrowed
DefaultTotalReserves = types.DefaultTotalReserves DefaultTotalReserves = types.DefaultTotalReserves
DefaultTotalSupplied = types.DefaultTotalSupplied DefaultTotalSupplied = types.DefaultTotalSupplied

4
x/hard/legacy/v0_11/types.go
View File

@ -142,10 +142,10 @@ func (ds DistributionSchedule) Validate() error {
if ds.RewardsPerSecond.Denom != "hard" { if ds.RewardsPerSecond.Denom != "hard" {
return fmt.Errorf("reward denom should be hard, is %s", ds.RewardsPerSecond.Denom) return fmt.Errorf("reward denom should be hard, is %s", ds.RewardsPerSecond.Denom)
} }
if ds.Start.IsZero() { if ds.Start.Unix() <= 0 {
return errors.New("reward period start time cannot be 0") return errors.New("reward period start time cannot be 0")
} }
if ds.End.IsZero() { if ds.End.Unix() <= 0 {
return errors.New("reward period end time cannot be 0") return errors.New("reward period end time cannot be 0")
} }
if ds.Start.After(ds.End) { if ds.Start.After(ds.End) {

6
x/hard/types/genesis.go
View File

@ -6,12 +6,6 @@ import (
"time" "time"
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"
tmtime "github.com/tendermint/tendermint/types/time"
)
// GenesisState default values
var (
DefaultPreviousBlockTime = tmtime.Canonical(time.Unix(0, 0))
) )
// GenesisState is the state that must be provided at genesis. // GenesisState is the state that must be provided at genesis.

10
x/incentive/legacy/v0_11/types.go
View File

@ -84,7 +84,7 @@ func (gs GenesisState) Validate() error {
if err := gs.Params.Validate(); err != nil { if err := gs.Params.Validate(); err != nil {
return err return err
} }
if gs.PreviousBlockTime.IsZero() { if gs.PreviousBlockTime.Unix() <= 0 {
return errors.New("previous block time cannot be 0") return errors.New("previous block time cannot be 0")
} }
if err := gs.RewardPeriods.Validate(); err != nil { if err := gs.RewardPeriods.Validate(); err != nil {
@ -336,10 +336,10 @@ func NewRewardPeriod(collateralType string, start time.Time, end time.Time, rewa
// Validate performs a basic check of a RewardPeriod fields. // Validate performs a basic check of a RewardPeriod fields.
func (rp RewardPeriod) Validate() error { func (rp RewardPeriod) Validate() error {
if rp.Start.IsZero() { if rp.Start.Unix() <= 0 {
return errors.New("reward period start time cannot be 0") return errors.New("reward period start time cannot be 0")
} }
if rp.End.IsZero() { if rp.End.Unix() <= 0 {
return errors.New("reward period end time cannot be 0") return errors.New("reward period end time cannot be 0")
} }
if rp.Start.After(rp.End) { if rp.Start.After(rp.End) {
@ -348,7 +348,7 @@ func (rp RewardPeriod) Validate() error {
if !rp.Reward.IsValid() { if !rp.Reward.IsValid() {
return fmt.Errorf("invalid reward amount: %s", rp.Reward) return fmt.Errorf("invalid reward amount: %s", rp.Reward)
} }
if rp.ClaimEnd.IsZero() { if rp.ClaimEnd.Unix() <= 0 {
return errors.New("reward period claim end time cannot be 0") return errors.New("reward period claim end time cannot be 0")
} }
if err := rp.ClaimMultipliers.Validate(); err != nil { if err := rp.ClaimMultipliers.Validate(); err != nil {
@ -404,7 +404,7 @@ func (cp ClaimPeriod) Validate() error {
if cp.ID == 0 { if cp.ID == 0 {
return errors.New("claim period id cannot be 0") return errors.New("claim period id cannot be 0")
} }
if cp.End.IsZero() { if cp.End.Unix() <= 0 {
return errors.New("claim period end time cannot be 0") return errors.New("claim period end time cannot be 0")
} }
if err := cp.ClaimMultipliers.Validate(); err != nil { if err := cp.ClaimMultipliers.Validate(); err != nil {

10
x/incentive/legacy/v0_9/types.go
View File

@ -77,7 +77,7 @@ func (gs GenesisState) Validate() error {
if err := gs.Params.Validate(); err != nil { if err := gs.Params.Validate(); err != nil {
return err return err
} }
if gs.PreviousBlockTime.IsZero() { if gs.PreviousBlockTime.Unix() <= 0 {
return errors.New("previous block time cannot be 0") return errors.New("previous block time cannot be 0")
} }
if err := gs.RewardPeriods.Validate(); err != nil { if err := gs.RewardPeriods.Validate(); err != nil {
@ -259,10 +259,10 @@ func NewRewardPeriod(denom string, start time.Time, end time.Time, reward sdk.Co
// Validate performs a basic check of a RewardPeriod fields. // Validate performs a basic check of a RewardPeriod fields.
func (rp RewardPeriod) Validate() error { func (rp RewardPeriod) Validate() error {
if rp.Start.IsZero() { if rp.Start.Unix() <= 0 {
return errors.New("reward period start time cannot be 0") return errors.New("reward period start time cannot be 0")
} }
if rp.End.IsZero() { if rp.End.Unix() <= 0 {
return errors.New("reward period end time cannot be 0") return errors.New("reward period end time cannot be 0")
} }
if rp.Start.After(rp.End) { if rp.Start.After(rp.End) {
@ -271,7 +271,7 @@ func (rp RewardPeriod) Validate() error {
if !rp.Reward.IsValid() { if !rp.Reward.IsValid() {
return fmt.Errorf("invalid reward amount: %s", rp.Reward) return fmt.Errorf("invalid reward amount: %s", rp.Reward)
} }
if rp.ClaimEnd.IsZero() { if rp.ClaimEnd.Unix() <= 0 {
return errors.New("reward period claim end time cannot be 0") return errors.New("reward period claim end time cannot be 0")
} }
if rp.ClaimTimeLock == 0 { if rp.ClaimTimeLock == 0 {
@ -324,7 +324,7 @@ func (cp ClaimPeriod) Validate() error {
if cp.ID == 0 { if cp.ID == 0 {
return errors.New("claim period id cannot be 0") return errors.New("claim period id cannot be 0")
} }
if cp.End.IsZero() { if cp.End.Unix() <= 0 {
return errors.New("claim period end time cannot be 0") return errors.New("claim period end time cannot be 0")
} }
if cp.TimeLock == 0 { if cp.TimeLock == 0 {

8
x/incentive/types/params.go
View File

@ -36,7 +36,7 @@ var (
DefaultMultipliers = Multipliers{} DefaultMultipliers = Multipliers{}
DefaultClaims = USDXMintingClaims{} DefaultClaims = USDXMintingClaims{}
DefaultGenesisAccumulationTimes = GenesisAccumulationTimes{} DefaultGenesisAccumulationTimes = GenesisAccumulationTimes{}
DefaultClaimEnd = tmtime.Canonical(time.Unix(0, 0)) DefaultClaimEnd = tmtime.Canonical(time.Unix(1, 0))
GovDenom = cdptypes.DefaultGovDenom GovDenom = cdptypes.DefaultGovDenom
PrincipalDenom = "usdx" PrincipalDenom = "usdx"
IncentiveMacc = kavadistTypes.ModuleName IncentiveMacc = kavadistTypes.ModuleName
@ -154,7 +154,7 @@ func validateClaimEndParam(i interface{}) error {
if !ok { if !ok {
return fmt.Errorf("invalid parameter type: %T", i) return fmt.Errorf("invalid parameter type: %T", i)
} }
if endTime.IsZero() { if endTime.Unix() <= 0 {
return fmt.Errorf("end time should not be zero") return fmt.Errorf("end time should not be zero")
} }
return nil return nil
@ -193,10 +193,10 @@ func NewRewardPeriod(active bool, collateralType string, start time.Time, end ti
// Validate performs a basic check of a RewardPeriod fields. // Validate performs a basic check of a RewardPeriod fields.
func (rp RewardPeriod) Validate() error { func (rp RewardPeriod) Validate() error {
if rp.Start.IsZero() { if rp.Start.Unix() <= 0 {
return errors.New("reward period start time cannot be 0") return errors.New("reward period start time cannot be 0")
} }
if rp.End.IsZero() { if rp.End.Unix() <= 0 {
return errors.New("reward period end time cannot be 0") return errors.New("reward period end time cannot be 0")
} }
if rp.Start.After(rp.End) { if rp.Start.After(rp.End) {

4
x/kavadist/types/params.go
View File

@ -18,7 +18,7 @@ var (
KeyPeriods = []byte("Periods") KeyPeriods = []byte("Periods")
DefaultActive = false DefaultActive = false
DefaultPeriods = Periods{} DefaultPeriods = Periods{}
DefaultPreviousBlockTime = tmtime.Canonical(time.Unix(0, 0)) DefaultPreviousBlockTime = tmtime.Canonical(time.Unix(1, 0))
GovDenom = cdptypes.DefaultGovDenom GovDenom = cdptypes.DefaultGovDenom
) )
@ -132,7 +132,7 @@ func validatePeriodsParams(i interface{}) error {
} }
prevEnd = pr.End prevEnd = pr.End
if pr.Start.IsZero() || pr.End.IsZero() { if pr.Start.Unix() <= 0 || pr.End.Unix() <= 0 {
return fmt.Errorf("start or end time cannot be zero: %s", pr) return fmt.Errorf("start or end time cannot be zero: %s", pr)
} }

2
x/pricefeed/legacy/v0_9/types.go
View File

@ -146,7 +146,7 @@ func (pp PostedPrice) Validate() error {
if pp.Price.IsNegative() { if pp.Price.IsNegative() {
return fmt.Errorf("posted price cannot be negative %s", pp.Price) return fmt.Errorf("posted price cannot be negative %s", pp.Price)
} }
if pp.Expiry.IsZero() { if pp.Expiry.Unix() <= 0 {
return errors.New("expiry time cannot be zero") return errors.New("expiry time cannot be zero")
} }
return nil return nil

2
x/pricefeed/types/market.go
View File

@ -135,7 +135,7 @@ func (pp PostedPrice) Validate() error {
if pp.Price.IsNegative() { if pp.Price.IsNegative() {
return fmt.Errorf("posted price cannot be negative %s", pp.Price) return fmt.Errorf("posted price cannot be negative %s", pp.Price)
} }
if pp.Expiry.IsZero() { if pp.Expiry.Unix() <= 0 {
return errors.New("expiry time cannot be zero") return errors.New("expiry time cannot be zero")
} }
return nil return nil

2
x/pricefeed/types/msgs.go
View File

@ -72,7 +72,7 @@ func (msg MsgPostPrice) ValidateBasic() error {
if msg.Price.IsNegative() { if msg.Price.IsNegative() {
return fmt.Errorf("price cannot be negative: %s", msg.Price.String()) return fmt.Errorf("price cannot be negative: %s", msg.Price.String())
} }
if msg.Expiry.IsZero() { if msg.Expiry.Unix() <= 0 {
return errors.New("must set an expiration time") return errors.New("must set an expiration time")
} }
return nil return nil

2
x/validator-vesting/types/genesis.go
View File

@ -39,7 +39,7 @@ func (data GenesisState) IsEmpty() bool {
// ValidateGenesis returns nil because accounts are validated by auth // ValidateGenesis returns nil because accounts are validated by auth
func ValidateGenesis(data GenesisState) error { func ValidateGenesis(data GenesisState) error {
if data.PreviousBlockTime.IsZero() { if data.PreviousBlockTime.Unix() <= 0 {
return errors.New("previous block time cannot be zero") return errors.New("previous block time cannot be zero")
} }
return nil return nil