From 593c392ef3a83ad361af9f10d19eb2871cb84580 Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Fri, 1 Jan 2021 11:15:16 +1100 Subject: [PATCH] deps: go-ipld-prime v0.7.0 (revert ConvertFrom()) --- go.mod | 2 +- go.sum | 4 +-- ipldsch_minima.go | 2 +- ipldsch_satisfaction.go | 60 ++++++++++++++++++++--------------------- marshal.go | 2 +- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/go.mod b/go.mod index 63202b3..81e6a72 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/ipfs/go-cid v0.0.7 - github.com/ipld/go-ipld-prime v0.6.1-0.20201227090628-8fa241ea45dd + github.com/ipld/go-ipld-prime v0.7.0 github.com/mr-tron/base58 v1.2.0 // indirect github.com/multiformats/go-multihash v0.0.14 // indirect github.com/multiformats/go-varint v0.0.6 // indirect diff --git a/go.sum b/go.sum index 8b1bb8d..21c1f77 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,8 @@ github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORR github.com/ipfs/go-cid v0.0.4/go.mod h1:4LLaPOQwmk5z9LBgQnpkivrx8BJjUyGwTXCd5Xfj6+M= github.com/ipfs/go-cid v0.0.7 h1:ysQJVJA3fNDF1qigJbsSQOdjhVLsOEoPdh0+R97k3jY= github.com/ipfs/go-cid v0.0.7/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I= -github.com/ipld/go-ipld-prime v0.6.1-0.20201227090628-8fa241ea45dd h1:JaCzy+0wdyqaNaabtSBcdQY5JEKpG1ppMfH6PM7mZ1A= -github.com/ipld/go-ipld-prime v0.6.1-0.20201227090628-8fa241ea45dd/go.mod h1:0xEgdD6MKbZ1vF0GC+YcR/C4SQCAlRuOjIJ2i0HxqzM= +github.com/ipld/go-ipld-prime v0.7.0 h1:eigF1ZpaL1prbsKYVMqPLoPJqD/pzkQOe2j1uzvVg7w= +github.com/ipld/go-ipld-prime v0.7.0/go.mod h1:0xEgdD6MKbZ1vF0GC+YcR/C4SQCAlRuOjIJ2i0HxqzM= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g= diff --git a/ipldsch_minima.go b/ipldsch_minima.go index 3631c40..c563ca2 100644 --- a/ipldsch_minima.go +++ b/ipldsch_minima.go @@ -44,7 +44,7 @@ func (ea _ErrorThunkAssembler) AssignFloat(float64) error { return ea.e } func (ea _ErrorThunkAssembler) AssignString(string) error { return ea.e } func (ea _ErrorThunkAssembler) AssignBytes([]byte) error { return ea.e } func (ea _ErrorThunkAssembler) AssignLink(ipld.Link) error { return ea.e } -func (ea _ErrorThunkAssembler) ConvertFrom(ipld.Node) error { return ea.e } +func (ea _ErrorThunkAssembler) AssignNode(ipld.Node) error { return ea.e } func (ea _ErrorThunkAssembler) Prototype() ipld.NodePrototype { panic(fmt.Errorf("cannot get prototype from error-carrying assembler: already derailed with error: %w", ea.e)) } diff --git a/ipldsch_satisfaction.go b/ipldsch_satisfaction.go index 5e9ad00..a9aac7c 100644 --- a/ipldsch_satisfaction.go +++ b/ipldsch_satisfaction.go @@ -173,7 +173,7 @@ func (na *_Bytes__Assembler) AssignBytes(v []byte) error { func (_Bytes__Assembler) AssignLink(ipld.Link) error { return mixins.BytesAssembler{"dagpb.Bytes"}.AssignLink(nil) } -func (na *_Bytes__Assembler) ConvertFrom(v ipld.Node) error { +func (na *_Bytes__Assembler) AssignNode(v ipld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -376,7 +376,7 @@ func (_Int__Assembler) AssignBytes([]byte) error { func (_Int__Assembler) AssignLink(ipld.Link) error { return mixins.IntAssembler{"dagpb.Int"}.AssignLink(nil) } -func (na *_Int__Assembler) ConvertFrom(v ipld.Node) error { +func (na *_Int__Assembler) AssignNode(v ipld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -579,7 +579,7 @@ func (na *_Link__Assembler) AssignLink(v ipld.Link) error { *na.m = schema.Maybe_Value return nil } -func (na *_Link__Assembler) ConvertFrom(v ipld.Node) error { +func (na *_Link__Assembler) AssignNode(v ipld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -871,7 +871,7 @@ func (_PBLink__Assembler) AssignBytes([]byte) error { func (_PBLink__Assembler) AssignLink(ipld.Link) error { return mixins.MapAssembler{"dagpb.PBLink"}.AssignLink(nil) } -func (na *_PBLink__Assembler) ConvertFrom(v ipld.Node) error { +func (na *_PBLink__Assembler) AssignNode(v ipld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -892,7 +892,7 @@ func (na *_PBLink__Assembler) ConvertFrom(v ipld.Node) error { return nil } if v.Kind() != ipld.Kind_Map { - return ipld.ErrWrongKind{TypeName: "dagpb.PBLink", MethodName: "ConvertFrom", AppropriateKind: ipld.KindSet_JustMap, ActualKind: v.Kind()} + return ipld.ErrWrongKind{TypeName: "dagpb.PBLink", MethodName: "AssignNode", AppropriateKind: ipld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -900,10 +900,10 @@ func (na *_PBLink__Assembler) ConvertFrom(v ipld.Node) error { if err != nil { return err } - if err := na.AssembleKey().ConvertFrom(k); err != nil { + if err := na.AssembleKey().AssignNode(k); err != nil { return err } - if err := na.AssembleValue().ConvertFrom(v); err != nil { + if err := na.AssembleValue().AssignNode(v); err != nil { return err } } @@ -1133,7 +1133,7 @@ func (_PBLink__KeyAssembler) AssignBytes([]byte) error { func (_PBLink__KeyAssembler) AssignLink(ipld.Link) error { return mixins.StringAssembler{"dagpb.PBLink.KeyAssembler"}.AssignLink(nil) } -func (ka *_PBLink__KeyAssembler) ConvertFrom(v ipld.Node) error { +func (ka *_PBLink__KeyAssembler) AssignNode(v ipld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { @@ -1372,7 +1372,7 @@ func (_PBLink__ReprAssembler) AssignBytes([]byte) error { func (_PBLink__ReprAssembler) AssignLink(ipld.Link) error { return mixins.MapAssembler{"dagpb.PBLink.Repr"}.AssignLink(nil) } -func (na *_PBLink__ReprAssembler) ConvertFrom(v ipld.Node) error { +func (na *_PBLink__ReprAssembler) AssignNode(v ipld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -1393,7 +1393,7 @@ func (na *_PBLink__ReprAssembler) ConvertFrom(v ipld.Node) error { return nil } if v.Kind() != ipld.Kind_Map { - return ipld.ErrWrongKind{TypeName: "dagpb.PBLink.Repr", MethodName: "ConvertFrom", AppropriateKind: ipld.KindSet_JustMap, ActualKind: v.Kind()} + return ipld.ErrWrongKind{TypeName: "dagpb.PBLink.Repr", MethodName: "AssignNode", AppropriateKind: ipld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -1401,10 +1401,10 @@ func (na *_PBLink__ReprAssembler) ConvertFrom(v ipld.Node) error { if err != nil { return err } - if err := na.AssembleKey().ConvertFrom(k); err != nil { + if err := na.AssembleKey().AssignNode(k); err != nil { return err } - if err := na.AssembleValue().ConvertFrom(v); err != nil { + if err := na.AssembleValue().AssignNode(v); err != nil { return err } } @@ -1636,7 +1636,7 @@ func (_PBLink__ReprKeyAssembler) AssignBytes([]byte) error { func (_PBLink__ReprKeyAssembler) AssignLink(ipld.Link) error { return mixins.StringAssembler{"dagpb.PBLink.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_PBLink__ReprKeyAssembler) ConvertFrom(v ipld.Node) error { +func (ka *_PBLink__ReprKeyAssembler) AssignNode(v ipld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { @@ -1894,7 +1894,7 @@ func (_PBLinks__Assembler) AssignBytes([]byte) error { func (_PBLinks__Assembler) AssignLink(ipld.Link) error { return mixins.ListAssembler{"dagpb.PBLinks"}.AssignLink(nil) } -func (na *_PBLinks__Assembler) ConvertFrom(v ipld.Node) error { +func (na *_PBLinks__Assembler) AssignNode(v ipld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -1915,7 +1915,7 @@ func (na *_PBLinks__Assembler) ConvertFrom(v ipld.Node) error { return nil } if v.Kind() != ipld.Kind_List { - return ipld.ErrWrongKind{TypeName: "dagpb.PBLinks", MethodName: "ConvertFrom", AppropriateKind: ipld.KindSet_JustList, ActualKind: v.Kind()} + return ipld.ErrWrongKind{TypeName: "dagpb.PBLinks", MethodName: "AssignNode", AppropriateKind: ipld.KindSet_JustList, ActualKind: v.Kind()} } itr := v.ListIterator() for !itr.Done() { @@ -1923,7 +1923,7 @@ func (na *_PBLinks__Assembler) ConvertFrom(v ipld.Node) error { if err != nil { return err } - if err := na.AssembleValue().ConvertFrom(v); err != nil { + if err := na.AssembleValue().AssignNode(v); err != nil { return err } } @@ -2153,7 +2153,7 @@ func (_PBLinks__ReprAssembler) AssignBytes([]byte) error { func (_PBLinks__ReprAssembler) AssignLink(ipld.Link) error { return mixins.ListAssembler{"dagpb.PBLinks.Repr"}.AssignLink(nil) } -func (na *_PBLinks__ReprAssembler) ConvertFrom(v ipld.Node) error { +func (na *_PBLinks__ReprAssembler) AssignNode(v ipld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -2174,7 +2174,7 @@ func (na *_PBLinks__ReprAssembler) ConvertFrom(v ipld.Node) error { return nil } if v.Kind() != ipld.Kind_List { - return ipld.ErrWrongKind{TypeName: "dagpb.PBLinks.Repr", MethodName: "ConvertFrom", AppropriateKind: ipld.KindSet_JustList, ActualKind: v.Kind()} + return ipld.ErrWrongKind{TypeName: "dagpb.PBLinks.Repr", MethodName: "AssignNode", AppropriateKind: ipld.KindSet_JustList, ActualKind: v.Kind()} } itr := v.ListIterator() for !itr.Done() { @@ -2182,7 +2182,7 @@ func (na *_PBLinks__ReprAssembler) ConvertFrom(v ipld.Node) error { if err != nil { return err } - if err := na.AssembleValue().ConvertFrom(v); err != nil { + if err := na.AssembleValue().AssignNode(v); err != nil { return err } } @@ -2475,7 +2475,7 @@ func (_PBNode__Assembler) AssignBytes([]byte) error { func (_PBNode__Assembler) AssignLink(ipld.Link) error { return mixins.MapAssembler{"dagpb.PBNode"}.AssignLink(nil) } -func (na *_PBNode__Assembler) ConvertFrom(v ipld.Node) error { +func (na *_PBNode__Assembler) AssignNode(v ipld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -2496,7 +2496,7 @@ func (na *_PBNode__Assembler) ConvertFrom(v ipld.Node) error { return nil } if v.Kind() != ipld.Kind_Map { - return ipld.ErrWrongKind{TypeName: "dagpb.PBNode", MethodName: "ConvertFrom", AppropriateKind: ipld.KindSet_JustMap, ActualKind: v.Kind()} + return ipld.ErrWrongKind{TypeName: "dagpb.PBNode", MethodName: "AssignNode", AppropriateKind: ipld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -2504,10 +2504,10 @@ func (na *_PBNode__Assembler) ConvertFrom(v ipld.Node) error { if err != nil { return err } - if err := na.AssembleKey().ConvertFrom(k); err != nil { + if err := na.AssembleKey().AssignNode(k); err != nil { return err } - if err := na.AssembleValue().ConvertFrom(v); err != nil { + if err := na.AssembleValue().AssignNode(v); err != nil { return err } } @@ -2707,7 +2707,7 @@ func (_PBNode__KeyAssembler) AssignBytes([]byte) error { func (_PBNode__KeyAssembler) AssignLink(ipld.Link) error { return mixins.StringAssembler{"dagpb.PBNode.KeyAssembler"}.AssignLink(nil) } -func (ka *_PBNode__KeyAssembler) ConvertFrom(v ipld.Node) error { +func (ka *_PBNode__KeyAssembler) AssignNode(v ipld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { @@ -2923,7 +2923,7 @@ func (_PBNode__ReprAssembler) AssignBytes([]byte) error { func (_PBNode__ReprAssembler) AssignLink(ipld.Link) error { return mixins.MapAssembler{"dagpb.PBNode.Repr"}.AssignLink(nil) } -func (na *_PBNode__ReprAssembler) ConvertFrom(v ipld.Node) error { +func (na *_PBNode__ReprAssembler) AssignNode(v ipld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -2944,7 +2944,7 @@ func (na *_PBNode__ReprAssembler) ConvertFrom(v ipld.Node) error { return nil } if v.Kind() != ipld.Kind_Map { - return ipld.ErrWrongKind{TypeName: "dagpb.PBNode.Repr", MethodName: "ConvertFrom", AppropriateKind: ipld.KindSet_JustMap, ActualKind: v.Kind()} + return ipld.ErrWrongKind{TypeName: "dagpb.PBNode.Repr", MethodName: "AssignNode", AppropriateKind: ipld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -2952,10 +2952,10 @@ func (na *_PBNode__ReprAssembler) ConvertFrom(v ipld.Node) error { if err != nil { return err } - if err := na.AssembleKey().ConvertFrom(k); err != nil { + if err := na.AssembleKey().AssignNode(k); err != nil { return err } - if err := na.AssembleValue().ConvertFrom(v); err != nil { + if err := na.AssembleValue().AssignNode(v); err != nil { return err } } @@ -3155,7 +3155,7 @@ func (_PBNode__ReprKeyAssembler) AssignBytes([]byte) error { func (_PBNode__ReprKeyAssembler) AssignLink(ipld.Link) error { return mixins.StringAssembler{"dagpb.PBNode.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_PBNode__ReprKeyAssembler) ConvertFrom(v ipld.Node) error { +func (ka *_PBNode__ReprKeyAssembler) AssignNode(v ipld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { @@ -3335,7 +3335,7 @@ func (_String__Assembler) AssignBytes([]byte) error { func (_String__Assembler) AssignLink(ipld.Link) error { return mixins.StringAssembler{"dagpb.String"}.AssignLink(nil) } -func (na *_String__Assembler) ConvertFrom(v ipld.Node) error { +func (na *_String__Assembler) AssignNode(v ipld.Node) error { if v.IsNull() { return na.AssignNull() } diff --git a/marshal.go b/marshal.go index fe671a9..fe78e10 100644 --- a/marshal.go +++ b/marshal.go @@ -27,7 +27,7 @@ type pbLink struct { func Marshal(inNode ipld.Node, out io.Writer) error { // Wrap in a typed node for some basic schema form checking builder := Type.PBNode.NewBuilder() - if err := builder.ConvertFrom(inNode); err != nil { + if err := builder.AssignNode(inNode); err != nil { return err } node := builder.Build() -- GitLab