From af95cddd8dfbf2f90a2a2e405a709964f6471cfa Mon Sep 17 00:00:00 2001
From: Zack Scholl <zack.scholl@gmail.com>
Date: Mon, 18 Nov 2019 13:25:51 -0800
Subject: [PATCH] fix tests

---
 src/message/message_test.go |  7 ++++---
 src/tcp/tcp_test.go         | 16 ++++++++++++++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/message/message_test.go b/src/message/message_test.go
index cc4772d6..e33462a7 100644
--- a/src/message/message_test.go
+++ b/src/message/message_test.go
@@ -15,9 +15,9 @@ import (
 
 func TestMessage(t *testing.T) {
 	m := Message{Type: "message", Message: "hello, world"}
-	e, err := crypt.New(nil, nil)
+	e, salt, err := crypt.New([]byte("pass"), nil)
 	assert.Nil(t, err)
-	fmt.Println(e.Salt())
+	fmt.Println(salt)
 	b, err := Encode(e, m)
 	assert.Nil(t, err)
 	fmt.Printf("%x\n", b)
@@ -68,7 +68,8 @@ func TestSend(t *testing.T) {
 	a, err := comm.NewConnection("localhost:"+port, 10*time.Minute)
 	assert.Nil(t, err)
 	m := Message{Type: "message", Message: "hello, world"}
-	e, err := crypt.New(nil, nil)
+	e, salt, err := crypt.New([]byte("pass"), nil)
+	log.Debug(salt)
 	assert.Nil(t, err)
 
 	assert.Nil(t, Send(a, e, m))
diff --git a/src/tcp/tcp_test.go b/src/tcp/tcp_test.go
index 4e85ce02..c692f5cc 100644
--- a/src/tcp/tcp_test.go
+++ b/src/tcp/tcp_test.go
@@ -1,6 +1,7 @@
 package tcp
 
 import (
+	"bytes"
 	"testing"
 	"time"
 
@@ -23,12 +24,23 @@ func TestTCP(t *testing.T) {
 
 	// try sending data
 	assert.Nil(t, c1.Send([]byte("hello, c2")))
-	data, err := c2.Receive()
+	var data []byte
+	for {
+		data, err = c2.Receive()
+		if bytes.Equal(data, []byte{1}) {
+			continue
+		}
+	}
 	assert.Nil(t, err)
 	assert.Equal(t, []byte("hello, c2"), data)
 
 	assert.Nil(t, c2.Send([]byte("hello, c1")))
-	data, err = c1.Receive()
+	for {
+		data, err = c1.Receive()
+		if bytes.Equal(data, []byte{1}) {
+			continue
+		}
+	}
 	assert.Nil(t, err)
 	assert.Equal(t, []byte("hello, c1"), data)