jay/go-heartwood
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename Legacy filter to Root filter.

Browse Source
This commit is contained in:
Jay
2026-03-03 16:17:10 -05:00
parent 4114b4c02a
commit d87ec421db
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
filters/filters.go
View File

@@ -8,8 +8,8 @@ import (
) )
type HeartwoodFilter struct { type HeartwoodFilter struct {
Legacy roots.Filter Root roots.Filter
Graph []GraphFilter Graph []GraphFilter
} }
type GraphFilter struct { type GraphFilter struct {
@@ -31,7 +31,7 @@ type Distance struct {
} }
func MarshalJSON(f HeartwoodFilter) ([]byte, error) { func MarshalJSON(f HeartwoodFilter) ([]byte, error) {
legacyFilter := f.Legacy legacyFilter := f.Root
if f.Graph != nil { if f.Graph != nil {
graphArray, err := marshalGraphArray(f.Graph) graphArray, err := marshalGraphArray(f.Graph)
@@ -69,7 +69,7 @@ func UnmarshalJSON(data []byte, f *HeartwoodFilter) error {
delete(rootsFilter.Extensions, "graph") delete(rootsFilter.Extensions, "graph")
} }
f.Legacy = rootsFilter f.Root = rootsFilter
return nil return nil
} }

26
filters/filters_test.go
View File

@@ -15,13 +15,13 @@ func intPtr(i int) *int {
func expectEqualHeartwoodFilters(t *testing.T, got, want HeartwoodFilter) { func expectEqualHeartwoodFilters(t *testing.T, got, want HeartwoodFilter) {
t.Helper() t.Helper()
assert.Equal(t, want.Legacy.IDs, got.Legacy.IDs) assert.Equal(t, want.Root.IDs, got.Root.IDs)
assert.Equal(t, want.Legacy.Authors, got.Legacy.Authors) assert.Equal(t, want.Root.Authors, got.Root.Authors)
assert.Equal(t, want.Legacy.Kinds, got.Legacy.Kinds) assert.Equal(t, want.Root.Kinds, got.Root.Kinds)
assert.Equal(t, want.Legacy.Since, got.Legacy.Since) assert.Equal(t, want.Root.Since, got.Root.Since)
assert.Equal(t, want.Legacy.Until, got.Legacy.Until) assert.Equal(t, want.Root.Until, got.Root.Until)
assert.Equal(t, want.Legacy.Limit, got.Legacy.Limit) assert.Equal(t, want.Root.Limit, got.Root.Limit)
assert.Equal(t, want.Legacy.Tags, got.Legacy.Tags) assert.Equal(t, want.Root.Tags, got.Root.Tags)
assert.Equal(t, len(want.Graph), len(got.Graph)) assert.Equal(t, len(want.Graph), len(got.Graph))
for i := range want.Graph { for i := range want.Graph {
expectEqualGraphFilters(t, got.Graph[i], want.Graph[i]) expectEqualGraphFilters(t, got.Graph[i], want.Graph[i])
@@ -61,7 +61,7 @@ func TestMarshalJSON(t *testing.T) {
{ {
name: "legacy fields only", name: "legacy fields only",
filter: HeartwoodFilter{ filter: HeartwoodFilter{
Legacy: roots.Filter{ Root: roots.Filter{
IDs: []string{"abc"}, IDs: []string{"abc"},
Kinds: []int{1}, Kinds: []int{1},
Since: intPtr(1000), Since: intPtr(1000),
@@ -88,7 +88,7 @@ func TestMarshalJSON(t *testing.T) {
{ {
name: "legacy and graph present", name: "legacy and graph present",
filter: HeartwoodFilter{ filter: HeartwoodFilter{
Legacy: roots.Filter{ Root: roots.Filter{
IDs: []string{"abc"}, IDs: []string{"abc"},
}, },
Graph: []GraphFilter{ Graph: []GraphFilter{
@@ -128,7 +128,7 @@ func TestUnmarshalJSON(t *testing.T) {
name: "legacy fields only", name: "legacy fields only",
input: `{"ids":["abc"],"kinds":[1],"since":1000}`, input: `{"ids":["abc"],"kinds":[1],"since":1000}`,
expected: HeartwoodFilter{ expected: HeartwoodFilter{
Legacy: roots.Filter{ Root: roots.Filter{
IDs: []string{"abc"}, IDs: []string{"abc"},
Kinds: []int{1}, Kinds: []int{1},
Since: intPtr(1000), Since: intPtr(1000),
@@ -155,7 +155,7 @@ func TestUnmarshalJSON(t *testing.T) {
name: "legacy and graph present", name: "legacy and graph present",
input: `{"ids":["abc"],"graph":[{"kinds":[1]}]}`, input: `{"ids":["abc"],"graph":[{"kinds":[1]}]}`,
expected: HeartwoodFilter{ expected: HeartwoodFilter{
Legacy: roots.Filter{ Root: roots.Filter{
IDs: []string{"abc"}, IDs: []string{"abc"},
}, },
Graph: []GraphFilter{ Graph: []GraphFilter{
@@ -167,7 +167,7 @@ func TestUnmarshalJSON(t *testing.T) {
name: "graph is removed from legacy extensions", name: "graph is removed from legacy extensions",
input: `{"ids":["abc"],"graph":[{"kinds":[1]}],"search":"bitcoin"}`, input: `{"ids":["abc"],"graph":[{"kinds":[1]}],"search":"bitcoin"}`,
expected: HeartwoodFilter{ expected: HeartwoodFilter{
Legacy: roots.Filter{ Root: roots.Filter{
IDs: []string{"abc"}, IDs: []string{"abc"},
Extensions: map[string]json.RawMessage{ Extensions: map[string]json.RawMessage{
"search": json.RawMessage(`"bitcoin"`), "search": json.RawMessage(`"bitcoin"`),
@@ -188,7 +188,7 @@ func TestUnmarshalJSON(t *testing.T) {
expectEqualHeartwoodFilters(t, result, tc.expected) expectEqualHeartwoodFilters(t, result, tc.expected)
// Ensure graph extension was popped from legacy filter // Ensure graph extension was popped from legacy filter
assert.Nil(t, result.Legacy.Extensions["graph"]) assert.Nil(t, result.Root.Extensions["graph"])
}) })
} }
} }