go/ucan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename tokens to token

Browse Source
This commit is contained in:
Michael Muré
2024-10-01 17:02:49 +02:00
parent 8782554a7b
commit bb4725d87c
22 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
tokens/delegation/delegation.go → token/delegation/delegation.go
View File

0
tokens/delegation/delegation.ipldsch → token/delegation/delegation.ipldsch
View File

2
tokens/delegation/delegation_test.go → token/delegation/delegation_test.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/ucan-wg/go-ucan/did" "github.com/ucan-wg/go-ucan/did"
"github.com/ucan-wg/go-ucan/pkg/command" "github.com/ucan-wg/go-ucan/pkg/command"
"github.com/ucan-wg/go-ucan/pkg/policy" "github.com/ucan-wg/go-ucan/pkg/policy"
"github.com/ucan-wg/go-ucan/tokens/delegation" "github.com/ucan-wg/go-ucan/token/delegation"
) )
const ( const (

5
tokens/delegation/examples_test.go → token/delegation/examples_test.go
View File

@@ -12,11 +12,12 @@ import (
"github.com/ipld/go-ipld-prime/codec/dagcbor" "github.com/ipld/go-ipld-prime/codec/dagcbor"
"github.com/ipld/go-ipld-prime/codec/dagjson" "github.com/ipld/go-ipld-prime/codec/dagjson"
"github.com/libp2p/go-libp2p/core/crypto" "github.com/libp2p/go-libp2p/core/crypto"
"github.com/ucan-wg/go-ucan/did" "github.com/ucan-wg/go-ucan/did"
"github.com/ucan-wg/go-ucan/pkg/command" "github.com/ucan-wg/go-ucan/pkg/command"
"github.com/ucan-wg/go-ucan/pkg/policy" "github.com/ucan-wg/go-ucan/pkg/policy"
"github.com/ucan-wg/go-ucan/tokens/delegation" "github.com/ucan-wg/go-ucan/token/delegation"
"github.com/ucan-wg/go-ucan/tokens/internal/envelope" "github.com/ucan-wg/go-ucan/token/internal/envelope"
) )
// The following example shows how to create a delegation.Token with // The following example shows how to create a delegation.Token with

2
tokens/delegation/ipld.go → token/delegation/ipld.go
View File

@@ -12,7 +12,7 @@ import (
"github.com/libp2p/go-libp2p/core/crypto" "github.com/libp2p/go-libp2p/core/crypto"
"github.com/ucan-wg/go-ucan/did" "github.com/ucan-wg/go-ucan/did"
"github.com/ucan-wg/go-ucan/tokens/internal/envelope" "github.com/ucan-wg/go-ucan/token/internal/envelope"
) )
// ToSealed wraps the delegation token in an envelope, generates the // ToSealed wraps the delegation token in an envelope, generates the

0
tokens/delegation/options.go → token/delegation/options.go
View File

2
tokens/delegation/schema.go → token/delegation/schema.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/ipld/go-ipld-prime/schema" "github.com/ipld/go-ipld-prime/schema"
"github.com/ucan-wg/go-ucan/pkg/meta" "github.com/ucan-wg/go-ucan/pkg/meta"
"github.com/ucan-wg/go-ucan/tokens/internal/envelope" "github.com/ucan-wg/go-ucan/token/internal/envelope"
) )
// [Tag] is the string used as a key within the SigPayload that identifies // [Tag] is the string used as a key within the SigPayload that identifies

4
tokens/delegation/schema_test.go → token/delegation/schema_test.go
View File

@@ -11,8 +11,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gotest.tools/v3/golden" "gotest.tools/v3/golden"
"github.com/ucan-wg/go-ucan/tokens/delegation" "github.com/ucan-wg/go-ucan/token/delegation"
"github.com/ucan-wg/go-ucan/tokens/internal/envelope" "github.com/ucan-wg/go-ucan/token/internal/envelope"
) )
//go:embed delegation.ipldsch //go:embed delegation.ipldsch

0
tokens/delegation/testdata/new.dagjson → token/delegation/testdata/new.dagjson vendored
View File

0
tokens/delegation/testdata/root.dagjson → token/delegation/testdata/root.dagjson vendored
View File

4
tokens/inspect.go → token/inspect.go
View File

@@ -1,9 +1,9 @@
package tokens package token
import ( import (
"github.com/ipld/go-ipld-prime/datamodel" "github.com/ipld/go-ipld-prime/datamodel"
"github.com/ucan-wg/go-ucan/tokens/internal/envelope" "github.com/ucan-wg/go-ucan/token/internal/envelope"
) )
type Info = envelope.Info type Info = envelope.Info

0
tokens/internal/envelope/cid.go → token/internal/envelope/cid.go
View File

