Commit e52d8129 authored by 贾浩@五瓣科技's avatar 贾浩@五瓣科技

fix api

parent 6a9815bd
...@@ -46,6 +46,7 @@ func getWorkload(c *gin.Context) { ...@@ -46,6 +46,7 @@ func getWorkload(c *gin.Context) {
if err != nil { if err != nil {
log.WithError(err).Error("failed to get workload") log.WithError(err).Error("failed to get workload")
c.JSON(200, withError(InternalError)) c.JSON(200, withError(InternalError))
return
} }
c.JSON(200, withSuccess(ret)) c.JSON(200, withSuccess(ret))
......
...@@ -92,8 +92,11 @@ func (r *ChainRPC) GetWeiPerWorkload(timestamp uint64) (reward, workload, weiPer ...@@ -92,8 +92,11 @@ func (r *ChainRPC) GetWeiPerWorkload(timestamp uint64) (reward, workload, weiPer
} }
if big.NewInt(0).Cmp(workloadDay) == 0 || big.NewInt(0).Cmp(rewardDay) == 0 { if big.NewInt(0).Cmp(workloadDay) == 0 || big.NewInt(0).Cmp(rewardDay) == 0 {
err = errors.New("workload or reward is zero") log.WithFields(log.Fields{
return "workloadDay": workloadDay.String(),
"rewardDay": rewardDay.String(),
}).Warn("get wei per workload empty")
return big.NewInt(0), big.NewInt(0), big.NewInt(0), nil
} }
return rewardDay, workloadDay, big.NewInt(0).Quo(rewardDay, workloadDay), nil return rewardDay, workloadDay, big.NewInt(0).Quo(rewardDay, workloadDay), nil
} }
......
...@@ -163,6 +163,9 @@ func (v *Validator) GetReward(address common.Address) (reward *big.Int) { ...@@ -163,6 +163,9 @@ func (v *Validator) GetReward(address common.Address) (reward *big.Int) {
if object == nil { if object == nil {
return big.NewInt(0) return big.NewInt(0)
} }
b, _ := big.NewInt(0).SetString(object.Balance, 10) b, ok := big.NewInt(0).SetString(object.Balance, 10)
if !ok {
return big.NewInt(0)
}
return b return b
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment