Merge pull request #1475 from irisnet/develop

R4R: merge develop to master
irisnet · Jul 17, 2020 · b91ae6a · b91ae6a
2 parents da68dc5 + 80b957a
commit b91ae6a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/backend/lcd/tendermint.go b/backend/lcd/tendermint.go
@@ -344,12 +344,10 @@ func Block(height int64) (result BlockVo) {
 	url := fmt.Sprintf(UrlBlock, conf.Get().Hub.LcdUrl, height)
 	resBytes, err := utils.Get(url)
 	if err != nil {
-		logger.Error("Block error", logger.Int64("height", height))
 		return result
 	}
 
 	if err := json.Unmarshal(resBytes, &result); err != nil {
-		logger.Error("Block error", logger.String("err", err.Error()))
 		return result
 	}
 	return result
@@ -359,12 +357,10 @@ func BlockLatest() (result BlockVo) {
 	url := fmt.Sprintf(UrlBlockLatest, conf.Get().Hub.LcdUrl)
 	resBytes, err := utils.Get(url)
 	if err != nil {
-		logger.Error("BlockLatest error", logger.String("err", err.Error()))
 		return result
 	}
 
 	if err := json.Unmarshal(resBytes, &result); err != nil {
-		logger.Error("BlockLatest error", logger.String("err", err.Error()))
 		return result
 	}
 	return result
@@ -374,12 +370,10 @@ func ValidatorSet(height int64) (result ValidatorSetVo) {
 	url := fmt.Sprintf(UrlValidatorSet, conf.Get().Hub.LcdUrl, height)
 	resBytes, err := utils.Get(url)
 	if err != nil {
-		logger.Error("BlockLatest error", logger.String("err", err.Error()))
 		return result
 	}
 
 	if err := json.Unmarshal(resBytes, &result); err != nil {
-		logger.Error("BlockLatest error", logger.String("err", err.Error()))
 		return result
 	}
 	return result
@@ -389,12 +383,10 @@ func LatestValidatorSet() (result ValidatorSetVo) {
 	url := fmt.Sprintf(UrlValidatorSetLatest, conf.Get().Hub.LcdUrl)
 	resBytes, err := utils.Get(url)
 	if err != nil {
-		logger.Error("BlockLatest error", logger.String("err", err.Error()))
 		return result
 	}
 
 	if err := json.Unmarshal(resBytes, &result); err != nil {
-		logger.Error("BlockLatest error", logger.String("err", err.Error()))
 		return result
 	}
 	return result
@@ -405,12 +397,10 @@ func BlockResult(height int64) (result BlockResultVo) {
 	url := fmt.Sprintf(UrlBlocksResult, conf.Get().Hub.LcdUrl, height)
 	resBytes, err := utils.Get(url)
 	if err != nil {
-		logger.Error("BlockResult error", logger.String("err", err.Error()))
 		return result
 	}
 
 	if err := json.Unmarshal(resBytes, &result); err != nil {
-		logger.Error("BlockResult error", logger.String("err", err.Error()))
 		return result
 	}
 	return result
@@ -421,12 +411,10 @@ func BlockCoinFlow(txhash string) (result BlockCoinFlowVo) {
 	url := fmt.Sprintf(UrlTxsTxHash, conf.Get().Hub.LcdUrl, txhash)
 	resBytes, err := utils.Get(url)
 	if err != nil {
-		logger.Error("BlockCoinFlow error", logger.String("err", err.Error()))
 		return result
 	}
 
 	if err := json.Unmarshal(resBytes, &result); err != nil {
-		logger.Error("BlockCoinFlow  Unmarshal error", logger.String("err", err.Error()))
 		return result
 	}
 	return result

diff --git a/backend/rest/controller/home.go b/backend/rest/controller/home.go
@@ -36,6 +36,9 @@ func RegisterHome(r *mux.Router) error {
 func registerNavigationBar(r *mux.Router) error {
 	doApi(r, types.UrlRegisterNavigationBar, "GET", func(request vo.IrisReq) interface{} {
 		var block = lcd.BlockLatest()
+		if block.BlockMeta.Header.Height == "" {
+			return nil
+		}
 		var height, ok = utils.ParseInt(block.BlockMeta.Header.Height)
 		if !ok {
 			panic(types.CodeNotFound)