Remove dependency/code from unmerged PR

Author: bbrks

db/document.go

@@ -100,16 +100,13 @@ type SyncData struct {
 
 // determine set of current channels based on removal entries.
 func (sd *SyncData) getCurrentChannels() base.Set {
-	if len(sd.Channels) > 0 {
-		ch := base.SetOf()
-		for channelName, channelRemoval := range sd.Channels {
-			if channelRemoval == nil || channelRemoval.Seq == 0 {
-				ch.Add(channelName)
-			}
+	ch := base.SetOf()
+	for channelName, channelRemoval := range sd.Channels {
+		if channelRemoval == nil || channelRemoval.Seq == 0 {
+			ch.Add(channelName)
 		}
-		return ch
 	}
-	return nil
+	return ch
 }
 
 func (sd *SyncData) HashRedact(salt string) SyncData {
@@ -191,12 +188,11 @@ type Document struct {
 	Cas          uint64 // Document cas
 	rawUserXattr []byte // Raw user xattr as retrieved from the bucket
 
-	Deleted            bool
-	DocExpiry          uint32
-	RevID              string
-	DocAttachments     AttachmentsMeta
-	inlineSyncData     bool
-	currentRevChannels base.Set // A base.Set of the current revision's channels (determined by SyncData.Channels at UnmarshalJSON time)
+	Deleted        bool
+	DocExpiry      uint32
+	RevID          string
+	DocAttachments AttachmentsMeta
+	inlineSyncData bool
 }
 
 type historyOnlySyncData struct {

db/revision_cache_test.go

@@ -54,8 +54,6 @@ func (t *testBackingStore) GetDocument(ctx context.Context, docid string, unmars
 	doc.Channels = channels.ChannelMap{
 		"*": &channels.ChannelRemoval{RevID: doc.CurrentRev},
 	}
-	// currentRevChannels usually populated on JSON unmarshal
-	doc.currentRevChannels = doc.getCurrentChannels()
 
 	doc.HLV = &HybridLogicalVector{
 		SourceID: "test",