diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-06 00:21:32 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-06 00:21:32 +0800 |
| commit | ba0c41436c8a067937aa0845963f9ec3b81e7aed (patch) | |
| tree | 7bd9bbc9422353ab341f01581abeb346b5a6cacf /p2p/server_test.go | |
| parent | fabaf4f1f01db773f6c0c2e9a9499736b1a40848 (diff) | |
| parent | 215c763d53fc8e06e8c9807875eacaccf3ef45fa (diff) | |
| download | go-tangerine-ba0c41436c8a067937aa0845963f9ec3b81e7aed.tar.gz go-tangerine-ba0c41436c8a067937aa0845963f9ec3b81e7aed.tar.zst go-tangerine-ba0c41436c8a067937aa0845963f9ec3b81e7aed.zip | |
Merge branch 'p2p-handshake-2' of https://github.com/fjl/go-ethereum into fjl-p2p-handshake-2
Diffstat (limited to 'p2p/server_test.go')
| -rw-r--r-- | p2p/server_test.go | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/p2p/server_test.go b/p2p/server_test.go index c109fffb9..30447050c 100644 --- a/p2p/server_test.go +++ b/p2p/server_test.go @@ -11,6 +11,7 @@ import ( "time" "github.com/ethereum/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/crypto/sha3" "github.com/ethereum/go-ethereum/p2p/discover" ) @@ -23,8 +24,14 @@ func startTestServer(t *testing.T, pf newPeerHook) *Server { newPeerHook: pf, setupFunc: func(fd net.Conn, prv *ecdsa.PrivateKey, our *protoHandshake, dial *discover.Node) (*conn, error) { id := randomID() + rw := newRlpxFrameRW(fd, secrets{ + MAC: zero16, + AES: zero16, + IngressMAC: sha3.NewKeccak256(), + EgressMAC: sha3.NewKeccak256(), + }) return &conn{ - frameRW: newFrameRW(fd, msgWriteTimeout), + MsgReadWriter: rw, protoHandshake: &protoHandshake{ID: id, Version: baseProtocolVersion}, }, nil }, @@ -143,9 +150,7 @@ func TestServerBroadcast(t *testing.T) { // broadcast one message srv.Broadcast("discard", 0, "foo") - goldbuf := new(bytes.Buffer) - writeMsg(goldbuf, NewMsg(16, "foo")) - golden := goldbuf.Bytes() + golden := unhex("66e94d166f0a2c3b884cfa59ca34") // check that the message has been written everywhere for i, conn := range conns { |