Merge 85e3c7f into 7a90628

storj · Sep 10, 2018 · c97a03b · c97a03b
2 parents 7a90628 + 85e3c7f
commit c97a03b
Show file tree

Hide file tree

Showing 9 changed files with 178 additions and 431 deletions.
diff --git a/internal/test/storage.go b/internal/test/storage.go
diff --git a/internal/test/utils.go b/internal/test/utils.go
diff --git a/pkg/node/node_test.go b/pkg/node/node_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc"
 
-	"storj.io/storj/internal/test"
+	"storj.io/storj/pkg/kademlia"
 	"storj.io/storj/pkg/provider"
 	proto "storj.io/storj/protos/overlay"
 )
@@ -26,9 +26,9 @@ func TestLookup(t *testing.T) {
 		expectedErr error
 	}{
 		{
-			self:        proto.Node{Id: test.NewNodeID(t), Address: &proto.NodeAddress{Address: ":7070"}},
+			self:        proto.Node{Id: NewNodeID(t), Address: &proto.NodeAddress{Address: ":7070"}},
 			to:          proto.Node{}, // filled after server has been started
-			find:        proto.Node{Id: test.NewNodeID(t), Address: &proto.NodeAddress{Address: ":9090"}},
+			find:        proto.Node{Id: NewNodeID(t), Address: &proto.NodeAddress{Address: ":9090"}},
 			expectedErr: nil,
 		},
 	}
@@ -37,7 +37,7 @@ func TestLookup(t *testing.T) {
 		lis, err := net.Listen("tcp", "127.0.0.1:0")
 		assert.NoError(t, err)
 
-		v.to = proto.Node{Id: test.NewNodeID(t), Address: &proto.NodeAddress{Address: lis.Addr().String()}}
+		v.to = proto.Node{Id: NewNodeID(t), Address: &proto.NodeAddress{Address: lis.Addr().String()}}
 
 		srv, mock, err := newTestServer(ctx)
 		assert.NoError(t, err)
@@ -89,3 +89,11 @@ func (mn *mockNodeServer) Query(ctx context.Context, req *proto.QueryRequest) (*
 	mn.queryCalled++
 	return &proto.QueryResponse{}, nil
 }
+
+// NewNodeID returns the string representation of a dht node ID
+func NewNodeID(t *testing.T) string {
+	id, err := kademlia.NewID()
+	assert.NoError(t, err)
+
+	return id.String()
+}