Small fixes and refactoring.

filters/filters.go

@@ -31,7 +31,7 @@ type Distance struct {
 }
 
 func MarshalJSON(f HeartwoodFilter) ([]byte, error) {
-	legacyFilter := f.Root
+	rootFilter := f.Root
 
 	if f.Graph != nil {
 		graphArray, err := marshalGraphArray(f.Graph)
@@ -44,14 +44,14 @@ func MarshalJSON(f HeartwoodFilter) ([]byte, error) {
 			return nil, fmt.Errorf("error marshalling graph field: %w", err)
 		}
 
-		if legacyFilter.Extensions == nil {
-			legacyFilter.Extensions = make(roots.FilterExtensions)
+		if rootFilter.Extensions == nil {
+			rootFilter.Extensions = make(roots.FilterExtensions)
 		}
 
-		legacyFilter.Extensions["graph"] = graphField
+		rootFilter.Extensions["graph"] = graphField
 	}
 
-	return roots.MarshalJSON(legacyFilter)
+	return roots.MarshalJSON(rootFilter)
 }
 
 func UnmarshalJSON(data []byte, f *HeartwoodFilter) error {

filters/filters_test.go

@@ -59,7 +59,7 @@ func TestMarshalJSON(t *testing.T) {
 			expected: `{}`,
 		},
 		{
-			name: "legacy fields only",
+			name: "root fields only",
 			filter: HeartwoodFilter{
 				Root: roots.Filter{
 					IDs:   []string{"abc"},
@@ -86,7 +86,7 @@ func TestMarshalJSON(t *testing.T) {
 			expected: `{"graph":[{"kinds":[1]}]}`,
 		},
 		{
-			name: "legacy and graph present",
+			name: "root and graph present",
 			filter: HeartwoodFilter{
 				Root: roots.Filter{
 					IDs: []string{"abc"},
@@ -125,7 +125,7 @@ func TestUnmarshalJSON(t *testing.T) {
 			expected: HeartwoodFilter{},
 		},
 		{
-			name:  "legacy fields only",
+			name:  "root fields only",
 			input: `{"ids":["abc"],"kinds":[1],"since":1000}`,
 			expected: HeartwoodFilter{
 				Root: roots.Filter{
@@ -152,7 +152,7 @@ func TestUnmarshalJSON(t *testing.T) {
 			},
 		},
 		{
-			name:  "legacy and graph present",
+			name:  "root and graph present",
 			input: `{"ids":["abc"],"graph":[{"kinds":[1]}]}`,
 			expected: HeartwoodFilter{
 				Root: roots.Filter{
@@ -164,7 +164,7 @@ func TestUnmarshalJSON(t *testing.T) {
 			},
 		},
 		{
-			name:  "graph is removed from legacy extensions",
+			name:  "graph is removed from root extensions",
 			input: `{"ids":["abc"],"graph":[{"kinds":[1]}],"search":"bitcoin"}`,
 			expected: HeartwoodFilter{
 				Root: roots.Filter{
@@ -187,7 +187,7 @@ func TestUnmarshalJSON(t *testing.T) {
 			assert.NoError(t, err)
 			expectEqualHeartwoodFilters(t, result, tc.expected)
 
-			// Ensure graph extension was popped from legacy filter
+			// Ensure graph extension was popped from root filter
 			assert.Nil(t, result.Root.Extensions["graph"])
 		})
 	}

graph/graph_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 )
 
-func TestMatchKeys(t *testing.T) {
+func TestSimpleMatchKeys(t *testing.T) {
 	matchKeys := &SimpleMatchKeys{
 		Keys: map[string][]string{
 			"User":  {"pubkey"},
@@ -34,7 +34,7 @@ func TestMatchKeys(t *testing.T) {
 	})
 }
 
-func TestMatchProps(t *testing.T) {
+func TestSimpleMatchProps(t *testing.T) {
 	matchKeys := &SimpleMatchKeys{
 		Keys: map[string][]string{
 			"User":  {"pubkey"},

subgraph.go

@@ -65,10 +65,10 @@ func EventToSubgraph(e roots.Event, p ExpanderPipeline) *EventSubgraph {
 	s := NewEventSubgraph()
 
 	// Create core entities
-	eventNode := newEventNode(e)
-	userNode := newUserNode(e)
+	eventNode := newEventNode(e.ID, e.CreatedAt, e.Kind, e.Content)
+	userNode := newUserNode(e.PubKey)
 	signedRel := newSignedRel(userNode, eventNode)
-	tagNodes := newTagNodes(e)
+	tagNodes := newTagNodes(e.Tags)
 	tagRels := newTagRels(eventNode, tagNodes)
 
 	// Populate subgraph
@@ -90,25 +90,25 @@ func EventToSubgraph(e roots.Event, p ExpanderPipeline) *EventSubgraph {
 	return s
 }
 
-func newEventNode(e roots.Event) *graph.Node {
-	eventNode := graph.NewEventNode(e.ID)
-	eventNode.Props["created_at"] = e.CreatedAt
-	eventNode.Props["kind"] = e.Kind
-	eventNode.Props["content"] = e.Content
+func newEventNode(eventID string, createdAt int, kind int, content string) *graph.Node {
+	eventNode := graph.NewEventNode(eventID)
+	eventNode.Props["created_at"] = createdAt
+	eventNode.Props["kind"] = kind
+	eventNode.Props["content"] = content
 	return eventNode
 }
 
-func newUserNode(e roots.Event) *graph.Node {
-	return graph.NewUserNode(e.PubKey)
+func newUserNode(pubkey string) *graph.Node {
+	return graph.NewUserNode(pubkey)
 }
 
 func newSignedRel(user, event *graph.Node) *graph.Relationship {
 	return graph.NewSignedRel(user, event, nil)
 }
 
-func newTagNodes(e roots.Event) []*graph.Node {
+func newTagNodes(tags []roots.Tag) []*graph.Node {
 	nodes := []*graph.Node{}
-	for _, tag := range e.Tags {
+	for _, tag := range tags {
 		if !isValidTag(tag) {
 			continue
 		}