Merge branch 'branch_dev_hugo' of github.com:Hugo-Huang/plugin into branch_dev_hugo

plugin/consensus/tendermint/peer_set.go

@@ -537,7 +537,7 @@ FOR_LOOP:
 						tendermintlog.Debug("Receiving vote", "vote-height", vote.Height, "peerip", pc.ip.String())
 						pc.state.SetHasVote(vote)
 					} else if pkt.TypeID == ttypes.ProposalBlockID {
-						block := &ttypes.TendermintBlock{TendermintBlock:realMsg.(*tmtypes.TendermintBlock)}
+						block := &ttypes.TendermintBlock{TendermintBlock: realMsg.(*tmtypes.TendermintBlock)}
 						tendermintlog.Debug("Receiving proposal block", "block-height", block.Header.Height, "peerip", pc.ip.String())
 						pc.state.SetHasProposalBlock(block)
 					}

plugin/dapp/valnode/executor/exec.go

@@ -10,11 +10,11 @@ import (
 )
 
 func (val *ValNode) Exec_Node(node *pty.ValNode, tx *types.Transaction, index int) (*types.Receipt, error) {
-	receipt := &types.Receipt{Ty:types.ExecOk, KV:nil, Logs:nil}
+	receipt := &types.Receipt{Ty: types.ExecOk, KV: nil, Logs: nil}
 	return receipt, nil
 }
 
 func (val *ValNode) Exec_BlockInfo(blockInfo *pty.TendermintBlockInfo, tx *types.Transaction, index int) (*types.Receipt, error) {
-	receipt := &types.Receipt{Ty:types.ExecOk, KV:nil, Logs:nil}
+	receipt := &types.Receipt{Ty: types.ExecOk, KV: nil, Logs: nil}
 	return receipt, nil
 }