From 476f6406ec0262ffd3089db3727a891622840ddd Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Mon, 28 Sep 2026 16:26:07 +0100 Subject: [PATCH] chore: upgrade dag-json-gen --- go.mod | 2 +- go.sum | 4 ++-- .../policy/datamodel/dag_json_gen.go | 24 +++++-------------- ucan/envelope/datamodel/dag_json_gen.go | 4 +--- 4 files changed, 10 insertions(+), 24 deletions(-) diff --git a/go.mod b/go.mod index f4a2835..6624483 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/fil-forge/ucantone go 1.27.0 require ( - github.com/alanshaw/dag-json-gen v0.0.9 + github.com/alanshaw/dag-json-gen v0.0.10 github.com/gobwas/glob v0.2.3 github.com/ipfs/go-cid v0.6.2 github.com/multiformats/go-multibase v0.3.0 diff --git a/go.sum b/go.sum index abbb7b2..8315e94 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/alanshaw/dag-json-gen v0.0.9 h1:q59Ra1mQB6HnFGI1ilFxsZvF1CqGN0XDlUWq16EJ6pw= -github.com/alanshaw/dag-json-gen v0.0.9/go.mod h1:v1YBZcS4B355MqxtyQr+fGNbEhm0CzHd+gOqOO/MZ+I= +github.com/alanshaw/dag-json-gen v0.0.10 h1:UXHflszpCdeitrJXSWMiMy2LW2pYwfKfFszkoXFoaF0= +github.com/alanshaw/dag-json-gen v0.0.10/go.mod h1:v1YBZcS4B355MqxtyQr+fGNbEhm0CzHd+gOqOO/MZ+I= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/ipfs/go-cid v0.6.2 h1:VuGwJd+KJTaMJ4S4d5EEf9SXc17YUblS5axCbocn9YE= diff --git a/ucan/delegation/policy/datamodel/dag_json_gen.go b/ucan/delegation/policy/datamodel/dag_json_gen.go index b44e9b5..aff09a8 100644 --- a/ucan/delegation/policy/datamodel/dag_json_gen.go +++ b/ucan/delegation/policy/datamodel/dag_json_gen.go @@ -157,9 +157,7 @@ func (t *ComparisonModel) UnmarshalDagJSON(r io.Reader) (err error) { return fmt.Errorf("peeking array close for field ComparisonModel: %w", err) } if close { - if err := jr.ReadArrayClose(); err != nil { - return fmt.Errorf("reading array close for field ComparisonModel: %w", err) - } + return fmt.Errorf("json input has too few fields 0 < 3") } else { // t.Op (string) (string) @@ -294,9 +292,7 @@ func (t *WildcardModel) UnmarshalDagJSON(r io.Reader) (err error) { return fmt.Errorf("peeking array close for field WildcardModel: %w", err) } if close { - if err := jr.ReadArrayClose(); err != nil { - return fmt.Errorf("reading array close for field WildcardModel: %w", err) - } + return fmt.Errorf("json input has too few fields 0 < 3") } else { // t.Op (string) (string) @@ -428,9 +424,7 @@ func (t *ConjunctionModel) UnmarshalDagJSON(r io.Reader) (err error) { return fmt.Errorf("peeking array close for field ConjunctionModel: %w", err) } if close { - if err := jr.ReadArrayClose(); err != nil { - return fmt.Errorf("reading array close for field ConjunctionModel: %w", err) - } + return fmt.Errorf("json input has too few fields 0 < 2") } else { // t.Op (string) (string) @@ -582,9 +576,7 @@ func (t *DisjunctionModel) UnmarshalDagJSON(r io.Reader) (err error) { return fmt.Errorf("peeking array close for field DisjunctionModel: %w", err) } if close { - if err := jr.ReadArrayClose(); err != nil { - return fmt.Errorf("reading array close for field DisjunctionModel: %w", err) - } + return fmt.Errorf("json input has too few fields 0 < 2") } else { // t.Op (string) (string) @@ -718,9 +710,7 @@ func (t *NegationModel) UnmarshalDagJSON(r io.Reader) (err error) { return fmt.Errorf("peeking array close for field NegationModel: %w", err) } if close { - if err := jr.ReadArrayClose(); err != nil { - return fmt.Errorf("reading array close for field NegationModel: %w", err) - } + return fmt.Errorf("json input has too few fields 0 < 2") } else { // t.Op (string) (string) @@ -830,9 +820,7 @@ func (t *QuantificationModel) UnmarshalDagJSON(r io.Reader) (err error) { return fmt.Errorf("peeking array close for field QuantificationModel: %w", err) } if close { - if err := jr.ReadArrayClose(); err != nil { - return fmt.Errorf("reading array close for field QuantificationModel: %w", err) - } + return fmt.Errorf("json input has too few fields 0 < 3") } else { // t.Op (string) (string) diff --git a/ucan/envelope/datamodel/dag_json_gen.go b/ucan/envelope/datamodel/dag_json_gen.go index 2468805..1d31bf7 100644 --- a/ucan/envelope/datamodel/dag_json_gen.go +++ b/ucan/envelope/datamodel/dag_json_gen.go @@ -70,9 +70,7 @@ func (t *EnvelopeModel) UnmarshalDagJSON(r io.Reader) (err error) { return fmt.Errorf("peeking array close for field EnvelopeModel: %w", err) } if close { - if err := jr.ReadArrayClose(); err != nil { - return fmt.Errorf("reading array close for field EnvelopeModel: %w", err) - } + return fmt.Errorf("json input has too few fields 0 < 2") } else { // t.Signature ([]uint8) (slice)