use netstore in retrieval protocol (#277)

Co-authored-by: svetomir <svetomirsmiljkovic@gmail.com>

.github/workflows/beekeeper.yaml

@@ -51,4 +51,6 @@ jobs:
       - name: Test pushsync (bzz API)
         run: ./beekeeper check pushsync --api-scheme http --debug-api-scheme http --disable-namespace --debug-api-domain localhost --api-domain localhost --node-count "${REPLICA}" --upload-node-count "${REPLICA}" --chunks-per-node 3
       - name: Test pushsync (bzz-chunk API)
-        run: ./beekeeper check pushsync --bzz-chunk --api-scheme http --debug-api-scheme http --disable-namespace --debug-api-domain localhost --api-domain localhost --node-count "${REPLICA}" --upload-node-count "${REPLICA}" --chunks-per-node 3
+        run: ./beekeeper check pushsync --api-scheme http --debug-api-scheme http --disable-namespace --debug-api-domain localhost --api-domain localhost --node-count "${REPLICA}" --upload-node-count "${REPLICA}" --chunks-per-node 3 --bzz-chunk
+      - name: Test retrieval
+        run: ./beekeeper check retrieval --api-scheme http --debug-api-scheme http --disable-namespace --debug-api-domain localhost --api-domain localhost --node-count "${REPLICA}" --upload-node-count "${REPLICA}" --chunks-per-node 3

pkg/node/node.go

@@ -205,7 +205,6 @@ func NewBee(o Options) (*Bee, error) {
 	retrieve := retrieval.New(retrieval.Options{
 		Streamer:    p2ps,
 		ChunkPeerer: topologyDriver,
-		Storer:      storer,
 		Logger:      logger,
 	})
 	tag := tags.NewTags()
@@ -216,6 +215,8 @@ func NewBee(o Options) (*Bee, error) {
 
 	ns := netstore.New(storer, retrieve, validator.NewContentAddressValidator())
 
+	retrieve.SetStorer(ns)
+
 	pushSyncProtocol := pushsync.New(pushsync.Options{
 		Streamer:      p2ps,
 		Storer:        storer,

pkg/retrieval/retrieval.go

@@ -113,3 +113,8 @@ func (s *Service) handler(ctx context.Context, p p2p.Peer, stream p2p.Stream) er
 
 	return nil
 }
+
+// SetStorer sets the storer. This call is not goroutine safe.
+func (s *Service) SetStorer(storer storage.Storer) {
+	s.storer = storer
+}