From d87ec421db5910cccf5b7537271e4348927892d2 Mon Sep 17 00:00:00 2001 From: Jay Date: Tue, 3 Mar 2026 16:17:10 -0500 Subject: [PATCH] Rename Legacy filter to Root filter. --- filters/filters.go | 8 ++++---- filters/filters_test.go | 26 +++++++++++++------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/filters/filters.go b/filters/filters.go index 2df0935..110a4b8 100644 --- a/filters/filters.go +++ b/filters/filters.go @@ -8,8 +8,8 @@ import ( ) type HeartwoodFilter struct { - Legacy roots.Filter - Graph []GraphFilter + Root roots.Filter + Graph []GraphFilter } type GraphFilter struct { @@ -31,7 +31,7 @@ type Distance struct { } func MarshalJSON(f HeartwoodFilter) ([]byte, error) { - legacyFilter := f.Legacy + legacyFilter := f.Root if f.Graph != nil { graphArray, err := marshalGraphArray(f.Graph) @@ -69,7 +69,7 @@ func UnmarshalJSON(data []byte, f *HeartwoodFilter) error { delete(rootsFilter.Extensions, "graph") } - f.Legacy = rootsFilter + f.Root = rootsFilter return nil } diff --git a/filters/filters_test.go b/filters/filters_test.go index 103c584..b81c64a 100644 --- a/filters/filters_test.go +++ b/filters/filters_test.go @@ -15,13 +15,13 @@ func intPtr(i int) *int { func expectEqualHeartwoodFilters(t *testing.T, got, want HeartwoodFilter) { t.Helper() - assert.Equal(t, want.Legacy.IDs, got.Legacy.IDs) - assert.Equal(t, want.Legacy.Authors, got.Legacy.Authors) - assert.Equal(t, want.Legacy.Kinds, got.Legacy.Kinds) - assert.Equal(t, want.Legacy.Since, got.Legacy.Since) - assert.Equal(t, want.Legacy.Until, got.Legacy.Until) - assert.Equal(t, want.Legacy.Limit, got.Legacy.Limit) - assert.Equal(t, want.Legacy.Tags, got.Legacy.Tags) + assert.Equal(t, want.Root.IDs, got.Root.IDs) + assert.Equal(t, want.Root.Authors, got.Root.Authors) + assert.Equal(t, want.Root.Kinds, got.Root.Kinds) + assert.Equal(t, want.Root.Since, got.Root.Since) + assert.Equal(t, want.Root.Until, got.Root.Until) + assert.Equal(t, want.Root.Limit, got.Root.Limit) + assert.Equal(t, want.Root.Tags, got.Root.Tags) assert.Equal(t, len(want.Graph), len(got.Graph)) for i := range want.Graph { expectEqualGraphFilters(t, got.Graph[i], want.Graph[i]) @@ -61,7 +61,7 @@ func TestMarshalJSON(t *testing.T) { { name: "legacy fields only", filter: HeartwoodFilter{ - Legacy: roots.Filter{ + Root: roots.Filter{ IDs: []string{"abc"}, Kinds: []int{1}, Since: intPtr(1000), @@ -88,7 +88,7 @@ func TestMarshalJSON(t *testing.T) { { name: "legacy and graph present", filter: HeartwoodFilter{ - Legacy: roots.Filter{ + Root: roots.Filter{ IDs: []string{"abc"}, }, Graph: []GraphFilter{ @@ -128,7 +128,7 @@ func TestUnmarshalJSON(t *testing.T) { name: "legacy fields only", input: `{"ids":["abc"],"kinds":[1],"since":1000}`, expected: HeartwoodFilter{ - Legacy: roots.Filter{ + Root: roots.Filter{ IDs: []string{"abc"}, Kinds: []int{1}, Since: intPtr(1000), @@ -155,7 +155,7 @@ func TestUnmarshalJSON(t *testing.T) { name: "legacy and graph present", input: `{"ids":["abc"],"graph":[{"kinds":[1]}]}`, expected: HeartwoodFilter{ - Legacy: roots.Filter{ + Root: roots.Filter{ IDs: []string{"abc"}, }, Graph: []GraphFilter{ @@ -167,7 +167,7 @@ func TestUnmarshalJSON(t *testing.T) { name: "graph is removed from legacy extensions", input: `{"ids":["abc"],"graph":[{"kinds":[1]}],"search":"bitcoin"}`, expected: HeartwoodFilter{ - Legacy: roots.Filter{ + Root: roots.Filter{ IDs: []string{"abc"}, Extensions: map[string]json.RawMessage{ "search": json.RawMessage(`"bitcoin"`), @@ -188,7 +188,7 @@ func TestUnmarshalJSON(t *testing.T) { expectEqualHeartwoodFilters(t, result, tc.expected) // Ensure graph extension was popped from legacy filter - assert.Nil(t, result.Legacy.Extensions["graph"]) + assert.Nil(t, result.Root.Extensions["graph"]) }) } }