Changes: log_test.go - whiteboxed, handshake_test.go - removed commen…

…ted test
skycoin · Jun 4, 2019 · c035c01 · c035c01
1 parent af6f71d
commit c035c01
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 30 deletions.
diff --git a/pkg/transport/handshake_test.go b/pkg/transport/handshake_test.go
@@ -199,30 +199,6 @@ func TestSettlementHandshake(t *testing.T) {
 
 }
 
-/*
-func TestSettlementHandshakeInvalidSig(t *testing.T) {
-	mockEnv := newHsMockEnv()
-
-	require.NoError(t, mockEnv.err1)
-	require.NoError(t, mockEnv.err2)
-
-	go settlementInitiatorHandshake(true)(mockEnv.m2, mockEnv.tr1) // nolint: errcheck
-	_, err := settlementResponderHandshake(mockEnv.m2, mockEnv.tr2)
-	require.Error(t, err)
-	assert.Equal(t, "Recovered pubkey does not match pubkey", err.Error())
-
-	in, out := net.Pipe()
-	tr1 := NewMockTransport(in, mockEnv.pk1, mockEnv.pk2)
-	tr2 := NewMockTransport(out, mockEnv.pk2, mockEnv.pk1)
-
-	go settlementResponderHandshake(mockEnv.m1, tr2) // nolint: errcheck
-	_, err = settlementInitiatorHandshake(true)(mockEnv.m1, tr1)
-	require.Error(t, err)
-	assert.Equal(t, "Recovered pubkey does not match pubkey", err.Error())
-
-}
-*/
-
 func TestSettlementHandshakePrivate(t *testing.T) {
 	mockEnv := newHsMockEnv()
 

diff --git a/pkg/transport/log_test.go b/pkg/transport/log_test.go
@@ -1,4 +1,4 @@
-package transport
+package transport_test
 
 import (
 	"io/ioutil"
@@ -7,17 +7,18 @@ import (
 	"testing"
 
 	"github.com/google/uuid"
+	"github.com/skycoin/skywire/pkg/transport"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
-func testTransportLogStore(t *testing.T, logStore LogStore) {
+func testTransportLogStore(t *testing.T, logStore transport.LogStore) {
 	t.Helper()
 
 	id1 := uuid.New()
-	entry1 := &LogEntry{big.NewInt(100), big.NewInt(200)}
+	entry1 := &transport.LogEntry{big.NewInt(100), big.NewInt(200)}
 	id2 := uuid.New()
-	entry2 := &LogEntry{big.NewInt(300), big.NewInt(400)}
+	entry2 := &transport.LogEntry{big.NewInt(300), big.NewInt(400)}
 
 	require.NoError(t, logStore.Record(id1, entry1))
 	require.NoError(t, logStore.Record(id2, entry2))
@@ -29,15 +30,15 @@ func testTransportLogStore(t *testing.T, logStore LogStore) {
 }
 
 func TestInMemoryTransportLogStore(t *testing.T) {
-	testTransportLogStore(t, InMemoryTransportLogStore())
+	testTransportLogStore(t, transport.InMemoryTransportLogStore())
 }
 
 func TestFileTransportLogStore(t *testing.T) {
 	dir, err := ioutil.TempDir("", "log_store")
 	require.NoError(t, err)
 	defer os.RemoveAll(dir)
 
-	ls, err := FileTransportLogStore(dir)
+	ls, err := transport.FileTransportLogStore(dir)
 	require.NoError(t, err)
 	testTransportLogStore(t, ls)
 }