diff options
| author | Janos Guljas <janos@resenje.org> | 2018-09-25 22:57:31 +0800 |
|---|---|---|
| committer | Janos Guljas <janos@resenje.org> | 2018-09-25 22:57:31 +0800 |
| commit | 24349144b6c0642755569268bab56b9033743212 (patch) | |
| tree | 9d9d2b6659fd8a56512dfc807aafe4b733165ae1 /swarm/network/simulations/overlay.go | |
| parent | 7d56602391e155e2ce9ba7c261300a1804ab9972 (diff) | |
| parent | d3441ebb563439bac0837d70591f92e2c6080303 (diff) | |
| download | go-tangerine-24349144b6c0642755569268bab56b9033743212.tar go-tangerine-24349144b6c0642755569268bab56b9033743212.tar.gz go-tangerine-24349144b6c0642755569268bab56b9033743212.tar.bz2 go-tangerine-24349144b6c0642755569268bab56b9033743212.tar.lz go-tangerine-24349144b6c0642755569268bab56b9033743212.tar.xz go-tangerine-24349144b6c0642755569268bab56b9033743212.tar.zst go-tangerine-24349144b6c0642755569268bab56b9033743212.zip | |
Merge branch 'master' into max-stream-peer-servers
Diffstat (limited to 'swarm/network/simulations/overlay.go')
| -rw-r--r-- | swarm/network/simulations/overlay.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/swarm/network/simulations/overlay.go b/swarm/network/simulations/overlay.go index 9419de0c6..caf7ff1f2 100644 --- a/swarm/network/simulations/overlay.go +++ b/swarm/network/simulations/overlay.go @@ -29,7 +29,7 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/simulations" "github.com/ethereum/go-ethereum/p2p/simulations/adapters" "github.com/ethereum/go-ethereum/swarm/network" @@ -64,26 +64,26 @@ func init() { type Simulation struct { mtx sync.Mutex - stores map[discover.NodeID]*state.InmemoryStore + stores map[enode.ID]*state.InmemoryStore } func NewSimulation() *Simulation { return &Simulation{ - stores: make(map[discover.NodeID]*state.InmemoryStore), + stores: make(map[enode.ID]*state.InmemoryStore), } } func (s *Simulation) NewService(ctx *adapters.ServiceContext) (node.Service, error) { - id := ctx.Config.ID + node := ctx.Config.Node() s.mtx.Lock() - store, ok := s.stores[id] + store, ok := s.stores[node.ID()] if !ok { store = state.NewInmemoryStore() - s.stores[id] = store + s.stores[node.ID()] = store } s.mtx.Unlock() - addr := network.NewAddrFromNodeID(id) + addr := network.NewAddr(node) kp := network.NewKadParams() kp.MinProxBinSize = 2 |