forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 15:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

p2p/simulations: return edge distance in stream update

Browse source
This commit is contained in:
Fabio Barone 2017-05-29 12:06:56 -05:00
parent 1370269a9c
commit 527d12c89a
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
p2p/simulations/network.go
View file

@ -37,8 +37,8 @@ import (
"github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/p2p/discover" "github.com/ethereum/go-ethereum/p2p/discover"
"github.com/ethereum/go-ethereum/p2p/simulations/adapters" "github.com/ethereum/go-ethereum/p2p/simulations/adapters"
"github.com/ethereum/go-ethereum/rpc"
"github.com/ethereum/go-ethereum/pot" "github.com/ethereum/go-ethereum/pot"
"github.com/ethereum/go-ethereum/rpc"
) )
type NetworkConfig struct { type NetworkConfig struct {
@ -167,9 +167,9 @@ type Conn struct {
Up bool `json:"up"` Up bool `json:"up"`
// reverse is false by default (One dialled/dropped the Other) // reverse is false by default (One dialled/dropped the Other)
Reverse bool `json:"reverse"` Reverse bool `json:"reverse"`
// A scalar distance value denoting how "far" Other is from One (Kademlia table) // A scalar distance value denoting how "far" Other is from One (Kademlia table)
Distance int `json:"distance"` Distance int `json:"distance"`
// indicates if a ControlEvent has already been fired for this connection // indicates if a ControlEvent has already been fired for this connection
controlFired bool controlFired bool
} }
@ -244,13 +244,13 @@ func (self *Network) newConn(oneID, otherID discover.NodeID) (*Conn, error) {
if other == nil { if other == nil {
return nil, fmt.Errorf("other %v does not exist", other) return nil, fmt.Errorf("other %v does not exist", other)
} }
distance, _ := pot.NewBytesVal(one.Addr(), nil).PO(pot.NewBytesVal(other.Addr(), nil), 0) distance, _ := pot.NewBytesVal(one.Addr(), nil).PO(pot.NewBytesVal(other.Addr(), nil), 0)
return &Conn{ return &Conn{
One: oneID, One: oneID,
Other: otherID, Other: otherID,
one: one, one: one,
other: other, other: other,
Distance: distance, Distance: distance,
}, nil }, nil
} }