diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-02-20 05:46:07 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-02-20 05:46:07 +0800 |
| commit | 639ac5c3daa253f36d41672165a5727d8eba207e (patch) | |
| tree | 996c510244cbde21b21a9c05ebc4f696963b5c1f /p2p/server_test.go | |
| parent | 765740b829072f9a1bbeff356377a91defd9fdd8 (diff) | |
| parent | 3719db352a3de1c7daece71895abdd871616a2aa (diff) | |
| download | dexon-639ac5c3daa253f36d41672165a5727d8eba207e.tar dexon-639ac5c3daa253f36d41672165a5727d8eba207e.tar.gz dexon-639ac5c3daa253f36d41672165a5727d8eba207e.tar.bz2 dexon-639ac5c3daa253f36d41672165a5727d8eba207e.tar.lz dexon-639ac5c3daa253f36d41672165a5727d8eba207e.tar.xz dexon-639ac5c3daa253f36d41672165a5727d8eba207e.tar.zst dexon-639ac5c3daa253f36d41672165a5727d8eba207e.zip | |
Merge pull request #352 from fjl/no-enc-handshake
p2p: disable encryption handshake, enable log events
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() |