Fix optional field handling in IPLD typed representation

Author: masih

federation/federation.go

@@ -139,7 +139,7 @@ func (f *Federation) snapshot(ctx context.Context, t time.Time) error {
 		newSnapshot.Providers.Put(key, value)
 	}
 
-	node := bindnode.Wrap(newSnapshot, Prototypes.Snapshot.Type())
+	node := bindnode.Wrap(newSnapshot, Prototypes.Snapshot.Type()).Representation()
 	headSnapshotLink, err := f.linkSystem.Store(ipld.LinkContext{Ctx: ctx}, Prototypes.link, node)
 	if err != nil {
 		f.vc.untick(f.host.ID())
@@ -186,7 +186,7 @@ func (f *Federation) getHeadNode(ctx context.Context) (ipld.Node, error) {
 		logger.Errorw("Failed to sign head", "err", err)
 		return nil, err
 	}
-	f.headNodeCache = bindnode.Wrap(head, Prototypes.Head.Type())
+	f.headNodeCache = bindnode.Wrap(head, Prototypes.Head.Type()).Representation()
 	return f.headNodeCache, nil
 }
 

federation/federation_test.go

@@ -122,7 +122,6 @@ func TestFederationStandalone(t *testing.T) {
 		if recorder.Code != http.StatusOK {
 			return false
 		}
-		t.Log(recorder.Body.String())
 		builder := federation.Prototypes.Head.NewBuilder()
 		err := dagjson.Decode(builder, recorder.Body)
 		if err != nil {

federation/handlers.go

@@ -11,7 +11,7 @@ import (
 	"github.com/ipld/go-ipld-prime/codec/dagjson"
 	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
 	"github.com/ipld/go-ipld-prime/multicodec"
-	"github.com/ipld/go-ipld-prime/node/basicnode"
+	"github.com/ipld/go-ipld-prime/schema"
 )
 
 func (f *Federation) handleV1FedHead(w http.ResponseWriter, r *http.Request) {
@@ -58,7 +58,7 @@ func (f *Federation) handleV1FedSubtree(w http.ResponseWriter, r *http.Request)
 
 	ctx := ipld.LinkContext{Ctx: r.Context()}
 	lnk := cidlink.Link{Cid: c}
-	node, err := f.linkSystem.Load(ctx, lnk, basicnode.Prototype.Any)
+	node, err := f.linkSystem.Load(ctx, lnk, Prototypes.Snapshot)
 	if err != nil {
 		if errors.Is(err, datastore.ErrNotFound) || errors.Is(err, ipld.ErrNotExists{}) {
 			http.Error(w, "", http.StatusNotFound)
@@ -68,7 +68,7 @@ func (f *Federation) handleV1FedSubtree(w http.ResponseWriter, r *http.Request)
 		http.Error(w, "", http.StatusInternalServerError)
 		return
 	}
-	if err := encoder(node, w); err != nil {
+	if err := encoder(node.(schema.TypedNode).Representation(), w); err != nil {
 		logger.Errorw("Failed to encode node", "err", err)
 	}
 }