Skip to content
This repository was archived by the owner on Nov 14, 2023. It is now read-only.

Commit b91ae6a

Browse files
Merge pull request #1475 from irisnet/develop
R4R: merge develop to master
2 parents da68dc5 + 80b957a commit b91ae6a

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

backend/lcd/tendermint.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -344,12 +344,10 @@ func Block(height int64) (result BlockVo) {
344344
url := fmt.Sprintf(UrlBlock, conf.Get().Hub.LcdUrl, height)
345345
resBytes, err := utils.Get(url)
346346
if err != nil {
347-
logger.Error("Block error", logger.Int64("height", height))
348347
return result
349348
}
350349

351350
if err := json.Unmarshal(resBytes, &result); err != nil {
352-
logger.Error("Block error", logger.String("err", err.Error()))
353351
return result
354352
}
355353
return result
@@ -359,12 +357,10 @@ func BlockLatest() (result BlockVo) {
359357
url := fmt.Sprintf(UrlBlockLatest, conf.Get().Hub.LcdUrl)
360358
resBytes, err := utils.Get(url)
361359
if err != nil {
362-
logger.Error("BlockLatest error", logger.String("err", err.Error()))
363360
return result
364361
}
365362

366363
if err := json.Unmarshal(resBytes, &result); err != nil {
367-
logger.Error("BlockLatest error", logger.String("err", err.Error()))
368364
return result
369365
}
370366
return result
@@ -374,12 +370,10 @@ func ValidatorSet(height int64) (result ValidatorSetVo) {
374370
url := fmt.Sprintf(UrlValidatorSet, conf.Get().Hub.LcdUrl, height)
375371
resBytes, err := utils.Get(url)
376372
if err != nil {
377-
logger.Error("BlockLatest error", logger.String("err", err.Error()))
378373
return result
379374
}
380375

381376
if err := json.Unmarshal(resBytes, &result); err != nil {
382-
logger.Error("BlockLatest error", logger.String("err", err.Error()))
383377
return result
384378
}
385379
return result
@@ -389,12 +383,10 @@ func LatestValidatorSet() (result ValidatorSetVo) {
389383
url := fmt.Sprintf(UrlValidatorSetLatest, conf.Get().Hub.LcdUrl)
390384
resBytes, err := utils.Get(url)
391385
if err != nil {
392-
logger.Error("BlockLatest error", logger.String("err", err.Error()))
393386
return result
394387
}
395388

396389
if err := json.Unmarshal(resBytes, &result); err != nil {
397-
logger.Error("BlockLatest error", logger.String("err", err.Error()))
398390
return result
399391
}
400392
return result
@@ -405,12 +397,10 @@ func BlockResult(height int64) (result BlockResultVo) {
405397
url := fmt.Sprintf(UrlBlocksResult, conf.Get().Hub.LcdUrl, height)
406398
resBytes, err := utils.Get(url)
407399
if err != nil {
408-
logger.Error("BlockResult error", logger.String("err", err.Error()))
409400
return result
410401
}
411402

412403
if err := json.Unmarshal(resBytes, &result); err != nil {
413-
logger.Error("BlockResult error", logger.String("err", err.Error()))
414404
return result
415405
}
416406
return result
@@ -421,12 +411,10 @@ func BlockCoinFlow(txhash string) (result BlockCoinFlowVo) {
421411
url := fmt.Sprintf(UrlTxsTxHash, conf.Get().Hub.LcdUrl, txhash)
422412
resBytes, err := utils.Get(url)
423413
if err != nil {
424-
logger.Error("BlockCoinFlow error", logger.String("err", err.Error()))
425414
return result
426415
}
427416

428417
if err := json.Unmarshal(resBytes, &result); err != nil {
429-
logger.Error("BlockCoinFlow Unmarshal error", logger.String("err", err.Error()))
430418
return result
431419
}
432420
return result

backend/rest/controller/home.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ func RegisterHome(r *mux.Router) error {
3636
func registerNavigationBar(r *mux.Router) error {
3737
doApi(r, types.UrlRegisterNavigationBar, "GET", func(request vo.IrisReq) interface{} {
3838
var block = lcd.BlockLatest()
39+
if block.BlockMeta.Header.Height == "" {
40+
return nil
41+
}
3942
var height, ok = utils.ParseInt(block.BlockMeta.Header.Height)
4043
if !ok {
4144
panic(types.CodeNotFound)

0 commit comments

Comments
 (0)