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_test.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_test.go')
| -rw-r--r-- | swarm/network_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/swarm/network_test.go b/swarm/network_test.go index 86a904339..0b57fab33 100644 --- a/swarm/network_test.go +++ b/swarm/network_test.go @@ -31,7 +31,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "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/adapters" "github.com/ethereum/go-ethereum/swarm/api" "github.com/ethereum/go-ethereum/swarm/network/simulation" @@ -234,14 +234,14 @@ type testSwarmNetworkStep struct { type file struct { addr storage.Address data string - nodeID discover.NodeID + nodeID enode.ID } // check represents a reference to a file that is retrieved // from a particular node. type check struct { key string - nodeID discover.NodeID + nodeID enode.ID } // testSwarmNetworkOptions contains optional parameters for running @@ -440,7 +440,7 @@ func retrieve( checkCount++ wg.Add(1) - go func(f file, id discover.NodeID) { + go func(f file, id enode.ID) { defer wg.Done() log.Debug("api get: check file", "node", id.String(), "key", f.addr.String(), "total files found", atomic.LoadUint64(totalFoundCount)) @@ -466,7 +466,7 @@ func retrieve( }(f, id) } - go func(id discover.NodeID) { + go func(id enode.ID) { defer totalWg.Done() wg.Wait() |