Remove leaf check from RevTree Unmarshal (assume JSON is always correct and isn't storing non-leaf channelmap entries)

Author: bbrks

db/revtree.go

@@ -192,20 +192,20 @@ func (tree *RevTree) UnmarshalJSON(inputjson []byte) (err error) {
 		(*tree)[rep.Revs[i]] = info
 	}
 
-	if len(rep.ChannelsMap) > 0 || len(rep.Channels_Old) > 0 {
-		leaves := tree.Leaves()
+	if len(rep.ChannelsMap) > 0 {
 		for iStr, channels := range rep.ChannelsMap {
 			i, err := strconv.ParseInt(iStr, 10, 64)
 			if err != nil {
 				return err
 			}
 			info := (*tree)[rep.Revs[i]]
-			if _, isLeaf := leaves[info.ID]; isLeaf {
-				info.Channels = channels
-			}
+			info.Channels = channels
 		}
+	}
 
-		// we shouldn't be in a situation where we have both channels and channelsMap populated, but we still need to handle the old format.
+	// we shouldn't be in a situation where we have both channels and channelsMap populated, but we still need to handle the old format
+	if len(rep.Channels_Old) > 0 {
+		leaves := tree.Leaves()
 		for i, channels := range rep.Channels_Old {
 			info := (*tree)[rep.Revs[i]]
 			if _, isLeaf := leaves[info.ID]; isLeaf {

db/revtree_test.go

@@ -364,37 +364,13 @@ func TestRevTreeChannelMapLeafOnly(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	// Intentionally keep a non-leaf channelsMap entry to ensure that unmarshalling strips it
-	treeJSON := []byte(`{
-	"revs":["3-three","2-two","1-one","3-drei","4-four"],
-	"parents":[1,2,-1,1,0],
-	"channelsMap":{"0":["EN"],"3":["DE"],"4":["EN-gb","EN-us"]}
-}`)
-
 	// marshal RevTree into storage format
 	bytes, err := base.JSONMarshal(tree)
 	require.NoError(t, err)
 	// unmarshal back into revTreeList to ensure non-leaf channels are stripped on marshal for stored format
 	var storedMap revTreeList
 	require.NoError(t, base.JSONUnmarshal(bytes, &storedMap))
 	assert.Len(t, storedMap.ChannelsMap, 2, "expected only two channelsMap entries (for the leaf revisions)")
-
-	// unmarshal treeJSON into RevTree to ensure non-leaf channels are stripped on unmarshal
-	var gotmap RevTree
-	require.NoError(t, base.JSONUnmarshal(treeJSON, &gotmap))
-
-	ri, err := gotmap.getInfo("3-three")
-	require.NoError(t, err)
-	assert.Nil(t, ri.Channels) // no channels on remarshalled RevTree for non-leaf revision
-
-	ri, err = gotmap.getInfo("4-four")
-	require.NoError(t, err)
-	assert.Equal(t, rev4Channels, ri.Channels) // leaf revision channels
-
-	ri, err = gotmap.getInfo("3-drei")
-	require.NoError(t, err)
-	assert.Equal(t, base.SetOf("DE"), ri.Channels) // leaf revision channels
-
 }
 
 func TestRevTreeIsLeaf(t *testing.T) {