test(p2p): use 'asQriNodes' all over the place

qri-io · Oct 10, 2018 · da6b5a3 · da6b5a3
1 parent 14d473f
commit da6b5a3
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 35 deletions.
diff --git a/p2p/dataset_test.go b/p2p/dataset_test.go
@@ -22,11 +22,7 @@ func TestRequestDatasetInfo(t *testing.T) {
 		t.Errorf("error connecting peers: %s", err.Error())
 	}
 
-	// Convert from test nodes to non-test nodes.
-	peers := make([]*QriNode, len(testPeers))
-	for i, node := range testPeers {
-		peers[i] = node.(*QriNode)
-	}
+	peers := asQriNodes(testPeers)
 
 	refs := []repo.DatasetRef{}
 	for _, c := range peers {

diff --git a/p2p/datasets_test.go b/p2p/datasets_test.go
@@ -21,11 +21,7 @@ func TestRequestDatasetsList(t *testing.T) {
 		t.Errorf("error connecting peers: %s", err.Error())
 	}
 
-	// Convert from test nodes to non-test nodes.
-	peers := make([]*QriNode, len(testPeers))
-	for i, node := range testPeers {
-		peers[i] = node.(*QriNode)
-	}
+	peers := asQriNodes(testPeers)
 
 	t.Logf("testing RequestDatasetList message with %d peers", len(peers))
 	var wg sync.WaitGroup

diff --git a/p2p/events_test.go b/p2p/events_test.go
@@ -17,11 +17,8 @@ func TestRequestEventsList(t *testing.T) {
 		t.Errorf("error creating network: %s", err.Error())
 		return
 	}
-	// Convert from test nodes to non-test nodes.
-	peers := make([]*QriNode, len(testPeers))
-	for i, node := range testPeers {
-		peers[i] = node.(*QriNode)
-	}
+
+	peers := asQriNodes(testPeers)
 
 	for _, p := range peers {
 		p.Repo.LogEvent(repo.ETDsCreated, repo.DatasetRef{})

diff --git a/p2p/log_test.go b/p2p/log_test.go
@@ -23,11 +23,7 @@ func TestRequestDatasetLog(t *testing.T) {
 		t.Errorf("error connecting peers: %s", err.Error())
 	}
 
-	// Convert from test nodes to non-test nodes.
-	peers := make([]*QriNode, len(testPeers))
-	for i, node := range testPeers {
-		peers[i] = node.(*QriNode)
-	}
+	peers := asQriNodes(testPeers)
 
 	tc, err := dstest.NewTestCaseFromDir("testdata/tim/craigslist")
 	if err != nil {

diff --git a/p2p/ping_test.go b/p2p/ping_test.go
@@ -2,8 +2,9 @@ package p2p
 
 import (
 	"context"
-	"github.com/qri-io/qri/p2p/test"
 	"testing"
+
+	"github.com/qri-io/qri/p2p/test"
 )
 
 func TestPing(t *testing.T) {
@@ -16,10 +17,7 @@ func TestPing(t *testing.T) {
 	}
 
 	// Convert from test nodes to non-test nodes.
-	peers := make([]*QriNode, len(testPeers))
-	for i, arg := range testPeers {
-		peers[i] = arg.(*QriNode)
-	}
+	peers := asQriNodes(testPeers)
 
 	if err := p2ptest.ConnectNodes(ctx, testPeers); err != nil {
 		t.Errorf("error connecting peers: %s", err.Error())

diff --git a/p2p/profile_test.go b/p2p/profile_test.go
@@ -20,11 +20,8 @@ func TestRequestProfileConnectNodes(t *testing.T) {
 		t.Errorf("error creating network: %s", err.Error())
 		return
 	}
-	// Convert from test nodes to non-test nodes.
-	peers := make([]*QriNode, len(testPeers))
-	for i, node := range testPeers {
-		peers[i] = node.(*QriNode)
-	}
+
+	peers := asQriNodes(testPeers)
 
 	if err := p2ptest.ConnectNodes(ctx, testPeers); err != nil {
 		t.Errorf("error connecting peers: %s", err.Error())
@@ -110,11 +107,7 @@ func TestRequestProfileOneWayConnection(t *testing.T) {
 		return
 	}
 
-	// Convert from test nodes to QriNodes.
-	peers := make([]*QriNode, len(testPeers))
-	for i, node := range testPeers {
-		peers[i] = node.(*QriNode)
-	}
+	peers := asQriNodes(testPeers)
 
 	p1 := peers[0]
 	peers = peers[1:]