Possibility to have just on-demand proposal fetching

cmd/di_discovery.go

@@ -42,9 +42,11 @@ func (di *Dependencies) bootstrapDiscoveryComponents(options node.OptionsDiscove
 		case node.DiscoveryTypeBroker:
 			discoveryRegistry.AddRegistry(brokerdiscovery.NewRegistry(di.BrokerConnection))
 
-			brokerRepository, err := di.bootstrapDiscoveryBroker(options)
-			if err != nil {
-				return errors.Wrap(err, "failed to bootstrap broker discovery")
+			brokerRepository := brokerdiscovery.NewRepository(di.BrokerConnection, di.EventBus, options.PingInterval+time.Second, 1*time.Second)
+			if options.FetchEnabled {
+				if err := discoverySyncStart(brokerRepository, di.EventBus); err != nil {
+					return errors.Wrap(err, "failed to enable broker discovery")
+				}
 			}
 			proposalRepository.Add(brokerRepository)
 		default:
@@ -59,23 +61,19 @@ func (di *Dependencies) bootstrapDiscoveryComponents(options node.OptionsDiscove
 	return nil
 }
 
-func (di *Dependencies) bootstrapDiscoveryBroker(options node.OptionsDiscovery) (*brokerdiscovery.Repository, error) {
-	repository := brokerdiscovery.NewRepository(di.BrokerConnection, di.EventBus, options.PingInterval+time.Second, 1*time.Second)
-
-	if err := discoverySyncsInConsumerMode(repository, di.EventBus); err != nil {
-		return repository, err
-	}
-	if err := discoveryStopsOnShutdown(repository, di.EventBus); err != nil {
-		return repository, err
-	}
-	return repository, discoverySyncStart(repository)
-}
-
-func discoverySyncStart(repository *brokerdiscovery.Repository) error {
+func discoverySyncStart(repository *brokerdiscovery.Repository, eventBus eventbus.EventBus) error {
 	err := repository.Start()
 	if err != nil {
 		log.Error().Err(err).Msg("Broker discovery start failed")
 	}
+
+	if err := discoverySyncsInConsumerMode(repository, eventBus); err != nil {
+		return err
+	}
+	if err := discoveryStopsOnShutdown(repository, eventBus); err != nil {
+		return err
+	}
+
 	return err
 }
 
@@ -85,7 +83,7 @@ func discoverySyncsInConsumerMode(repository *brokerdiscovery.Repository, eventB
 		case service.Running:
 			repository.Stop()
 		case service.NotRunning:
-			discoverySyncStart(repository)
+			discoverySyncStart(repository, eventBus)
 		}
 	})
 	if err != nil {

core/node/options.go

@@ -179,10 +179,10 @@ func GetDiscoveryOptions() *OptionsDiscovery {
 	}
 
 	return &OptionsDiscovery{
-		Types:                  types,
-		ProposalFetcherEnabled: true,
-		PingInterval:           config.GetDuration(config.FlagDiscoveryPingInterval),
-		FetchInterval:          config.GetDuration(config.FlagDiscoveryPingInterval),
+		Types:         types,
+		PingInterval:  config.GetDuration(config.FlagDiscoveryPingInterval),
+		FetchEnabled:  true,
+		FetchInterval: config.GetDuration(config.FlagDiscoveryFetchInterval),
 	}
 }
 

core/node/options_discovery.go

@@ -31,9 +31,9 @@ const (
 
 // OptionsDiscovery describes possible parameters of discovery configuration
 type OptionsDiscovery struct {
-	Types                  []DiscoveryType
-	Address                string
-	ProposalFetcherEnabled bool
-	PingInterval           time.Duration
-	FetchInterval          time.Duration
+	Types         []DiscoveryType
+	Address       string
+	PingInterval  time.Duration
+	FetchEnabled  bool
+	FetchInterval time.Duration
 }

mobile/mysterium/entrypoint.go

@@ -124,9 +124,9 @@ func NewNode(appPath string, optionsNetwork *MobileNetworkOptions) (*MobileNode,
 			Address: "https://quality.mysterium.network/api/v1",
 		},
 		Discovery: node.OptionsDiscovery{
-			Types:                  []node.DiscoveryType{node.DiscoveryTypeAPI, node.DiscoveryTypeBroker},
-			Address:                network.MysteriumAPIAddress,
-			ProposalFetcherEnabled: false,
+			Types:        []node.DiscoveryType{node.DiscoveryTypeAPI, node.DiscoveryTypeBroker},
+			Address:      network.MysteriumAPIAddress,
+			FetchEnabled: false,
 		},
 		Location: node.OptionsLocation{
 			IPDetectorURL: "https://api.ipify.org/?format=json",