:robot: Generate discovery services if not passed

api/api_test.go

@@ -50,10 +50,10 @@ var _ = Describe("API", func() {
 
 			l := node.Logger(logger.New(log.LevelFatal))
 
-			e, _ := node.New(node.FromBase64(true, true, token), node.WithStore(&blockchain.MemoryStore{}), l)
+			e, _ := node.New(node.FromBase64(true, true, token, nil, nil), node.WithStore(&blockchain.MemoryStore{}), l)
 			e.Start(ctx)
 
-			e2, _ := node.New(node.FromBase64(true, true, token), node.WithStore(&blockchain.MemoryStore{}), l)
+			e2, _ := node.New(node.FromBase64(true, true, token, nil, nil), node.WithStore(&blockchain.MemoryStore{}), l)
 			e2.Start(ctx)
 
 			go func() {

pkg/node/node_test.go

@@ -37,9 +37,9 @@ var _ = Describe("Node", func() {
 
 	Context("Configuration", func() {
 		It("fails if is not valid", func() {
-			_, err := New(FromBase64(true, true, "  "), WithStore(&blockchain.MemoryStore{}), l)
+			_, err := New(FromBase64(true, true, "  ", nil, nil), WithStore(&blockchain.MemoryStore{}), l)
 			Expect(err).To(HaveOccurred())
-			_, err = New(FromBase64(true, true, token), WithStore(&blockchain.MemoryStore{}), l)
+			_, err = New(FromBase64(true, true, token, nil, nil), WithStore(&blockchain.MemoryStore{}), l)
 			Expect(err).ToNot(HaveOccurred())
 		})
 	})
@@ -49,8 +49,8 @@ var _ = Describe("Node", func() {
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
 
-			e, _ := New(FromBase64(true, true, token), WithStore(&blockchain.MemoryStore{}), l)
-			e2, _ := New(FromBase64(true, true, token), WithStore(&blockchain.MemoryStore{}), l)
+			e, _ := New(FromBase64(true, true, token, nil, nil), WithStore(&blockchain.MemoryStore{}), l)
+			e2, _ := New(FromBase64(true, true, token, nil, nil), WithStore(&blockchain.MemoryStore{}), l)
 
 			e.Start(ctx)
 			e2.Start(ctx)
@@ -64,8 +64,8 @@ var _ = Describe("Node", func() {
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
 
-			e, _ := New(FromBase64(true, true, token), WithStore(&blockchain.MemoryStore{}), WithDiscoveryInterval(10*time.Second), l)
-			e2, _ := New(FromBase64(true, true, token), WithStore(&blockchain.MemoryStore{}), WithDiscoveryInterval(10*time.Second), l)
+			e, _ := New(FromBase64(true, true, token, nil, nil), WithStore(&blockchain.MemoryStore{}), WithDiscoveryInterval(10*time.Second), l)
+			e2, _ := New(FromBase64(true, true, token, nil, nil), WithStore(&blockchain.MemoryStore{}), WithDiscoveryInterval(10*time.Second), l)
 
 			e.Start(ctx)
 			e2.Start(ctx)
@@ -94,7 +94,7 @@ var _ = Describe("Node", func() {
 			defer cancel()
 			e, _ := New(
 				WithBlacklist("1.1.1.1/32", "1.1.1.0/24"),
-				FromBase64(true, true, token),
+				FromBase64(true, true, token, nil, nil),
 				WithStore(&blockchain.MemoryStore{}),
 				l,
 			)

pkg/node/options.go

@@ -259,6 +259,13 @@ func (y YAMLConnectionConfig) YAML() string {
 }
 
 func (y YAMLConnectionConfig) copy(mdns, dht bool, cfg *Config, d *discovery.DHT, m *discovery.MDNS) {
+	if d == nil {
+		d = discovery.NewDHT()
+	}
+	if m == nil {
+		m = &discovery.MDNS{}
+	}
+
 	d.RefreshDiscoveryTime = cfg.DiscoveryInterval
 	d.OTPInterval = y.OTP.DHT.Interval
 	d.OTPKey = y.OTP.DHT.Key
@@ -313,7 +320,7 @@ func GenerateNewConnectionData(i ...int) *YAMLConnectionConfig {
 	}
 }
 
-func FromYaml(enablemDNS, enableDHT bool, path string,d *discovery.DHT, m *discovery.MDNS) func(cfg *Config) error {
+func FromYaml(enablemDNS, enableDHT bool, path string, d *discovery.DHT, m *discovery.MDNS) func(cfg *Config) error {
 	return func(cfg *Config) error {
 		if len(path) == 0 {
 			return nil
@@ -329,12 +336,12 @@ func FromYaml(enablemDNS, enableDHT bool, path string,d *discovery.DHT, m *disco
 			return errors.Wrap(err, "parsing yaml")
 		}
 
-		t.copy(enablemDNS, enableDHT, cfg, d,m)
+		t.copy(enablemDNS, enableDHT, cfg, d, m)
 		return nil
 	}
 }
 
-func FromBase64(enablemDNS, enableDHT bool, bb string,d *discovery.DHT, m *discovery.MDNS) func(cfg *Config) error {
+func FromBase64(enablemDNS, enableDHT bool, bb string, d *discovery.DHT, m *discovery.MDNS) func(cfg *Config) error {
 	return func(cfg *Config) error {
 		if len(bb) == 0 {
 			return nil
@@ -348,7 +355,7 @@ func FromBase64(enablemDNS, enableDHT bool, bb string,d *discovery.DHT, m *disco
 		if err := yaml.Unmarshal(configDec, &t); err != nil {
 			return errors.Wrap(err, "parsing yaml")
 		}
-		t.copy(enablemDNS, enableDHT, cfg, d,m)
+		t.copy(enablemDNS, enableDHT, cfg, d, m)
 		return nil
 	}
 }

pkg/services/alive_test.go

@@ -38,7 +38,7 @@ var _ = Describe("Alive service", func() {
 	opts := append(
 		Alive(5*time.Second, 100*time.Second, 15*time.Minute),
 		node.WithDiscoveryInterval(10*time.Second),
-		node.FromBase64(true, true, token),
+		node.FromBase64(true, true, token, nil, nil),
 		l)
 
 	Context("Aliveness check", func() {
@@ -76,7 +76,7 @@ var _ = Describe("Alive service", func() {
 			opts = append(
 				Alive(10*time.Second, 30*time.Second, 15*time.Minute),
 				node.WithDiscoveryInterval(10*time.Second),
-				node.FromBase64(true, true, token),
+				node.FromBase64(true, true, token, nil, nil),
 				l)
 		})
 

pkg/services/dns_test.go

@@ -40,7 +40,7 @@ var _ = Describe("DNS service", func() {
 
 	e2, _ := node.New(
 		append(Alive(15*time.Second, 90*time.Minute, 15*time.Minute),
-			node.FromBase64(true, true, token), node.WithStore(&blockchain.MemoryStore{}), l)...)
+			node.FromBase64(true, true, token,nil, nil), node.WithStore(&blockchain.MemoryStore{}), l)...)
 
 	Context("DNS service", func() {
 		It("Set DNS records and can resolve IPs", func() {
@@ -48,7 +48,7 @@ var _ = Describe("DNS service", func() {
 			defer cancel()
 
 			opts := DNS(logg, "127.0.0.1:19192", true, []string{"8.8.8.8:53"}, 10)
-			opts = append(opts, node.FromBase64(true, true, token), node.WithStore(&blockchain.MemoryStore{}), l)
+			opts = append(opts, node.FromBase64(true, true, token,nil, nil), node.WithStore(&blockchain.MemoryStore{}), l)
 			e, _ := node.New(opts...)
 
 			e.Start(ctx)

pkg/services/files_test.go

@@ -41,7 +41,7 @@ var _ = Describe("File services", func() {
 	e2, _ := node.New(
 		node.WithDiscoveryInterval(10*time.Second),
 		node.WithNetworkService(AliveNetworkService(2*time.Second, 4*time.Second, 15*time.Minute)),
-		node.FromBase64(true, true, token), node.WithStore(&blockchain.MemoryStore{}), l)
+		node.FromBase64(true, true, token, nil, nil), node.WithStore(&blockchain.MemoryStore{}), l)
 
 	Context("File sharing", func() {
 		It("sends and receive files between two nodes", func() {
@@ -61,7 +61,7 @@ var _ = Describe("File services", func() {
 			opts, err := ShareFile(logg, 10*time.Second, fileUUID, f.Name())
 			Expect(err).ToNot(HaveOccurred())
 
-			opts = append(opts, node.FromBase64(true, true, token), node.WithStore(&blockchain.MemoryStore{}), l)
+			opts = append(opts, node.FromBase64(true, true, token, nil, nil), node.WithStore(&blockchain.MemoryStore{}), l)
 			e, _ := node.New(opts...)
 
 			e.Start(ctx)

pkg/services/services_test.go

@@ -66,7 +66,7 @@ var _ = Describe("Expose services", func() {
 			defer cancel()
 
 			opts := RegisterService(logg, 5*time.Second, serviceUUID, "142.250.184.35:80")
-			opts = append(opts, node.FromBase64(true, true, token), node.WithDiscoveryInterval(10*time.Second), node.WithStore(&blockchain.MemoryStore{}), l)
+			opts = append(opts, node.FromBase64(true, true, token, nil, nil), node.WithDiscoveryInterval(10*time.Second), node.WithStore(&blockchain.MemoryStore{}), l)
 			e, _ := node.New(opts...)
 
 			// First node expose a service
@@ -78,7 +78,7 @@ var _ = Describe("Expose services", func() {
 				e2, _ := node.New(
 					node.WithNetworkService(ConnectNetworkService(5*time.Second, serviceUUID, "127.0.0.1:9999")),
 					node.WithDiscoveryInterval(10*time.Second),
-					node.FromBase64(true, true, token), node.WithStore(&blockchain.MemoryStore{}), l)
+					node.FromBase64(true, true, token, nil, nil), node.WithStore(&blockchain.MemoryStore{}), l)
 
 				e2.Start(ctx)
 			}()

pkg/trustzone/trustzone_test.go

@@ -77,7 +77,7 @@ var _ = Describe("trustzone", func() {
 				node.GenericChannelHandlers(pguardian.ReceiveMessage),
 				//	node.WithPeerGater(pg),
 				node.WithDiscoveryInterval(10*time.Second),
-				node.FromBase64(true, true, token), node.WithStore(permStore), ll)
+				node.FromBase64(true, true, token, nil, nil), node.WithStore(permStore), ll)
 
 			pguardian2 := trustzone.NewPeerGuardian(logg, aps...)
 
@@ -92,7 +92,7 @@ var _ = Describe("trustzone", func() {
 				node.GenericChannelHandlers(pguardian2.ReceiveMessage),
 				//	node.WithPeerGater(pg),
 				node.WithDiscoveryInterval(10*time.Second),
-				node.FromBase64(true, true, token), node.WithStore(&blockchain.MemoryStore{}), ll)
+				node.FromBase64(true, true, token, nil, nil), node.WithStore(&blockchain.MemoryStore{}), ll)
 
 			l, err := e.Ledger()
 			Expect(err).ToNot(HaveOccurred())
@@ -140,7 +140,7 @@ var _ = Describe("trustzone", func() {
 				node.GenericChannelHandlers(pguardian.ReceiveMessage),
 				node.WithPeerGater(pg),
 				node.WithDiscoveryInterval(10*time.Second),
-				node.FromBase64(true, true, token), node.WithStore(permStore), ll)
+				node.FromBase64(true, true, token, nil, nil), node.WithStore(permStore), ll)
 
 			Expect(err).ToNot(HaveOccurred())