OSDN Git Service
(root)
/
bytom
/
bytom-spv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8b0c70a
)
Fix markblock marktx peer null bug
author
Yahtoo Ma
<yahtoo.ma@gmail.com>
Fri, 20 Apr 2018 04:21:45 +0000
(12:21 +0800)
committer
Yahtoo Ma
<yahtoo.ma@gmail.com>
Fri, 20 Apr 2018 04:25:00 +0000
(12:25 +0800)
netsync/peer.go
patch
|
blob
|
history
diff --git
a/netsync/peer.go
b/netsync/peer.go
index
f009a43
..
f638250
100644
(file)
--- a/
netsync/peer.go
+++ b/
netsync/peer.go
@@
-353,7
+353,9
@@
func (ps *peerSet) BroadcastMinedBlock(block *types.Block) ([]*peer, error) {
abnormalPeers = append(abnormalPeers, peer)
continue
}
- ps.MarkBlock(peer.swPeer.Key, &hash)
+ if p, ok := ps.peers[peer.id]; ok {
+ p.MarkBlock(&hash)
+ }
}
return abnormalPeers, nil
}
@@
-374,7
+376,9
@@
func (ps *peerSet) BroadcastTx(tx *types.Tx) ([]*peer, error) {
abnormalPeers = append(abnormalPeers, peer)
continue
}
- ps.peers[peer.swPeer.Key].MarkTransaction(&tx.ID)
+ if p, ok := ps.peers[peer.id]; ok {
+ p.MarkTransaction(&tx.ID)
+ }
}
return abnormalPeers, nil
}