assign public IP addresses for tests that need them

ipfs · Apr 9, 2020 · 7f97c7f · 7f97c7f
1 parent 5e1559f
commit 7f97c7f
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 18 deletions.
diff --git a/core/coreapi/test/api_test.go b/core/coreapi/test/api_test.go
@@ -65,7 +65,7 @@ func (NodeProvider) MakeAPISwarm(ctx context.Context, fullIdentity bool, n int)
 		}
 
 		c := config.Config{}
-		c.Addresses.Swarm = []string{fmt.Sprintf("/ip4/127.0.%d.1/tcp/4001", i)}
+		c.Addresses.Swarm = []string{fmt.Sprintf("/ip4/18.0.%d.1/tcp/4001", i)}
 		c.Identity = ident
 		c.Experimental.FilestoreEnabled = true
 

diff --git a/core/mock/mock.go b/core/mock/mock.go
@@ -2,6 +2,8 @@ package coremock
 
 import (
 	"context"
+	"fmt"
+	"io/ioutil"
 
 	libp2p2 "github.com/ipfs/go-ipfs/core/node/libp2p"
 
@@ -75,3 +77,24 @@ func MockCmdsCtx() (commands.Context, error) {
 		},
 	}, nil
 }
+
+func MockPublicNode(ctx context.Context, mn mocknet.Mocknet) (*core.IpfsNode, error) {
+	ds := syncds.MutexWrap(datastore.NewMapDatastore())
+	cfg, err := config.Init(ioutil.Discard, 2048)
+	if err != nil {
+		return nil, err
+	}
+	count := len(mn.Peers())
+	cfg.Addresses.Swarm = []string{
+		fmt.Sprintf("/ip4/18.0.%d.%d/tcp/4001", count>>16, count&0xFF),
+	}
+	cfg.Datastore = config.Datastore{}
+	return core.NewNode(ctx, &core.BuildCfg{
+		Online: true,
+		Repo: &repo.Mock{
+			C: *cfg,
+			D: ds,
+		},
+		Host: MockHostOption(mn),
+	})
+}
diff --git a/namesys/republisher/repub_test.go b/namesys/republisher/repub_test.go
@@ -29,10 +29,7 @@ func TestRepublish(t *testing.T) {
 
 	var nodes []*core.IpfsNode
 	for i := 0; i < 10; i++ {
-		nd, err := core.NewNode(ctx, &core.BuildCfg{
-			Online: true,
-			Host:   mock.MockHostOption(mn),
-		})
+		nd, err := mock.MockPublicNode(ctx, mn)
 		if err != nil {
 			t.Fatal(err)
 		}

diff --git a/test/integration/three_legged_cat_test.go b/test/integration/three_legged_cat_test.go
@@ -9,7 +9,6 @@ import (
 	"testing"
 	"time"
 
-	core "github.com/ipfs/go-ipfs/core"
 	bootstrap2 "github.com/ipfs/go-ipfs/core/bootstrap"
 	"github.com/ipfs/go-ipfs/core/coreapi"
 	mock "github.com/ipfs/go-ipfs/core/mock"
@@ -76,28 +75,19 @@ func RunThreeLeggedCat(data []byte, conf testutil.LatencyConfig) error {
 		Bandwidth: math.MaxInt32,
 	})
 
-	bootstrap, err := core.NewNode(ctx, &core.BuildCfg{
-		Online: true,
-		Host:   mock.MockHostOption(mn),
-	})
+	bootstrap, err := mock.MockPublicNode(ctx, mn)
 	if err != nil {
 		return err
 	}
 	defer bootstrap.Close()
 
-	adder, err := core.NewNode(ctx, &core.BuildCfg{
-		Online: true,
-		Host:   mock.MockHostOption(mn),
-	})
+	adder, err := mock.MockPublicNode(ctx, mn)
 	if err != nil {
 		return err
 	}
 	defer adder.Close()
 
-	catter, err := core.NewNode(ctx, &core.BuildCfg{
-		Online: true,
-		Host:   mock.MockHostOption(mn),
-	})
+	catter, err := mock.MockPublicNode(ctx, mn)
 	if err != nil {
 		return err
 	}