aboutsummaryrefslogtreecommitdiffstats
path: root/peer.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-01-22 06:27:08 +0800
committerobscuren <geffobscura@gmail.com>2014-01-22 06:27:08 +0800
commit3616080db46931202003157bacf10748008bebc0 (patch)
treea2004c7c4c8f6c91999b734b75a57ac31b04cb97 /peer.go
parente47230f82da93ef0110faa76211b9b6f13b1060b (diff)
downloaddexon-3616080db46931202003157bacf10748008bebc0.tar
dexon-3616080db46931202003157bacf10748008bebc0.tar.gz
dexon-3616080db46931202003157bacf10748008bebc0.tar.bz2
dexon-3616080db46931202003157bacf10748008bebc0.tar.lz
dexon-3616080db46931202003157bacf10748008bebc0.tar.xz
dexon-3616080db46931202003157bacf10748008bebc0.tar.zst
dexon-3616080db46931202003157bacf10748008bebc0.zip
Added synchronisation of transactions across remote pools
Diffstat (limited to 'peer.go')
-rw-r--r--peer.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/peer.go b/peer.go
index 0f3422826..207f9e59f 100644
--- a/peer.go
+++ b/peer.go
@@ -62,7 +62,7 @@ func NewOutboundPeer(addr string, server *Server) *Peer {
server: server,
inbound: false,
connected: 0,
- disconnect: 1,
+ disconnect: 0,
}
// Set up the connection in another goroutine so we don't block the main thread
@@ -169,12 +169,12 @@ out:
// Version message
p.handleHandshake(msg)
case ethwire.MsgBlockTy:
- err := p.server.blockManager.ProcessBlock(ethutil.NewBlock(ethutil.Encode(msg.Data)))
+ err := p.server.blockManager.ProcessBlock(ethutil.NewBlock(msg.Data))
if err != nil {
log.Println(err)
}
case ethwire.MsgTxTy:
- p.server.txPool.QueueTransaction(ethutil.NewTransactionFromData(ethutil.Encode(msg.Data)))
+ p.server.txPool.QueueTransaction(ethutil.NewTransactionFromData(msg.Data))
case ethwire.MsgInvTy:
case ethwire.MsgGetPeersTy:
p.requestedPeerList = true