gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cmd, eth, les, mobile: make networkid uint64 everywhere

Browse Source
This commit is contained in:
Péter Szilágyi
2017-04-25 14:31:15 +03:00
parent ba3bcd16a6
commit e61035c5a3
17 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
les/peer.go
View File

@ -48,8 +48,8 @@ type peer struct {
rw p2p.MsgReadWriter
version int // Protocol version negotiated
network int // Network ID being on
version int // Protocol version negotiated
network uint64 // Network ID being on
id string
@ -69,7 +69,7 @@ type peer struct {
fcCosts requestCostTable
}
func newPeer(version, network int, p *p2p.Peer, rw p2p.MsgReadWriter) *peer {
func newPeer(version int, network uint64, p *p2p.Peer, rw p2p.MsgReadWriter) *peer {
id := p.ID()
return &peer{
@ -384,7 +384,7 @@ func (p *peer) Handshake(td *big.Int, head common.Hash, headNum uint64, genesis
if rGenesis != genesis {
return errResp(ErrGenesisBlockMismatch, "%x (!= %x)", rGenesis[:8], genesis[:8])
}
if int(rNetwork) != p.network {
if rNetwork != p.network {
return errResp(ErrNetworkIdMismatch, "%d (!= %d)", rNetwork, p.network)
}
if int(rVersion) != p.version {