merge errors fixed

1 files changed, 6 insertions, 1 deletions

diff --git a/peer.go b/peer.go
index e01f11914..a0ee9dcc4 100644
--- a/peer.go
+++ b/peer.go
@@ -430,7 +430,12 @@ func (p *Peer) HandleInbound() {
 				// processing when a new block is found
 				for i := 0; i < msg.Data.Len(); i++ {
 					tx := types.NewTransactionFromValue(msg.Data.Get(i))
-					p.ethereum.TxPool().QueueTransaction(tx)
+					err := p.ethereum.TxPool().Add(tx)
+					if err != nil {
+						peerlogger.Infoln(err)
+					} else {
+						peerlogger.Infof("tx OK (%x)\n", tx.Hash()[0:4])
+					}
 				}
 			case wire.MsgGetPeersTy:
 				// Peer asked for list of connected peers