From: Paladz <yzhu101@uottawa.ca>
Date: Fri, 1 Mar 2019 12:39:27 +0000 (+0800)
Subject: edit log (#1609)
X-Git-Tag: 2.0.0-alpha~89^2~23
X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=31a69d74faa12476248554e7480f443073e2348b;p=bytom%2Fbytom.git

edit log (#1609)
---

diff --git a/netsync/message.go b/netsync/message.go
index 30e8b38f..e191eb92 100644
--- a/netsync/message.go
+++ b/netsync/message.go
@@ -118,7 +118,12 @@ func (m *BlockMessage) GetBlock() (*types.Block, error) {
 }
 
 func (m *BlockMessage) String() string {
-	return fmt.Sprintf("{block_size: %d}", len(m.RawBlock))
+	block, err := m.GetBlock()
+	if err != nil {
+		return "{err: wrong message}"
+	}
+	blockHash := block.Hash()
+	return fmt.Sprintf("{block_height: %d, block_hash: %s}", block.Height, blockHash.String())
 }
 
 //GetHeadersMessage is one of the bytom msg type
@@ -332,7 +337,11 @@ func (m *TransactionMessage) GetTransaction() (*types.Tx, error) {
 }
 
 func (m *TransactionMessage) String() string {
-	return fmt.Sprintf("{tx_size: %d}", len(m.RawTx))
+	tx, err := m.GetTransaction()
+	if err != nil {
+		return "{err: wrong message}"
+	}
+	return fmt.Sprintf("{tx_size: %d, tx_hash: %s}", len(m.RawTx), tx.ID.String())
 }
 
 //MineBlockMessage new mined block msg
@@ -359,7 +368,12 @@ func (m *MineBlockMessage) GetMineBlock() (*types.Block, error) {
 }
 
 func (m *MineBlockMessage) String() string {
-	return fmt.Sprintf("{block_size: %d}", len(m.RawBlock))
+	block, err := m.GetMineBlock()
+	if err != nil {
+		return "{err: wrong message}"
+	}
+	blockHash := block.Hash()
+	return fmt.Sprintf("{block_height: %d, block_hash: %s}", block.Height, blockHash.String())
 }
 
 //FilterLoadMessage tells the receiving peer to filter the transactions according to address.
diff --git a/p2p/peer.go b/p2p/peer.go
index 5960e77d..157af7b0 100644
--- a/p2p/peer.go
+++ b/p2p/peer.go
@@ -3,6 +3,7 @@ package p2p
 import (
 	"fmt"
 	"net"
+	"reflect"
 	"strconv"
 	"time"
 
@@ -233,6 +234,7 @@ func (p *Peer) TrySend(chID byte, msg interface{}) bool {
 		"module": logModule,
 		"peer":   p.Addr(),
 		"msg":    msg,
+		"type":   reflect.TypeOf(msg),
 	}).Info("send message to peer")
 	return p.mconn.TrySend(chID, msg)
 }