diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-20 05:46:15 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-20 05:46:15 +0800 |
| commit | 000658539136645e743d83d57a8106b2a9796b93 (patch) | |
| tree | ca37fb68b6b7574d7c888968813598e68d301659 /p2p/server_test.go | |
| parent | fa4cbad315609e41d88c59ecbce7c6c6169fc57a (diff) | |
| parent | 639ac5c3daa253f36d41672165a5727d8eba207e (diff) | |
| download | dexon-000658539136645e743d83d57a8106b2a9796b93.tar dexon-000658539136645e743d83d57a8106b2a9796b93.tar.gz dexon-000658539136645e743d83d57a8106b2a9796b93.tar.bz2 dexon-000658539136645e743d83d57a8106b2a9796b93.tar.lz dexon-000658539136645e743d83d57a8106b2a9796b93.tar.xz dexon-000658539136645e743d83d57a8106b2a9796b93.tar.zst dexon-000658539136645e743d83d57a8106b2a9796b93.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'p2p/server_test.go')
| -rw-r--r-- | p2p/server_test.go | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/p2p/server_test.go b/p2p/server_test.go index aa2b3d243..c109fffb9 100644 --- a/p2p/server_test.go +++ b/p2p/server_test.go @@ -21,8 +21,12 @@ func startTestServer(t *testing.T, pf newPeerHook) *Server { ListenAddr: "127.0.0.1:0", PrivateKey: newkey(), newPeerHook: pf, - handshakeFunc: func(io.ReadWriter, *ecdsa.PrivateKey, *discover.Node) (id discover.NodeID, st []byte, err error) { - return randomID(), nil, err + setupFunc: func(fd net.Conn, prv *ecdsa.PrivateKey, our *protoHandshake, dial *discover.Node) (*conn, error) { + id := randomID() + return &conn{ + frameRW: newFrameRW(fd, msgWriteTimeout), + protoHandshake: &protoHandshake{ID: id, Version: baseProtocolVersion}, + }, nil }, } if err := server.Start(); err != nil { @@ -116,9 +120,7 @@ func TestServerBroadcast(t *testing.T) { var connected sync.WaitGroup srv := startTestServer(t, func(p *Peer) { - p.protocols = []Protocol{discard} - p.startSubprotocols([]Cap{discard.cap()}) - p.noHandshake = true + p.running = matchProtocols([]Protocol{discard}, []Cap{discard.cap()}, p.rw) connected.Done() }) defer srv.Stop() |