From 38864f84adf466af2317afdbe01fb57f970ceb16 Mon Sep 17 00:00:00 2001
From: Yongfeng LI <wliyongfeng@gmail.com>
Date: Mon, 26 Mar 2018 15:15:14 +0800
Subject: [PATCH] improve some code (#482)

---
 node/node.go             | 16 ++++++++--------
 protocol/bc/types/map.go | 13 +++++++++++--
 protocol/block.go        |  9 ++++++---
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/node/node.go b/node/node.go
index 904fde9c..dc8d131f 100755
--- a/node/node.go
+++ b/node/node.go
@@ -202,13 +202,11 @@ func initOrRecoverAccount(hsm *pseudohsm.HSM, wallet *w.Wallet) error {
 }
 
 // Lanch web broser or not
-func lanchWebBroser(lanch bool) {
-	if lanch {
-		log.Info("Launching System Browser with :", webAddress)
-		if err := browser.Open(webAddress); err != nil {
-			log.Error(err.Error())
-			return
-		}
+func lanchWebBroser() {
+	log.Info("Launching System Browser with :", webAddress)
+	if err := browser.Open(webAddress); err != nil {
+		log.Error(err.Error())
+		return
 	}
 }
 
@@ -243,7 +241,9 @@ func (n *Node) OnStart() error {
 	}
 
 	n.initAndstartApiServer()
-	lanchWebBroser(!n.config.Web.Closed)
+	if !n.config.Web.Closed {
+		lanchWebBroser()
+	}
 
 	return nil
 }
diff --git a/protocol/bc/types/map.go b/protocol/bc/types/map.go
index 8e648477..de546c96 100644
--- a/protocol/bc/types/map.go
+++ b/protocol/bc/types/map.go
@@ -146,7 +146,7 @@ func mapTx(tx *TxData) (headerID bc.Hash, hdr *bc.TxHeader, entryMap map[bc.Hash
 			assetdefhash := hashData(oldIss.AssetDefinition)
 			iss := bc.NewIssuance(&anchorID, &val, uint64(i))
 			iss.WitnessAssetDefinition = &bc.AssetDefinition{
-				Data:           &assetdefhash,
+				Data: &assetdefhash,
 				IssuanceProgram: &bc.Program{
 					VmVersion: oldIss.VMVersion,
 					Code:      oldIss.IssuanceProgram,
@@ -235,7 +235,16 @@ func mapTx(tx *TxData) (headerID bc.Hash, hdr *bc.TxHeader, entryMap map[bc.Hash
 }
 
 func mapBlockHeader(old *BlockHeader) (bhID bc.Hash, bh *bc.BlockHeader) {
-	bh = bc.NewBlockHeader(old.Version, old.Height, &old.PreviousBlockHash, old.Timestamp, &old.TransactionsMerkleRoot, &old.TransactionStatusHash, old.Nonce, old.Bits)
+	bh = bc.NewBlockHeader(
+		old.Version,
+		old.Height,
+		&old.PreviousBlockHash,
+		old.Timestamp,
+		&old.TransactionsMerkleRoot,
+		&old.TransactionStatusHash,
+		old.Nonce,
+		old.Bits,
+	)
 	bhID = bc.EntryID(bh)
 	return
 }
diff --git a/protocol/block.go b/protocol/block.go
index 8c6e7c9f..52605756 100755
--- a/protocol/block.go
+++ b/protocol/block.go
@@ -130,7 +130,11 @@ func (c *Chain) reorganizeChain(block *types.Block) error {
 
 // SaveBlock will validate and save block into storage
 func (c *Chain) SaveBlock(block *types.Block) error {
-	preBlock, _ := c.GetBlockByHash(&block.PreviousBlockHash)
+	preBlock, err := c.GetBlockByHash(&block.PreviousBlockHash)
+	if err != nil {
+		return err
+	}
+
 	blockEnts := types.MapBlock(block)
 	prevEnts := types.MapBlock(preBlock)
 
@@ -147,8 +151,7 @@ func (c *Chain) SaveBlock(block *types.Block) error {
 		return err
 	}
 
-	blockHash := block.Hash()
-	log.WithFields(log.Fields{"height": block.Height, "hash": blockHash.String()}).Info("Block saved on disk")
+	log.WithFields(log.Fields{"height": block.Height, "hash": block.Hash().String()}).Info("Block saved on disk")
 	return nil
 }
 
-- 
2.11.0