From abe8a8150a5dc2c7d53313b6e1cdc362c70151e9 Mon Sep 17 00:00:00 2001 From: Steve Moyer Date: Wed, 18 Sep 2024 13:57:40 -0400 Subject: [PATCH] feat(delegation): make model(s) unexported --- delegation/ipld.go | 8 ++++---- delegation/schema.go | 16 ++++++++-------- delegation/view.go | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/delegation/ipld.go b/delegation/ipld.go index a64be83..d99c613 100644 --- a/delegation/ipld.go +++ b/delegation/ipld.go @@ -88,14 +88,14 @@ func (d *View) ToIPLD(privKey crypto.PrivKey) (datamodel.Node, error) { exp = &u } - model := &PayloadModel{ + model := &tokenPayloadModel{ Iss: d.Issuer.String(), Aud: d.Audience.String(), Sub: sub, Cmd: d.Command.String(), Pol: pol, Nonce: d.Nonce, - Meta: MetaModel{ + Meta: metaModel{ Keys: metaKeys, Values: d.Meta, }, @@ -159,10 +159,10 @@ func FromDagJsonReader(r io.Reader) (*View, error) { // An error is returned if the conversion fails, or if the resulting // View is invalid. func FromIPLD(node datamodel.Node) (*View, error) { - tkn, _, err := envelope.FromIPLD[*PayloadModel](node) // TODO add CID to view + tkn, _, err := envelope.FromIPLD[*tokenPayloadModel](node) // TODO add CID to view if err != nil { return nil, err } - return ViewFromModel(*tkn) + return viewFromModel(*tkn) } diff --git a/delegation/schema.go b/delegation/schema.go index 6dde5aa..d4e9f57 100644 --- a/delegation/schema.go +++ b/delegation/schema.go @@ -33,13 +33,13 @@ func mustLoadSchema() *schema.TypeSystem { return ts } -func PayloadType() schema.Type { +func payloadType() schema.Type { return mustLoadSchema().TypeByName("Payload") } -var _ envelope.Tokener = (*PayloadModel)(nil) +var _ envelope.Tokener = (*tokenPayloadModel)(nil) -type PayloadModel struct { +type tokenPayloadModel struct { // Issuer DID (sender) Iss string // Audience DID (receiver) @@ -59,7 +59,7 @@ type PayloadModel struct { // Arbitrary Metadata // optional: can be nil - Meta MetaModel + Meta metaModel // "Not before" UTC Unix Timestamp in seconds (valid from), 53-bits integer // optional: can be nil @@ -69,15 +69,15 @@ type PayloadModel struct { Exp *int64 } -func (e *PayloadModel) Prototype() schema.TypedPrototype { - return bindnode.Prototype((*PayloadModel)(nil), PayloadType()) +func (e *tokenPayloadModel) Prototype() schema.TypedPrototype { + return bindnode.Prototype((*tokenPayloadModel)(nil), payloadType()) } -func (*PayloadModel) Tag() string { +func (*tokenPayloadModel) Tag() string { return Tag } -type MetaModel struct { +type metaModel struct { Keys []string Values map[string]datamodel.Node } diff --git a/delegation/view.go b/delegation/view.go index 1b8dfc7..97dc8b6 100644 --- a/delegation/view.go +++ b/delegation/view.go @@ -32,9 +32,9 @@ type View struct { Expiration *time.Time } -// ViewFromModel build a decoded view of the raw IPLD data. +// viewFromModel build a decoded view of the raw IPLD data. // This function also serves as validation. -func ViewFromModel(m PayloadModel) (*View, error) { +func viewFromModel(m tokenPayloadModel) (*View, error) { var view View var err error