fix: remove must

Author: alanshaw

examples/capability_definition_test.go

@@ -7,7 +7,6 @@ import (
 	"github.com/alanshaw/ucantone/examples/types"
 	"github.com/alanshaw/ucantone/ipld/datamodel"
 	"github.com/alanshaw/ucantone/principal/ed25519"
-	"github.com/alanshaw/ucantone/ucan/command"
 	"github.com/alanshaw/ucantone/ucan/delegation"
 	"github.com/alanshaw/ucantone/ucan/delegation/policy"
 	"github.com/alanshaw/ucantone/ucan/invocation"
@@ -19,9 +18,9 @@ func TestCapabilityDefinition(t *testing.T) {
 	// you get a typed Delegate and Invoke method (see below).
 	// i.e. the args parameter for those methods is the type you define here.
 	messageSendCapability, err := capability.New[*types.MessageSendArguments](
-		must(command.Parse("/message/send")),
-		capability.WithPolicy(
-			must(policy.Build(policy.NotEqual(".to", []string{}))),
+		"/message/send",
+		capability.WithPolicyBuilder(
+			policy.NotEqual(".to", []string{}),
 		),
 	)
 	if err != nil {
@@ -76,7 +75,7 @@ func TestCapabilityDefinitionGenericMap(t *testing.T) {
 	// i.e. no information about what keys can be added and no type information
 	// for values.
 	messageSendCapability, err := capability.New[*datamodel.Map](
-		must(command.Parse("/message/send")),
+		"/message/send",
 		capability.WithPolicyBuilder(
 			policy.NotEqual(".to", []string{}),
 		),
@@ -127,10 +126,3 @@ func TestCapabilityDefinitionGenericMap(t *testing.T) {
 	// Now, send the invocation to the service. You'll probably want to put the
 	// invocation and delegation in a Container and send a HTTP request...
 }
-
-func must[T any](v T, err error) T {
-	if err != nil {
-		panic(err)
-	}
-	return v
-}

examples/container_test.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/alanshaw/ucantone/ipld"
 	"github.com/alanshaw/ucantone/principal/ed25519"
-	"github.com/alanshaw/ucantone/ucan/command"
 	"github.com/alanshaw/ucantone/ucan/container"
 	"github.com/alanshaw/ucantone/ucan/delegation"
 	"github.com/alanshaw/ucantone/ucan/delegation/policy"
@@ -30,7 +29,7 @@ func TestContainer(t *testing.T) {
 	dlg, err := delegation.Delegate(
 		mailer,
 		alice,
-		must(command.Parse("/message/send")),
+		"/message/send",
 		delegation.WithSubject(mailer),
 		delegation.WithPolicyBuilder(
 			policy.All(".to", policy.Like(".", "*.example.com")),
@@ -45,7 +44,7 @@ func TestContainer(t *testing.T) {
 	inv, err := invocation.Invoke(
 		alice,
 		mailer,
-		must(command.Parse("/message/send")),
+		"/message/send",
 		ipld.Map{
 			"to":      []string{"bob@example.com"},
 			"subject": "Hello!",

examples/delegations_test.go

@@ -4,7 +4,6 @@ import (
 	"testing"
 
 	"github.com/alanshaw/ucantone/principal/ed25519"
-	"github.com/alanshaw/ucantone/ucan/command"
 	"github.com/alanshaw/ucantone/ucan/delegation"
 	"github.com/alanshaw/ucantone/ucan/delegation/policy"
 )
@@ -30,26 +29,23 @@ func TestDelegations(t *testing.T) {
 	_, err = delegation.Delegate(
 		mailer,
 		alice,
-		must(command.Parse("/message/send")),
+		"/message/send",
 		delegation.WithSubject(mailer),
 	)
 	if err != nil {
 		panic(err)
 	}
 
-	// alice delegates bob capability to use the email service, but only allows
-	// bob to send to example.com email addresses
-	policy, err := policy.Build(policy.All(".to", policy.Like(".", "*.example.com")))
-	if err != nil {
-		panic(err)
-	}
-
 	_, err = delegation.Delegate(
 		alice,
 		bob,
-		must(command.Parse("/message/send")),
+		"/message/send",
 		delegation.WithSubject(mailer),
-		delegation.WithPolicy(policy),
+		// alice delegates bob capability to use the email service, but only allows
+		// bob to send to example.com email addresses
+		delegation.WithPolicyBuilder(
+			policy.All(".to", policy.Like(".", "*.example.com")),
+		),
 	)
 	if err != nil {
 		panic(err)

validator/capability/capability.go

@@ -2,12 +2,14 @@ package capability
 
 import (
 	"errors"
+	"fmt"
 	"reflect"
 
 	"github.com/alanshaw/ucantone/ipld"
 	"github.com/alanshaw/ucantone/ipld/codec/dagcbor"
 	"github.com/alanshaw/ucantone/ipld/datamodel"
 	"github.com/alanshaw/ucantone/ucan"
+	"github.com/alanshaw/ucantone/ucan/command"
 	"github.com/alanshaw/ucantone/ucan/delegation"
 	"github.com/alanshaw/ucantone/ucan/delegation/policy"
 	"github.com/alanshaw/ucantone/ucan/invocation"
@@ -72,6 +74,10 @@ func New[A Arguments](cmd ucan.Command, options ...Option) (*Capability[A], erro
 			return nil, err
 		}
 	}
+	cmd, err := command.Parse(string(cmd))
+	if err != nil {
+		return nil, fmt.Errorf("parsing command: %w", err)
+	}
 	return &Capability[A]{cmd, cfg.pol}, nil
 }