2
tokens/internal/envelope/cid_test.go → token/internal/envelope/cid_test.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gotest.tools/v3/golden" "gotest.tools/v3/golden"
"github.com/ucan-wg/go-ucan/tokens/internal/envelope" "github.com/ucan-wg/go-ucan/token/internal/envelope"
) )
func TestCidFromBytes(t *testing.T) { func TestCidFromBytes(t *testing.T) {

2
tokens/internal/envelope/example_test.go → token/internal/envelope/example_test.go
View File

@@ -18,7 +18,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gotest.tools/v3/golden" "gotest.tools/v3/golden"
"github.com/ucan-wg/go-ucan/tokens/internal/envelope" "github.com/ucan-wg/go-ucan/token/internal/envelope"
) )
const ( const (

2
tokens/internal/envelope/ipld.go → token/internal/envelope/ipld.go
View File

@@ -43,7 +43,7 @@ import (
"github.com/libp2p/go-libp2p/core/crypto" "github.com/libp2p/go-libp2p/core/crypto"
"github.com/ucan-wg/go-ucan/did" "github.com/ucan-wg/go-ucan/did"
"github.com/ucan-wg/go-ucan/tokens/internal/varsig" "github.com/ucan-wg/go-ucan/token/internal/varsig"
) )
const ( const (

2
tokens/internal/envelope/ipld_test.go → token/internal/envelope/ipld_test.go
View File

@@ -13,7 +13,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gotest.tools/v3/golden" "gotest.tools/v3/golden"
"github.com/ucan-wg/go-ucan/tokens/internal/envelope" "github.com/ucan-wg/go-ucan/token/internal/envelope"
) )
func TestDecode(t *testing.T) { func TestDecode(t *testing.T) {

0
tokens/internal/envelope/testdata/example.dagcbor → token/internal/envelope/testdata/example.dagcbor vendored
View File

0
tokens/internal/envelope/testdata/example.dagjson → token/internal/envelope/testdata/example.dagjson vendored
View File

0
tokens/internal/envelope/testdata/example.ipldsch → token/internal/envelope/testdata/example.ipldsch vendored
View File

0
tokens/internal/varsig/varsig.go → token/internal/varsig/varsig.go
View File

2
tokens/internal/varsig/varsig_test.go → token/internal/varsig/varsig_test.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/libp2p/go-libp2p/core/crypto/pb" "github.com/libp2p/go-libp2p/core/crypto/pb"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/ucan-wg/go-ucan/tokens/internal/varsig" "github.com/ucan-wg/go-ucan/token/internal/varsig"
) )
func TestDecode(t *testing.T) { func TestDecode(t *testing.T) {

20
tokens/read.go → token/read.go
View File

@@ -1,4 +1,4 @@
package tokens package token
import ( import (
"fmt" "fmt"
@@ -10,8 +10,8 @@ import (
"github.com/ipld/go-ipld-prime/codec/dagjson" "github.com/ipld/go-ipld-prime/codec/dagjson"
"github.com/ipld/go-ipld-prime/datamodel" "github.com/ipld/go-ipld-prime/datamodel"
"github.com/ucan-wg/go-ucan/tokens/delegation" "github.com/ucan-wg/go-ucan/token/delegation"
"github.com/ucan-wg/go-ucan/tokens/internal/envelope" "github.com/ucan-wg/go-ucan/token/internal/envelope"
) )
// Decode unmarshals the input data using the format specified by the // Decode unmarshals the input data using the format specified by the
@@ -20,7 +20,7 @@ import (
// Token is invalid. // Token is invalid.
// Supported and returned types are: // Supported and returned types are:
// - delegation.Token // - delegation.Token
func Decode(b []byte, decFn codec.Decoder) (any, error) { func Decode(b []byte, decFn codec.Decoder) (Token, error) {
node, err := ipld.Decode(b, decFn) node, err := ipld.Decode(b, decFn)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -29,7 +29,7 @@ func Decode(b []byte, decFn codec.Decoder) (any, error) {
} }
// DecodeReader is the same as Decode, but accept an io.Reader. // DecodeReader is the same as Decode, but accept an io.Reader.
func DecodeReader(r io.Reader, decFn codec.Decoder) (any, error) { func DecodeReader(r io.Reader, decFn codec.Decoder) (Token, error) {
node, err := ipld.DecodeStreaming(r, decFn) node, err := ipld.DecodeStreaming(r, decFn)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -42,12 +42,12 @@ func DecodeReader(r io.Reader, decFn codec.Decoder) (any, error) {
// Token is invalid. // Token is invalid.
// Supported and returned types are: // Supported and returned types are:
// - delegation.Token // - delegation.Token
func FromDagCbor(b []byte) (any, error) { func FromDagCbor(b []byte) (Token, error) {
return Decode(b, dagcbor.Decode) return Decode(b, dagcbor.Decode)
} }
// FromDagCborReader is the same as FromDagCbor, but accept an io.Reader. // FromDagCborReader is the same as FromDagCbor, but accept an io.Reader.
func FromDagCborReader(r io.Reader) (any, error) { func FromDagCborReader(r io.Reader) (Token, error) {
return DecodeReader(r, dagcbor.Decode) return DecodeReader(r, dagcbor.Decode)
} }
@@ -56,16 +56,16 @@ func FromDagCborReader(r io.Reader) (any, error) {
// Token is invalid. // Token is invalid.
// Supported and returned types are: // Supported and returned types are:
// - delegation.Token // - delegation.Token
func FromDagJson(b []byte) (any, error) { func FromDagJson(b []byte) (Token, error) {
return Decode(b, dagjson.Decode) return Decode(b, dagjson.Decode)
} }
// FromDagJsonReader is the same as FromDagJson, but accept an io.Reader. // FromDagJsonReader is the same as FromDagJson, but accept an io.Reader.
func FromDagJsonReader(r io.Reader) (any, error) { func FromDagJsonReader(r io.Reader) (Token, error) {
return DecodeReader(r, dagjson.Decode) return DecodeReader(r, dagjson.Decode)
} }
func fromIPLD(node datamodel.Node) (any, error) { func fromIPLD(node datamodel.Node) (Token, error) {
tag, err := envelope.FindTag(node) tag, err := envelope.FindTag(node)
if err != nil { if err != nil {
return nil, err return nil, err