status-im
/
go-libp2p
mirror of https://github.com/status-im/go-libp2p.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1294 from rht/cleanup-tour 

Cleanup tour
This commit is contained in:
Juan Batiz-Benet 2015-05-29 16:59:17 -07:00
parent c0474823e5 1db542481a
commit 78a6ca3f0c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/secio/protocol.go
View File

@ -218,7 +218,7 @@ func (s *secureSession) runHandshake() error {
s.local.ephemeralPubKey, genSharedKey, err = ci.GenerateEKeyPair(s.local.curveT) s.local.ephemeralPubKey, genSharedKey, err = ci.GenerateEKeyPair(s.local.curveT)
// Gather corpus to sign. // Gather corpus to sign.
var selectionOut bytes.Buffer selectionOut := new(bytes.Buffer)
selectionOut.Write(proposeOutBytes) selectionOut.Write(proposeOutBytes)
selectionOut.Write(proposeInBytes) selectionOut.Write(proposeInBytes)
selectionOut.Write(s.local.ephemeralPubKey) selectionOut.Write(s.local.ephemeralPubKey)
@ -249,7 +249,7 @@ func (s *secureSession) runHandshake() error {
// get their ephemeral pub key // get their ephemeral pub key
s.remote.ephemeralPubKey = exchangeIn.GetEpubkey() s.remote.ephemeralPubKey = exchangeIn.GetEpubkey()
var selectionIn bytes.Buffer selectionIn := new(bytes.Buffer)
selectionIn.Write(proposeInBytes) selectionIn.Write(proposeInBytes)
selectionIn.Write(proposeOutBytes) selectionIn.Write(proposeOutBytes)
selectionIn.Write(s.remote.ephemeralPubKey) selectionIn.Write(s.remote.ephemeralPubKey)

8
protocol/mux_test.go
View File

@ -16,8 +16,8 @@ var testCases = map[string]string{
func TestWrite(t *testing.T) { func TestWrite(t *testing.T) {
for k, v := range testCases { for k, v := range testCases {
var buf bytes.Buffer buf := new(bytes.Buffer)
if err := WriteHeader(&buf, ID(k)); err != nil { if err := WriteHeader(buf, ID(k)); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -46,13 +46,13 @@ func TestHandler(t *testing.T) {
m.SetHandler("/ipfs/dksnafkasnfkdajfkdajfdsjadosiaaodj", h("bitswap")) m.SetHandler("/ipfs/dksnafkasnfkdajfkdajfdsjadosiaaodj", h("bitswap"))
for k, v := range testCases { for k, v := range testCases {
var buf bytes.Buffer buf := new(bytes.Buffer)
if _, err := buf.Write([]byte(v)); err != nil { if _, err := buf.Write([]byte(v)); err != nil {
t.Error(err) t.Error(err)
continue continue
} }
name, err := ReadHeader(&buf) name, err := ReadHeader(buf)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
continue continue