From 01fd455d6b684bdaf0c134274b35fd1a81f6352b Mon Sep 17 00:00:00 2001
From: Balint Gabor <balint.g@gmail.com>
Date: Fri, 12 Jan 2018 09:44:29 +0100
Subject: [PATCH] Temporarily remove/comment Intervals code

Later we will have to decide what to do with it, but first let's make
it compile
---
 swarm/network/requests.go | 44 +++++++++++++++++++--------------------
 swarm/network/streamer.go | 22 ++++++++++----------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/swarm/network/requests.go b/swarm/network/requests.go
index e3dd2846a1..ffb9855266 100644
--- a/swarm/network/requests.go
+++ b/swarm/network/requests.go
@@ -27,28 +27,28 @@ type Intervals struct {
 	key      string
 }
 
-func (s *Intervals) load() error {
-	return s.streamer.load(s.key)
-}
-
-func (s *Intervals) save() error {
-	return s.streamer.save(s.key)
-}
-
-func (s *Intervals) get() []uint64 {
-	return s.streamer.get(s.key)
-}
-
-func (s *Intervals) set(v []uint64) {
-	s.streamer.set(s.key, v)
-}
-
-func NewIntervals(key string, s *Streamer) *Intervals {
-	return &Intervals{
-		streamer: s,
-		key:      key,
-	}
-}
+// func (s *Intervals) load() error {
+// 	return s.streamer.load(s.key)
+// }
+//
+// func (s *Intervals) save() error {
+// 	return s.streamer.save(s.key)
+// }
+//
+// func (s *Intervals) get() []uint64 {
+// 	return s.streamer.get(s.key)
+// }
+//
+// func (s *Intervals) set(v []uint64) {
+// 	s.streamer.set(s.key, v)
+// }
+//
+// func NewIntervals(key string, s *Streamer) *Intervals {
+// 	return &Intervals{
+// 		streamer: s,
+// 		key:      key,
+// 	}
+// }
 
 // RetrieveRequestStreamer implements OutgoingStreamer
 type RetrieveRequestStreamer struct {
diff --git a/swarm/network/streamer.go b/swarm/network/streamer.go
index b5651c4b87..7043145b55 100644
--- a/swarm/network/streamer.go
+++ b/swarm/network/streamer.go
@@ -370,17 +370,17 @@ func (self *StreamerPeer) setIncomingStreamer(s string, i IncomingStreamer, prio
 		return fmt.Errorf("stream %v already registered", s)
 	}
 	next := make(chan struct{}, 1)
-	var intervals *Intervals
-	if !live {
-		key := s + self.ID().String()
-		intervals = NewIntervals(key, self.streamer)
-	}
+	// var intervals *Intervals
+	// if !live {
+	// key := s + self.ID().String()
+	// intervals = NewIntervals(key, self.streamer)
+	// }
 	self.incoming[s] = &incomingStreamer{
 		IncomingStreamer: i,
-		intervals:        intervals,
-		live:             live,
-		priority:         priority,
-		next:             next,
+		// intervals:        intervals,
+		live:     live,
+		priority: priority,
+		next:     next,
 	}
 	next <- struct{}{} // this is to allow wantedKeysMsg before first batch arrives
 	return nil
@@ -388,7 +388,7 @@ func (self *StreamerPeer) setIncomingStreamer(s string, i IncomingStreamer, prio
 
 // NextBatch adjusts the indexes by inspecting the intervals
 func (self *incomingStreamer) nextBatch(from uint64) (nextFrom uint64, nextTo uint64) {
-	intervals := self.intervals.get()
+	var intervals []uint64
 	if self.live {
 		if len(intervals) == 0 {
 			intervals = []uint64{self.sessionAt, from}
@@ -411,7 +411,7 @@ func (self *incomingStreamer) nextBatch(from uint64) (nextFrom uint64, nextTo ui
 		intervals[1] = from
 		nextTo = self.sessionAt
 	}
-	self.intervals.set(intervals)
+	// self.intervals.set(intervals)
 	return nextFrom, nextTo
 }