From 97332d7628cbbde30244b82c883fb65a5bd7f15b Mon Sep 17 00:00:00 2001
From: Attila Gazso <agazso@gmail.com>
Date: Mon, 15 Oct 2018 13:02:30 +0200
Subject: [PATCH] swarm: restructured RegistryOption initializing

---
 swarm/swarm.go | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/swarm/swarm.go b/swarm/swarm.go
index 4e03114217..7214abbda4 100644
--- a/swarm/swarm.go
+++ b/swarm/swarm.go
@@ -175,14 +175,19 @@ func NewSwarm(config *api.Config, mockStore *mock.NodeStore) (self *Swarm, err e
 	if err := nodeID.UnmarshalText([]byte(config.NodeID)); err != nil {
 		return nil, err
 	}
-	self.streamer = stream.NewRegistry(nodeID, delivery, self.netStore, stateStore, &stream.RegistryOptions{
+	registryOptions := &stream.RegistryOptions{
 		SkipCheck:       config.DeliverySkipCheck,
-		DoSync:          config.SyncEnabled && !config.LightNodeEnabled,
+		DoSync:          config.SyncEnabled,
 		DoRetrieve:      true,
-		DoServeRetrieve: !config.LightNodeEnabled,
+		DoServeRetrieve: true,
 		SyncUpdateDelay: config.SyncUpdateDelay,
 		MaxPeerServers:  config.MaxStreamPeerServers,
-	})
+	}
+	if config.LightNodeEnabled {
+		registryOptions.DoSync = false
+		registryOptions.DoRetrieve = false
+	}
+	self.streamer = stream.NewRegistry(nodeID, delivery, self.netStore, stateStore, registryOptions)
 
 	// Swarm Hash Merklised Chunking for Arbitrary-length Document/File storage
 	self.fileStore = storage.NewFileStore(self.netStore, self.config.FileStoreParams)