Test connecting two nodes

node/api.go

@@ -45,8 +45,11 @@ func (a *API) NetConnect(ctx context.Context, p peer.AddrInfo) error {
 	return a.Host.Connect(ctx, p)
 }
 
-func (a *API) NetAddrsListen(context.Context) (api.MultiaddrSlice, error) {
-	return a.Host.Addrs(), nil
+func (a *API) NetAddrsListen(context.Context) (peer.AddrInfo, error) {
+	return peer.AddrInfo{
+		ID:    a.Host.ID(),
+		Addrs: a.Host.Addrs(),
+	}, nil
 }
 
 var _ api.API = &API{}

node/builder.go

@@ -108,18 +108,20 @@ func Override(typ, constructor interface{}) Option {
 
 var defConf = config.Default()
 
-var defaults = []Option{
-	Override(new(helpers.MetricsCtx), context.Background),
+func defaults() []Option {
+	return []Option{
+		Override(new(helpers.MetricsCtx), context.Background),
 
-	randomIdentity(),
+		randomIdentity(),
 
-	Override(new(datastore.Batching), testing.MapDatastore),
-	Override(new(blockstore.Blockstore), testing.MapBlockstore), // NOT on top of ds above
-	Override(new(record.Validator), modules.RecordValidator),
+		Override(new(datastore.Batching), testing.MapDatastore),
+		Override(new(blockstore.Blockstore), testing.MapBlockstore), // NOT on top of ds above
+		Override(new(record.Validator), modules.RecordValidator),
 
-	// Filecoin modules
+		// Filecoin modules
 
-	Override(new(*chain.ChainStore), chain.NewChainStore),
+		Override(new(*chain.ChainStore), chain.NewChainStore),
+	}
 }
 
 // Online sets up basic libp2p node
@@ -202,7 +204,7 @@ func New(ctx context.Context, opts ...Option) (api.API, error) {
 	}
 
 	// apply module options in the right order
-	if err := Options(Options(defaults...), Options(opts...))(&settings); err != nil {
+	if err := Options(Options(defaults()...), Options(opts...))(&settings); err != nil {
 		return nil, err
 	}
 
@@ -224,6 +226,8 @@ func New(ctx context.Context, opts ...Option) (api.API, error) {
 		fx.Options(settings.invokes...),
 
 		fx.Extract(resAPI),
+
+		fx.NopLogger,
 	)
 
 	// TODO: we probably should have a 'firewall' for Closing signal

node/node_test.go

@@ -30,6 +30,10 @@ func builder(t *testing.T, n int) []api.API {
 		}
 	}
 
+	if err := mn.LinkAll(); err != nil {
+		t.Fatal(err)
+	}
+
 	return out
 }