fix: add tests

Author: alanshaw

server/retrieval/cache_test.go

@@ -0,0 +1,55 @@
+package retrieval
+
+import (
+	"testing"
+
+	"github.com/storacha/go-ucanto/core/delegation"
+	"github.com/storacha/go-ucanto/testing/fixtures"
+	"github.com/storacha/go-ucanto/ucan"
+	"github.com/stretchr/testify/require"
+)
+
+func TestMemoryDelegationCache(t *testing.T) {
+	dlg, err := delegation.Delegate(
+		fixtures.Alice,
+		fixtures.Alice,
+		[]ucan.Capability[ucan.NoCaveats]{
+			ucan.NewCapability(
+				"test/cache",
+				fixtures.Alice.DID().String(),
+				ucan.NoCaveats{},
+			),
+		},
+	)
+	require.NoError(t, err)
+
+	t.Run("put", func(t *testing.T) {
+		cache, err := NewMemoryDelegationCache(5)
+		require.NoError(t, err)
+		err = cache.Put(t.Context(), dlg)
+		require.NoError(t, err)
+	})
+
+	t.Run("get", func(t *testing.T) {
+		cache, err := NewMemoryDelegationCache(5)
+		require.NoError(t, err)
+
+		err = cache.Put(t.Context(), dlg)
+		require.NoError(t, err)
+
+		cached, ok, err := cache.Get(t.Context(), dlg.Link())
+		require.NoError(t, err)
+		require.True(t, ok)
+		require.Equal(t, dlg.Link().String(), cached.Link().String())
+	})
+
+	t.Run("miss", func(t *testing.T) {
+		cache, err := NewMemoryDelegationCache(5)
+		require.NoError(t, err)
+
+		cached, ok, err := cache.Get(t.Context(), dlg.Link())
+		require.NoError(t, err)
+		require.False(t, ok)
+		require.Nil(t, cached)
+	})
+}

server/retrieval/datamodel/errors.go

@@ -37,3 +37,12 @@ type MissingProofsModel struct {
 	Message string
 	Proofs  []ipld.Link
 }
+
+func AgentMessageInvocationErrorType() schema.Type {
+	return errorTypeSystem.TypeByName("AgentMessageInvocationError")
+}
+
+type AgentMessageInvocationErrorModel struct {
+	Name    string
+	Message string
+}

server/retrieval/datamodel/errors.ipldsch

@@ -3,3 +3,8 @@ type MissingProofs struct {
 	message String
 	proofs [Link]
 }
+
+type AgentMessageInvocationError struct {
+	name String
+	message String
+}

server/retrieval/datamodel/errors_test.go

@@ -0,0 +1,46 @@
+package datamodel
+
+import (
+	"testing"
+
+	"github.com/ipld/go-ipld-prime"
+	"github.com/storacha/go-ucanto/core/ipld/codec/json"
+	"github.com/storacha/go-ucanto/testing/helpers"
+	"github.com/stretchr/testify/require"
+)
+
+func TestAgentMessageInvocationError(t *testing.T) {
+	t.Run("encode decode", func(t *testing.T) {
+		mdl := AgentMessageInvocationErrorModel{
+			Name:    "AgentMessageInvocationError",
+			Message: "boom",
+		}
+		data, err := json.Encode(&mdl, AgentMessageInvocationErrorType())
+		require.NoError(t, err)
+		var decoded AgentMessageInvocationErrorModel
+		err = json.Decode(data, &decoded, AgentMessageInvocationErrorType())
+		require.NoError(t, err)
+		require.Equal(t, mdl.Name, decoded.Name)
+		require.Equal(t, mdl.Message, decoded.Message)
+	})
+}
+
+func TestMissingProofs(t *testing.T) {
+	t.Run("encode decode", func(t *testing.T) {
+		prf := helpers.RandomCID()
+		mdl := MissingProofsModel{
+			Name:    "MissingProofs",
+			Message: "boom",
+			Proofs:  []ipld.Link{prf},
+		}
+		data, err := json.Encode(&mdl, MissingProofsType())
+		require.NoError(t, err)
+		var decoded MissingProofsModel
+		err = json.Decode(data, &decoded, MissingProofsType())
+		require.NoError(t, err)
+		require.Equal(t, mdl.Name, decoded.Name)
+		require.Equal(t, mdl.Message, decoded.Message)
+		require.Len(t, decoded.Proofs, 1)
+		require.Equal(t, prf.String(), decoded.Proofs[0].String())
+	})
+}

server/retrieval/error.go

@@ -5,7 +5,6 @@ import (
 	"strings"
 
 	"github.com/storacha/go-ucanto/core/ipld"
-	"github.com/storacha/go-ucanto/core/result/failure"
 	rdm "github.com/storacha/go-ucanto/server/retrieval/datamodel"
 )
 
@@ -20,7 +19,11 @@ func (amie AgentMessageInvocationError) Name() string {
 }
 
 func (amie AgentMessageInvocationError) ToIPLD() (ipld.Node, error) {
-	return failure.FromError(amie).ToIPLD()
+	mdl := rdm.AgentMessageInvocationErrorModel{
+		Name:    amie.Name(),
+		Message: amie.Error(),
+	}
+	return ipld.WrapWithRecovery(&mdl, rdm.AgentMessageInvocationErrorType())
 }
 
 func NewAgentMessageInvocationError() AgentMessageInvocationError {

server/retrieval/server.go

@@ -10,19 +10,19 @@ import (
 	"strings"
 	"time"
 
+	ipldprime "github.com/ipld/go-ipld-prime"
+	"github.com/ipld/go-ipld-prime/codec/dagjson"
 	"github.com/storacha/go-ucanto/core/dag/blockstore"
 	"github.com/storacha/go-ucanto/core/delegation"
 	"github.com/storacha/go-ucanto/core/invocation"
 	"github.com/storacha/go-ucanto/core/invocation/ran"
 	"github.com/storacha/go-ucanto/core/ipld"
-	"github.com/storacha/go-ucanto/core/ipld/codec/json"
 	"github.com/storacha/go-ucanto/core/message"
 	"github.com/storacha/go-ucanto/core/receipt"
 	"github.com/storacha/go-ucanto/core/result"
 	"github.com/storacha/go-ucanto/core/result/failure"
 	"github.com/storacha/go-ucanto/principal"
 	"github.com/storacha/go-ucanto/server"
-	rdm "github.com/storacha/go-ucanto/server/retrieval/datamodel"
 	"github.com/storacha/go-ucanto/server/transaction"
 	"github.com/storacha/go-ucanto/transport"
 	"github.com/storacha/go-ucanto/transport/headercar"
@@ -292,7 +292,11 @@ func Execute(ctx context.Context, srv CachingServer, msg message.AgentMessage, r
 	if err != nil {
 		mpe := MissingProofs{}
 		if errors.As(err, &mpe) {
-			body, err := json.Encode(&mpe, rdm.MissingProofsType())
+			n, err := mpe.ToIPLD()
+			if err != nil {
+				return nil, Response{}, fmt.Errorf("building missing proofs IPLD view: %w", err)
+			}
+			body, err := ipldprime.Encode(n, dagjson.Encode)
 			if err != nil {
 				return nil, Response{}, fmt.Errorf("encoding missing proofs repsonse: %w", err)
 			}