assign public IP addresses for tests that need them
Steven Allen committed
Mar 19, 2020 at 18:38 UTC
bb08f7fe5643b9b832f06d952bbb1615d75d8ebd
4 files changed
+28
-18
core/coreapi/test/api_test.go
+1
-1
@@ -65,7 +65,7 @@ func (NodeProvider) MakeAPISwarm(ctx context.Context, fullIdentity bool, n int)
65
}
66
67
c := config.Config{}
68
- c.Addresses.Swarm = []string{fmt.Sprintf("/ip4/127.0.%d.1/tcp/4001", i)}
68
+ c.Addresses.Swarm = []string{fmt.Sprintf("/ip4/18.0.%d.1/tcp/4001", i)}
69
c.Identity = ident
70
c.Experimental.FilestoreEnabled = true
71
core/mock/mock.go
+23
@@ -2,6 +2,8 @@ package coremock
2
3
import (
4
"context"
5
+ "fmt"
6
+ "io/ioutil"
7
8
libp2p2 "github.com/ipfs/go-ipfs/core/node/libp2p"
9
@@ -75,3 +77,24 @@ func MockCmdsCtx() (commands.Context, error) {
77
},
78
}, nil
79
}
80
+
81
+func MockPublicNode(ctx context.Context, mn mocknet.Mocknet) (*core.IpfsNode, error) {
82
+ ds := syncds.MutexWrap(datastore.NewMapDatastore())
83
+ cfg, err := config.Init(ioutil.Discard, 2048)
84
+ if err != nil {
85
+ return nil, err
86
+ }
87
+ count := len(mn.Peers())
88
+ cfg.Addresses.Swarm = []string{
89
+ fmt.Sprintf("/ip4/18.0.%d.%d/tcp/4001", count>>16, count&0xFF),
90
+ }
91
+ cfg.Datastore = config.Datastore{}
92
+ return core.NewNode(ctx, &core.BuildCfg{
93
+ Online: true,
94
+ Repo: &repo.Mock{
95
+ C: *cfg,
96
+ D: ds,
97
+ },
98
+ Host: MockHostOption(mn),
99
+ })
100
+}
namesys/republisher/repub_test.go
+1
-4
@@ -29,10 +29,7 @@ func TestRepublish(t *testing.T) {
29
30
var nodes []*core.IpfsNode
31
for i := 0; i < 10; i++ {
32
- nd, err := core.NewNode(ctx, &core.BuildCfg{
33
- Online: true,
34
- Host: mock.MockHostOption(mn),
35
- })
32
+ nd, err := mock.MockPublicNode(ctx, mn)
33
if err != nil {
34
t.Fatal(err)
35
}
test/integration/three_legged_cat_test.go
+3
-13
@@ -9,7 +9,6 @@ import (
9
"testing"
10
"time"
11
12
- core "github.com/ipfs/go-ipfs/core"
12
bootstrap2 "github.com/ipfs/go-ipfs/core/bootstrap"
13
"github.com/ipfs/go-ipfs/core/coreapi"
14
mock "github.com/ipfs/go-ipfs/core/mock"
@@ -76,28 +75,19 @@ func RunThreeLeggedCat(data []byte, conf testutil.LatencyConfig) error {
75
Bandwidth: math.MaxInt32,
76
})
77
79
- bootstrap, err := core.NewNode(ctx, &core.BuildCfg{
80
- Online: true,
81
- Host: mock.MockHostOption(mn),
82
- })
78
+ bootstrap, err := mock.MockPublicNode(ctx, mn)
79
if err != nil {
80
return err
81
}
82
defer bootstrap.Close()
83
88
- adder, err := core.NewNode(ctx, &core.BuildCfg{
89
- Online: true,
90
- Host: mock.MockHostOption(mn),
91
- })
84
+ adder, err := mock.MockPublicNode(ctx, mn)
85
if err != nil {
86
return err
87
}
88
defer adder.Close()
89
97
- catter, err := core.NewNode(ctx, &core.BuildCfg{
98
- Online: true,
99
- Host: mock.MockHostOption(mn),
100
- })
90
+ catter, err := mock.MockPublicNode(ctx, mn)
91
if err != nil {
92
return err
93
}