From eefce3cb309e49a569a98a0463215a1a30789a6b Mon Sep 17 00:00:00 2001 From: tavit ohanian Date: Sun, 22 Aug 2021 16:28:48 -0400 Subject: [PATCH] refactor after forking multiformats --- .gitlab-ci.yml | 35 + README.md | 8 +- basics_test.go | 18 +- compat_test.go | 26 +- doc.go | 12 +- gen.go | 6 +- go.mod | 6 +- go.sum | 18 +- ipldsch_minima.go => ldsch_minima.go | 28 +- ...h_satisfaction.go => ldsch_satisfaction.go | 672 +++++++++--------- ipldsch_types.go => ldsch_types.go | 22 +- marshal.go | 18 +- multicodec.go | 22 +- unmarshal.go | 22 +- 14 files changed, 472 insertions(+), 441 deletions(-) create mode 100644 .gitlab-ci.yml rename ipldsch_minima.go => ldsch_minima.go (53%) rename ipldsch_satisfaction.go => ldsch_satisfaction.go (79%) rename ipldsch_types.go => ldsch_types.go (64%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..dfab889 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,35 @@ +stages: + - build + - test + +variables: + BUILD_DIR: "/tmp/$CI_CONCURRENT_PROJECT_ID" + +before_script: + - mkdir -p $BUILD_DIR/src + - cd $BUILD_DIR/src + - if [ -d $CI_PROJECT_DIR ] + - then + - echo "soft link $CI_PROJECT_DIR exists" + - else + - echo "creating soft link $CI_PROJECT_DIR" + - ln -s $CI_PROJECT_DIR + - fi + - cd $CI_PROJECT_DIR + +build: + stage: build + tags: + - testing + script: + - echo $CI_JOB_STAGE + - go build + +test: + stage: test + tags: + - testing + script: + - echo $CI_JOB_STAGE + - go test -cover + coverage: '/coverage: \d+.\d+% of statements/' diff --git a/README.md b/README.md index c481214..19798bc 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # go-dagpb -**An implementation of the IPLD [DAG-PB](https://github.com/ipld/specs/blob/master/block-layer/codecs/dag-pb.md) spec for [go-ipld-prime](https://github.com/ipld/go-ipld-prime/)** +**An implementation of the IPLD [DAG-PB](https://gitlab.dms3.io/ld/specs/blob/master/block-layer/codecs/dag-pb.md) spec for [go-ld-prime](https://gitlab.dms3.io/ld/go-ld-prime/)** -Use `Decode(ipld.NodeAssembler, io.Reader)` and `Encode(ipld.Node, io.Writer)` directly, or import this package to have this codec registered into the go-ipld-prime CID link loader. +Use `Decode(ld.NodeAssembler, io.Reader)` and `Encode(ld.Node, io.Writer)` directly, or import this package to have this codec registered into the go-ld-prime CID link loader. Nodes encoded with this codec _must_ conform to the DAG-PB spec. Specifically, they should have the non-optional fields shown in the DAG-PB schema: -```ipldsch +```ldsch type PBNode struct { Links [PBLink] Data optional Bytes @@ -19,7 +19,7 @@ type PBLink struct { } ``` -Use `dagpb.Type.PBNode` and friends directly for strictness guarantees. Basic `ipld.Node`s will need to have the appropraite fields (and no others) to successfully encode using this codec. +Use `dagpb.Type.PBNode` and friends directly for strictness guarantees. Basic `ld.Node`s will need to have the appropraite fields (and no others) to successfully encode using this codec. ## License & Copyright diff --git a/basics_test.go b/basics_test.go index 74989aa..8eb34f9 100644 --- a/basics_test.go +++ b/basics_test.go @@ -5,11 +5,11 @@ import ( "encoding/hex" "testing" - "github.com/ipfs/go-cid" - "github.com/ipld/go-ipld-prime" - "github.com/ipld/go-ipld-prime/fluent" - cidlink "github.com/ipld/go-ipld-prime/linking/cid" - basicnode "github.com/ipld/go-ipld-prime/node/basic" + "gitlab.dms3.io/dms3/go-cid" + "gitlab.dms3.io/ld/go-ld-prime" + "gitlab.dms3.io/ld/go-ld-prime/fluent" + cidlink "gitlab.dms3.io/ld/go-ld-prime/linking/cid" + basicnode "gitlab.dms3.io/ld/go-ld-prime/node/basic" ) type pbNode struct { @@ -25,7 +25,7 @@ func mkcid(t *testing.T, cidStr string) cid.Cid { return c } -func validate(t *testing.T, actual ipld.Node, expected pbNode) { +func validate(t *testing.T, actual ld.Node, expected pbNode) { mi := actual.MapIterator() _, isTyped := actual.(*_PBNode) @@ -41,7 +41,7 @@ func validate(t *testing.T, actual ipld.Node, expected pbNode) { t.Fatal(err) } if keyStr == "Links" { - if val.Kind() != ipld.Kind_List { + if val.Kind() != ld.Kind_List { t.Fatal("Links is not a list") } if val.IsAbsent() { @@ -59,7 +59,7 @@ func validate(t *testing.T, actual ipld.Node, expected pbNode) { if !val.IsAbsent() { t.Fatalf("Empty Data is not marked as absent") } - if val.Kind() != ipld.Kind_Null { + if val.Kind() != ld.Kind_Null { t.Fatal("Empty Data is not null") } if val.IsNull() { @@ -94,7 +94,7 @@ func validate(t *testing.T, actual ipld.Node, expected pbNode) { func runTest(t *testing.T, bytsHex string, expected pbNode) { byts, _ := hex.DecodeString(bytsHex) - roundTrip := func(t *testing.T, node ipld.Node) { + roundTrip := func(t *testing.T, node ld.Node) { var buf bytes.Buffer if err := Encode(node, &buf); err != nil { t.Fatal(err) diff --git a/compat_test.go b/compat_test.go index 3cc4307..ab79183 100644 --- a/compat_test.go +++ b/compat_test.go @@ -1,6 +1,6 @@ package dagpb -// mirrored in JavaScript @ https://github.com/ipld/js-dag-pb/blob/master/test/test-compat.js +// mirrored in JavaScript @ https://gitlab.dms3.io/ld/js-dag-pb/blob/master/test/test-compat.js import ( "bytes" @@ -9,11 +9,11 @@ import ( "strings" "testing" - cid "github.com/ipfs/go-cid" - "github.com/ipld/go-ipld-prime" - "github.com/ipld/go-ipld-prime/fluent" - cidlink "github.com/ipld/go-ipld-prime/linking/cid" - basicnode "github.com/ipld/go-ipld-prime/node/basic" + cid "gitlab.dms3.io/dms3/go-cid" + "gitlab.dms3.io/ld/go-ld-prime" + "gitlab.dms3.io/ld/go-ld-prime/fluent" + cidlink "gitlab.dms3.io/ld/go-ld-prime/linking/cid" + basicnode "gitlab.dms3.io/ld/go-ld-prime/node/basic" ) var dataZero []byte = make([]byte, 0) @@ -257,7 +257,7 @@ func verifyRoundTrip(t *testing.T, tc testCase) { } } -func buildNode(n pbNode) ipld.Node { +func buildNode(n pbNode) ld.Node { return fluent.MustBuildMap(basicnode.Prototype__Map{}, 2, func(fma fluent.MapAssembler) { if n.data != nil { fma.AssembleEntry("Data").AssignBytes(n.data) @@ -282,7 +282,7 @@ func buildNode(n pbNode) ipld.Node { }) } -func nodeToString(t *testing.T, node ipld.Node) (string, error) { +func nodeToString(t *testing.T, node ld.Node) (string, error) { var buf bytes.Buffer err := Marshal(node, &buf) if err != nil { @@ -293,7 +293,7 @@ func nodeToString(t *testing.T, node ipld.Node) (string, error) { return h, nil } -func bytesToFormString(t *testing.T, bytesHex string, nb ipld.NodeBuilder) (string, error) { +func bytesToFormString(t *testing.T, bytesHex string, nb ld.NodeBuilder) (string, error) { byts, err := hex.DecodeString(bytesHex) if err != nil { return "", err @@ -310,8 +310,8 @@ func bytesToFormString(t *testing.T, bytesHex string, nb ipld.NodeBuilder) (stri return string(str), nil } -// convert a ipld.Node (PBLink) into a map for clean JSON marshalling -func cleanPBLink(t *testing.T, link ipld.Node) map[string]interface{} { +// convert a ld.Node (PBLink) into a map for clean JSON marshalling +func cleanPBLink(t *testing.T, link ld.Node) map[string]interface{} { if link == nil { return nil } @@ -335,8 +335,8 @@ func cleanPBLink(t *testing.T, link ipld.Node) map[string]interface{} { return nl } -// convert an ipld.Node (PBNode) into a map for clean JSON marshalling -func cleanPBNode(t *testing.T, node ipld.Node) map[string]interface{} { +// convert an ld.Node (PBNode) into a map for clean JSON marshalling +func cleanPBNode(t *testing.T, node ld.Node) map[string]interface{} { nn := make(map[string]interface{}) data, _ := node.LookupByString("Data") if data != nil { diff --git a/doc.go b/doc.go index 582caf8..4e20074 100644 --- a/doc.go +++ b/doc.go @@ -1,10 +1,10 @@ /* -Package dagpb provides an implementation of the IPLD DAG-PB spec -(https://github.com/ipld/specs/blob/master/block-layer/codecs/dag-pb.md) for -go-ipld-prime (https://github.com/ipld/go-ipld-prime/). +Package dagpb provides an implementation of the LD DAG-PB spec +(https://gitlab.dms3.io/ld/specs/blob/master/block-layer/codecs/dag-pb.md) for +go-ld-prime (https://gitlab.dms3.io/ld/go-ld-prime/). Use Decode() and Encode() directly, or import this package to have this codec -registered into the go-ipld-prime multicodec registry and available from the +registered into the go-ld-prime multicodec registry and available from the cidlink.DefaultLinkSystem. Nodes encoded with this codec _must_ conform to the DAG-PB spec. Specifically, @@ -22,10 +22,10 @@ they should have the non-optional fields shown in the DAG-PB schema: } Use dagpb.Type.PBNode and friends directly for strictness guarantees. Basic -ipld.Node's will need to have the appropriate fields (and no others) to +ld.Node's will need to have the appropriate fields (and no others) to successfully encode using this codec. */ package dagpb //go:generate go run gen.go -//go:generate gofmt -w ipldsch_minima.go ipldsch_satisfaction.go ipldsch_types.go +//go:generate gofmt -w ldsch_minima.go ldsch_satisfaction.go ldsch_types.go diff --git a/gen.go b/gen.go index 8c2db40..ac8bc4c 100644 --- a/gen.go +++ b/gen.go @@ -3,14 +3,14 @@ package main -// based on https://github.com/ipld/go-ipld-prime-proto/blob/master/gen/main.go +// based on https://gitlab.dms3.io/ld/go-ld-prime-proto/blob/master/gen/main.go import ( "fmt" "os" - "github.com/ipld/go-ipld-prime/schema" - gengo "github.com/ipld/go-ipld-prime/schema/gen/go" + "gitlab.dms3.io/ld/go-ld-prime/schema" + gengo "gitlab.dms3.io/ld/go-ld-prime/schema/gen/go" ) func main() { diff --git a/go.mod b/go.mod index 6c32222..198b2d8 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ -module github.com/ipld/go-codec-dagpb +module gitlab.dms3.io/ld/go-codec-dagpb go 1.15 require ( - github.com/ipfs/go-cid v0.0.7 - github.com/ipld/go-ipld-prime v0.11.0 + gitlab.dms3.io/dms3/go-cid v0.0.3 + gitlab.dms3.io/ld/go-ld-prime v0.0.3 google.golang.org/protobuf v1.27.1 ) diff --git a/go.sum b/go.sum index b9f5076..3e723fa 100644 --- a/go.sum +++ b/go.sum @@ -6,11 +6,6 @@ github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -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.11.0 h1:jD/b/22R7CSL+F9xNffcexs+wO0Ji/TfwXO/TWck+70= -github.com/ipld/go-ipld-prime v0.11.0/go.mod h1:+WIAkokurHmZ/KwzDOMUuoeJgaRQktHtEaLglS3ZeV8= 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/klauspost/cpuid/v2 v2.0.4 h1:g0I61F2K2DjRHz1cnxlkNSBIaePVoJIjjnHui8QHbiw= @@ -26,7 +21,6 @@ github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1 github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g= github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM= github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8= -github.com/mr-tron/base58 v1.1.2/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= @@ -34,18 +28,16 @@ github.com/multiformats/go-base32 v0.0.3 h1:tw5+NhuwaOjJCC5Pp82QuXbrmLzWg7uxlMFp github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA= github.com/multiformats/go-base36 v0.1.0 h1:JR6TyF7JjGd3m6FbLU2cOxhC0Li8z8dLNGQ89tUg4F4= github.com/multiformats/go-base36 v0.1.0/go.mod h1:kFGE83c6s80PklsHO9sRn2NCoffoRdUUOENyW/Vv6sM= -github.com/multiformats/go-multibase v0.0.1/go.mod h1:bja2MqRZ3ggyXtZSEDKpl0uO/gviWFaSteVbWT51qgs= github.com/multiformats/go-multibase v0.0.3 h1:l/B6bJDQjvQ5G52jw4QGSYeOTZoAwIO77RblWplfIqk= github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc= -github.com/multiformats/go-multihash v0.0.10/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew= -github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc= +github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc= github.com/multiformats/go-multihash v0.0.15 h1:hWOPdrNqDjwHDx82vsYGSDZNyktOJJ2dzZJzFkOV1jM= github.com/multiformats/go-multihash v0.0.15/go.mod h1:D6aZrWNLFTV/ynMpKsNtB40mJzmCl4jb1alC0OvHiHg= github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= github.com/multiformats/go-varint v0.0.6 h1:gk85QWKxh3TazbLxED/NlDVv8+q+ReFJk7Y2W/KhfNY= github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= -github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e h1:ZOcivgkkFRnjfoTcGsDq3UQYiBmekwLA+qg0OjyB/ls= -github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e/go.mod h1:uIp+gprXxxrWSjjklXD+mN4wed/tMfjMMmN/9+JsA9o= +github.com/polydawn/refmt v0.0.0-20190807091052-3d65705ee9f1 h1:CskT+S6Ay54OwxBGB0R3Rsx4Muto6UnEYTyKJbyRIAI= +github.com/polydawn/refmt v0.0.0-20190807091052-3d65705ee9f1/go.mod h1:uIp+gprXxxrWSjjklXD+mN4wed/tMfjMMmN/9+JsA9o= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= @@ -53,6 +45,10 @@ github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/warpfork/go-wish v0.0.0-20200122115046-b9ea61034e4a h1:G++j5e0OC488te356JvdhaM8YS6nMsjLAYF7JxCv07w= github.com/warpfork/go-wish v0.0.0-20200122115046-b9ea61034e4a/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw= +gitlab.dms3.io/dms3/go-cid v0.0.3 h1:5qZ1sl1Bi26naLz7Vsc8fjWcJKX8bR6njt3WPCteXac= +gitlab.dms3.io/dms3/go-cid v0.0.3/go.mod h1:qT/Q1NZD31UnWQ+rwsQgzGrrsQhpq7dYSlXf7ulDgtk= +gitlab.dms3.io/ld/go-ld-prime v0.0.3 h1:M4obYt4Swv8bCheUMy2kmnxP8MUz2QuF4bLiKTNlBgQ= +gitlab.dms3.io/ld/go-ld-prime v0.0.3/go.mod h1:legKOh9xuMrYxCAmU5CfRMbfHSrLmunq4aOUbNAb3hs= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g= diff --git a/ipldsch_minima.go b/ldsch_minima.go similarity index 53% rename from ipldsch_minima.go rename to ldsch_minima.go index 40abd9c..c103c1d 100644 --- a/ipldsch_minima.go +++ b/ldsch_minima.go @@ -1,12 +1,12 @@ package dagpb -// Code generated by go-ipld-prime gengo. DO NOT EDIT. +// Code generated by go-ld-prime gengo. DO NOT EDIT. import ( "fmt" - "github.com/ipld/go-ipld-prime" - "github.com/ipld/go-ipld-prime/schema" + "gitlab.dms3.io/ld/go-ld-prime" + "gitlab.dms3.io/ld/go-ld-prime/schema" ) const ( @@ -36,16 +36,16 @@ type _ErrorThunkAssembler struct { e error } -func (ea _ErrorThunkAssembler) BeginMap(_ int64) (ipld.MapAssembler, error) { return nil, ea.e } -func (ea _ErrorThunkAssembler) BeginList(_ int64) (ipld.ListAssembler, error) { return nil, ea.e } -func (ea _ErrorThunkAssembler) AssignNull() error { return ea.e } -func (ea _ErrorThunkAssembler) AssignBool(bool) error { return ea.e } -func (ea _ErrorThunkAssembler) AssignInt(int64) error { return ea.e } -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) AssignNode(ipld.Node) error { return ea.e } -func (ea _ErrorThunkAssembler) Prototype() ipld.NodePrototype { +func (ea _ErrorThunkAssembler) BeginMap(_ int64) (ld.MapAssembler, error) { return nil, ea.e } +func (ea _ErrorThunkAssembler) BeginList(_ int64) (ld.ListAssembler, error) { return nil, ea.e } +func (ea _ErrorThunkAssembler) AssignNull() error { return ea.e } +func (ea _ErrorThunkAssembler) AssignBool(bool) error { return ea.e } +func (ea _ErrorThunkAssembler) AssignInt(int64) error { return ea.e } +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(ld.Link) error { return ea.e } +func (ea _ErrorThunkAssembler) AssignNode(ld.Node) error { return ea.e } +func (ea _ErrorThunkAssembler) Prototype() ld.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/ldsch_satisfaction.go similarity index 79% rename from ipldsch_satisfaction.go rename to ldsch_satisfaction.go index c609938..26460da 100644 --- a/ipldsch_satisfaction.go +++ b/ldsch_satisfaction.go @@ -1,11 +1,11 @@ package dagpb -// Code generated by go-ipld-prime gengo. DO NOT EDIT. +// Code generated by go-ld-prime gengo. DO NOT EDIT. import ( - ipld "github.com/ipld/go-ipld-prime" - "github.com/ipld/go-ipld-prime/node/mixins" - "github.com/ipld/go-ipld-prime/schema" + ld "gitlab.dms3.io/ld/go-ld-prime" + "gitlab.dms3.io/ld/go-ld-prime/node/mixins" + "gitlab.dms3.io/ld/go-ld-prime/schema" ) func (n Bytes) Bytes() []byte { @@ -31,12 +31,12 @@ func (m MaybeBytes) IsAbsent() bool { func (m MaybeBytes) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeBytes) AsNode() ipld.Node { +func (m MaybeBytes) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return ipld.Absent + return ld.Absent case schema.Maybe_Null: - return ipld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -50,28 +50,28 @@ func (m MaybeBytes) Must() Bytes { return &m.v } -var _ ipld.Node = (Bytes)(&_Bytes{}) +var _ ld.Node = (Bytes)(&_Bytes{}) var _ schema.TypedNode = (Bytes)(&_Bytes{}) -func (Bytes) Kind() ipld.Kind { - return ipld.Kind_Bytes +func (Bytes) Kind() ld.Kind { + return ld.Kind_Bytes } -func (Bytes) LookupByString(string) (ipld.Node, error) { +func (Bytes) LookupByString(string) (ld.Node, error) { return mixins.Bytes{TypeName: "dagpb.Bytes"}.LookupByString("") } -func (Bytes) LookupByNode(ipld.Node) (ipld.Node, error) { +func (Bytes) LookupByNode(ld.Node) (ld.Node, error) { return mixins.Bytes{TypeName: "dagpb.Bytes"}.LookupByNode(nil) } -func (Bytes) LookupByIndex(idx int64) (ipld.Node, error) { +func (Bytes) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Bytes{TypeName: "dagpb.Bytes"}.LookupByIndex(0) } -func (Bytes) LookupBySegment(seg ipld.PathSegment) (ipld.Node, error) { +func (Bytes) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.Bytes{TypeName: "dagpb.Bytes"}.LookupBySegment(seg) } -func (Bytes) MapIterator() ipld.MapIterator { +func (Bytes) MapIterator() ld.MapIterator { return nil } -func (Bytes) ListIterator() ipld.ListIterator { +func (Bytes) ListIterator() ld.ListIterator { return nil } func (Bytes) Length() int64 { @@ -98,16 +98,16 @@ func (Bytes) AsString() (string, error) { func (n Bytes) AsBytes() ([]byte, error) { return n.x, nil } -func (Bytes) AsLink() (ipld.Link, error) { +func (Bytes) AsLink() (ld.Link, error) { return mixins.Bytes{TypeName: "dagpb.Bytes"}.AsLink() } -func (Bytes) Prototype() ipld.NodePrototype { +func (Bytes) Prototype() ld.NodePrototype { return _Bytes__Prototype{} } type _Bytes__Prototype struct{} -func (_Bytes__Prototype) NewBuilder() ipld.NodeBuilder { +func (_Bytes__Prototype) NewBuilder() ld.NodeBuilder { var nb _Bytes__Builder nb.Reset() return &nb @@ -117,7 +117,7 @@ type _Bytes__Builder struct { _Bytes__Assembler } -func (nb *_Bytes__Builder) Build() ipld.Node { +func (nb *_Bytes__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -135,10 +135,10 @@ type _Bytes__Assembler struct { } func (na *_Bytes__Assembler) reset() {} -func (_Bytes__Assembler) BeginMap(sizeHint int64) (ipld.MapAssembler, error) { +func (_Bytes__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.BytesAssembler{TypeName: "dagpb.Bytes"}.BeginMap(0) } -func (_Bytes__Assembler) BeginList(sizeHint int64) (ipld.ListAssembler, error) { +func (_Bytes__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.BytesAssembler{TypeName: "dagpb.Bytes"}.BeginList(0) } func (na *_Bytes__Assembler) AssignNull() error { @@ -174,10 +174,10 @@ func (na *_Bytes__Assembler) AssignBytes(v []byte) error { *na.m = schema.Maybe_Value return nil } -func (_Bytes__Assembler) AssignLink(ipld.Link) error { +func (_Bytes__Assembler) AssignLink(ld.Link) error { return mixins.BytesAssembler{TypeName: "dagpb.Bytes"}.AssignLink(nil) } -func (na *_Bytes__Assembler) AssignNode(v ipld.Node) error { +func (na *_Bytes__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -196,19 +196,19 @@ func (na *_Bytes__Assembler) AssignNode(v ipld.Node) error { return na.AssignBytes(v2) } } -func (_Bytes__Assembler) Prototype() ipld.NodePrototype { +func (_Bytes__Assembler) Prototype() ld.NodePrototype { return _Bytes__Prototype{} } func (Bytes) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n Bytes) Representation() ipld.Node { +func (n Bytes) Representation() ld.Node { return (*_Bytes__Repr)(n) } type _Bytes__Repr = _Bytes -var _ ipld.Node = &_Bytes__Repr{} +var _ ld.Node = &_Bytes__Repr{} type _Bytes__ReprPrototype = _Bytes__Prototype type _Bytes__ReprAssembler = _Bytes__Assembler @@ -236,12 +236,12 @@ func (m MaybeInt) IsAbsent() bool { func (m MaybeInt) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeInt) AsNode() ipld.Node { +func (m MaybeInt) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return ipld.Absent + return ld.Absent case schema.Maybe_Null: - return ipld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -255,28 +255,28 @@ func (m MaybeInt) Must() Int { return &m.v } -var _ ipld.Node = (Int)(&_Int{}) +var _ ld.Node = (Int)(&_Int{}) var _ schema.TypedNode = (Int)(&_Int{}) -func (Int) Kind() ipld.Kind { - return ipld.Kind_Int +func (Int) Kind() ld.Kind { + return ld.Kind_Int } -func (Int) LookupByString(string) (ipld.Node, error) { +func (Int) LookupByString(string) (ld.Node, error) { return mixins.Int{TypeName: "dagpb.Int"}.LookupByString("") } -func (Int) LookupByNode(ipld.Node) (ipld.Node, error) { +func (Int) LookupByNode(ld.Node) (ld.Node, error) { return mixins.Int{TypeName: "dagpb.Int"}.LookupByNode(nil) } -func (Int) LookupByIndex(idx int64) (ipld.Node, error) { +func (Int) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Int{TypeName: "dagpb.Int"}.LookupByIndex(0) } -func (Int) LookupBySegment(seg ipld.PathSegment) (ipld.Node, error) { +func (Int) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.Int{TypeName: "dagpb.Int"}.LookupBySegment(seg) } -func (Int) MapIterator() ipld.MapIterator { +func (Int) MapIterator() ld.MapIterator { return nil } -func (Int) ListIterator() ipld.ListIterator { +func (Int) ListIterator() ld.ListIterator { return nil } func (Int) Length() int64 { @@ -303,16 +303,16 @@ func (Int) AsString() (string, error) { func (Int) AsBytes() ([]byte, error) { return mixins.Int{TypeName: "dagpb.Int"}.AsBytes() } -func (Int) AsLink() (ipld.Link, error) { +func (Int) AsLink() (ld.Link, error) { return mixins.Int{TypeName: "dagpb.Int"}.AsLink() } -func (Int) Prototype() ipld.NodePrototype { +func (Int) Prototype() ld.NodePrototype { return _Int__Prototype{} } type _Int__Prototype struct{} -func (_Int__Prototype) NewBuilder() ipld.NodeBuilder { +func (_Int__Prototype) NewBuilder() ld.NodeBuilder { var nb _Int__Builder nb.Reset() return &nb @@ -322,7 +322,7 @@ type _Int__Builder struct { _Int__Assembler } -func (nb *_Int__Builder) Build() ipld.Node { +func (nb *_Int__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -340,10 +340,10 @@ type _Int__Assembler struct { } func (na *_Int__Assembler) reset() {} -func (_Int__Assembler) BeginMap(sizeHint int64) (ipld.MapAssembler, error) { +func (_Int__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.IntAssembler{TypeName: "dagpb.Int"}.BeginMap(0) } -func (_Int__Assembler) BeginList(sizeHint int64) (ipld.ListAssembler, error) { +func (_Int__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.IntAssembler{TypeName: "dagpb.Int"}.BeginList(0) } func (na *_Int__Assembler) AssignNull() error { @@ -379,10 +379,10 @@ func (_Int__Assembler) AssignString(string) error { func (_Int__Assembler) AssignBytes([]byte) error { return mixins.IntAssembler{TypeName: "dagpb.Int"}.AssignBytes(nil) } -func (_Int__Assembler) AssignLink(ipld.Link) error { +func (_Int__Assembler) AssignLink(ld.Link) error { return mixins.IntAssembler{TypeName: "dagpb.Int"}.AssignLink(nil) } -func (na *_Int__Assembler) AssignNode(v ipld.Node) error { +func (na *_Int__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -401,27 +401,27 @@ func (na *_Int__Assembler) AssignNode(v ipld.Node) error { return na.AssignInt(v2) } } -func (_Int__Assembler) Prototype() ipld.NodePrototype { +func (_Int__Assembler) Prototype() ld.NodePrototype { return _Int__Prototype{} } func (Int) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n Int) Representation() ipld.Node { +func (n Int) Representation() ld.Node { return (*_Int__Repr)(n) } type _Int__Repr = _Int -var _ ipld.Node = &_Int__Repr{} +var _ ld.Node = &_Int__Repr{} type _Int__ReprPrototype = _Int__Prototype type _Int__ReprAssembler = _Int__Assembler -func (n Link) Link() ipld.Link { +func (n Link) Link() ld.Link { return n.x } -func (_Link__Prototype) FromLink(v ipld.Link) (Link, error) { +func (_Link__Prototype) FromLink(v ld.Link) (Link, error) { n := _Link{v} return &n, nil } @@ -441,12 +441,12 @@ func (m MaybeLink) IsAbsent() bool { func (m MaybeLink) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeLink) AsNode() ipld.Node { +func (m MaybeLink) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return ipld.Absent + return ld.Absent case schema.Maybe_Null: - return ipld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -460,28 +460,28 @@ func (m MaybeLink) Must() Link { return &m.v } -var _ ipld.Node = (Link)(&_Link{}) +var _ ld.Node = (Link)(&_Link{}) var _ schema.TypedNode = (Link)(&_Link{}) -func (Link) Kind() ipld.Kind { - return ipld.Kind_Link +func (Link) Kind() ld.Kind { + return ld.Kind_Link } -func (Link) LookupByString(string) (ipld.Node, error) { +func (Link) LookupByString(string) (ld.Node, error) { return mixins.Link{TypeName: "dagpb.Link"}.LookupByString("") } -func (Link) LookupByNode(ipld.Node) (ipld.Node, error) { +func (Link) LookupByNode(ld.Node) (ld.Node, error) { return mixins.Link{TypeName: "dagpb.Link"}.LookupByNode(nil) } -func (Link) LookupByIndex(idx int64) (ipld.Node, error) { +func (Link) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Link{TypeName: "dagpb.Link"}.LookupByIndex(0) } -func (Link) LookupBySegment(seg ipld.PathSegment) (ipld.Node, error) { +func (Link) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.Link{TypeName: "dagpb.Link"}.LookupBySegment(seg) } -func (Link) MapIterator() ipld.MapIterator { +func (Link) MapIterator() ld.MapIterator { return nil } -func (Link) ListIterator() ipld.ListIterator { +func (Link) ListIterator() ld.ListIterator { return nil } func (Link) Length() int64 { @@ -508,16 +508,16 @@ func (Link) AsString() (string, error) { func (Link) AsBytes() ([]byte, error) { return mixins.Link{TypeName: "dagpb.Link"}.AsBytes() } -func (n Link) AsLink() (ipld.Link, error) { +func (n Link) AsLink() (ld.Link, error) { return n.x, nil } -func (Link) Prototype() ipld.NodePrototype { +func (Link) Prototype() ld.NodePrototype { return _Link__Prototype{} } type _Link__Prototype struct{} -func (_Link__Prototype) NewBuilder() ipld.NodeBuilder { +func (_Link__Prototype) NewBuilder() ld.NodeBuilder { var nb _Link__Builder nb.Reset() return &nb @@ -527,7 +527,7 @@ type _Link__Builder struct { _Link__Assembler } -func (nb *_Link__Builder) Build() ipld.Node { +func (nb *_Link__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -545,10 +545,10 @@ type _Link__Assembler struct { } func (na *_Link__Assembler) reset() {} -func (_Link__Assembler) BeginMap(sizeHint int64) (ipld.MapAssembler, error) { +func (_Link__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.LinkAssembler{TypeName: "dagpb.Link"}.BeginMap(0) } -func (_Link__Assembler) BeginList(sizeHint int64) (ipld.ListAssembler, error) { +func (_Link__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.LinkAssembler{TypeName: "dagpb.Link"}.BeginList(0) } func (na *_Link__Assembler) AssignNull() error { @@ -578,7 +578,7 @@ func (_Link__Assembler) AssignString(string) error { func (_Link__Assembler) AssignBytes([]byte) error { return mixins.LinkAssembler{TypeName: "dagpb.Link"}.AssignBytes(nil) } -func (na *_Link__Assembler) AssignLink(v ipld.Link) error { +func (na *_Link__Assembler) AssignLink(v ld.Link) error { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -587,7 +587,7 @@ func (na *_Link__Assembler) AssignLink(v ipld.Link) error { *na.m = schema.Maybe_Value return nil } -func (na *_Link__Assembler) AssignNode(v ipld.Node) error { +func (na *_Link__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -606,19 +606,19 @@ func (na *_Link__Assembler) AssignNode(v ipld.Node) error { return na.AssignLink(v2) } } -func (_Link__Assembler) Prototype() ipld.NodePrototype { +func (_Link__Assembler) Prototype() ld.NodePrototype { return _Link__Prototype{} } func (Link) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n Link) Representation() ipld.Node { +func (n Link) Representation() ld.Node { return (*_Link__Repr)(n) } type _Link__Repr = _Link -var _ ipld.Node = &_Link__Repr{} +var _ ld.Node = &_Link__Repr{} type _Link__ReprPrototype = _Link__Prototype type _Link__ReprAssembler = _Link__Assembler @@ -648,12 +648,12 @@ func (m MaybePBLink) IsAbsent() bool { func (m MaybePBLink) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybePBLink) AsNode() ipld.Node { +func (m MaybePBLink) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return ipld.Absent + return ld.Absent case schema.Maybe_Null: - return ipld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -672,44 +672,44 @@ var ( fieldName__PBLink_Name = _String{"Name"} fieldName__PBLink_Tsize = _String{"Tsize"} ) -var _ ipld.Node = (PBLink)(&_PBLink{}) +var _ ld.Node = (PBLink)(&_PBLink{}) var _ schema.TypedNode = (PBLink)(&_PBLink{}) -func (PBLink) Kind() ipld.Kind { - return ipld.Kind_Map +func (PBLink) Kind() ld.Kind { + return ld.Kind_Map } -func (n PBLink) LookupByString(key string) (ipld.Node, error) { +func (n PBLink) LookupByString(key string) (ld.Node, error) { switch key { case "Hash": return &n.Hash, nil case "Name": if n.Name.m == schema.Maybe_Absent { - return ipld.Absent, nil + return ld.Absent, nil } return &n.Name.v, nil case "Tsize": if n.Tsize.m == schema.Maybe_Absent { - return ipld.Absent, nil + return ld.Absent, nil } return &n.Tsize.v, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ipld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n PBLink) LookupByNode(key ipld.Node) (ipld.Node, error) { +func (n PBLink) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (PBLink) LookupByIndex(idx int64) (ipld.Node, error) { +func (PBLink) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "dagpb.PBLink"}.LookupByIndex(0) } -func (n PBLink) LookupBySegment(seg ipld.PathSegment) (ipld.Node, error) { +func (n PBLink) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n PBLink) MapIterator() ipld.MapIterator { +func (n PBLink) MapIterator() ld.MapIterator { return &_PBLink__MapItr{n, 0} } @@ -718,9 +718,9 @@ type _PBLink__MapItr struct { idx int } -func (itr *_PBLink__MapItr) Next() (k ipld.Node, v ipld.Node, _ error) { +func (itr *_PBLink__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 3 { - return nil, nil, ipld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -729,14 +729,14 @@ func (itr *_PBLink__MapItr) Next() (k ipld.Node, v ipld.Node, _ error) { case 1: k = &fieldName__PBLink_Name if itr.n.Name.m == schema.Maybe_Absent { - v = ipld.Absent + v = ld.Absent break } v = &itr.n.Name.v case 2: k = &fieldName__PBLink_Tsize if itr.n.Tsize.m == schema.Maybe_Absent { - v = ipld.Absent + v = ld.Absent break } v = &itr.n.Tsize.v @@ -750,7 +750,7 @@ func (itr *_PBLink__MapItr) Done() bool { return itr.idx >= 3 } -func (PBLink) ListIterator() ipld.ListIterator { +func (PBLink) ListIterator() ld.ListIterator { return nil } func (PBLink) Length() int64 { @@ -777,16 +777,16 @@ func (PBLink) AsString() (string, error) { func (PBLink) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "dagpb.PBLink"}.AsBytes() } -func (PBLink) AsLink() (ipld.Link, error) { +func (PBLink) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "dagpb.PBLink"}.AsLink() } -func (PBLink) Prototype() ipld.NodePrototype { +func (PBLink) Prototype() ld.NodePrototype { return _PBLink__Prototype{} } type _PBLink__Prototype struct{} -func (_PBLink__Prototype) NewBuilder() ipld.NodeBuilder { +func (_PBLink__Prototype) NewBuilder() ld.NodeBuilder { var nb _PBLink__Builder nb.Reset() return &nb @@ -796,7 +796,7 @@ type _PBLink__Builder struct { _PBLink__Assembler } -func (nb *_PBLink__Builder) Build() ipld.Node { +func (nb *_PBLink__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -836,7 +836,7 @@ var ( fieldBits__PBLink_sufficient = 0 + 1<<0 ) -func (na *_PBLink__Assembler) BeginMap(int64) (ipld.MapAssembler, error) { +func (na *_PBLink__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -849,7 +849,7 @@ func (na *_PBLink__Assembler) BeginMap(int64) (ipld.MapAssembler, error) { } return na, nil } -func (_PBLink__Assembler) BeginList(sizeHint int64) (ipld.ListAssembler, error) { +func (_PBLink__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "dagpb.PBLink"}.BeginList(0) } func (na *_PBLink__Assembler) AssignNull() error { @@ -881,10 +881,10 @@ func (_PBLink__Assembler) AssignString(string) error { func (_PBLink__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "dagpb.PBLink"}.AssignBytes(nil) } -func (_PBLink__Assembler) AssignLink(ipld.Link) error { +func (_PBLink__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "dagpb.PBLink"}.AssignLink(nil) } -func (na *_PBLink__Assembler) AssignNode(v ipld.Node) error { +func (na *_PBLink__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -904,8 +904,8 @@ func (na *_PBLink__Assembler) AssignNode(v ipld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != ipld.Kind_Map { - return ipld.ErrWrongKind{TypeName: "dagpb.PBLink", MethodName: "AssignNode", AppropriateKind: ipld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "dagpb.PBLink", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -922,7 +922,7 @@ func (na *_PBLink__Assembler) AssignNode(v ipld.Node) error { } return na.Finish() } -func (_PBLink__Assembler) Prototype() ipld.NodePrototype { +func (_PBLink__Assembler) Prototype() ld.NodePrototype { return _PBLink__Prototype{} } func (ma *_PBLink__Assembler) valueFinishTidy() bool { @@ -957,7 +957,7 @@ func (ma *_PBLink__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_PBLink__Assembler) AssembleEntry(k string) (ipld.NodeAssembler, error) { +func (ma *_PBLink__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -975,7 +975,7 @@ func (ma *_PBLink__Assembler) AssembleEntry(k string) (ipld.NodeAssembler, error switch k { case "Hash": if ma.s&fieldBit__PBLink_Hash != 0 { - return nil, ipld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Hash} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Hash} } ma.s += fieldBit__PBLink_Hash ma.state = maState_midValue @@ -985,7 +985,7 @@ func (ma *_PBLink__Assembler) AssembleEntry(k string) (ipld.NodeAssembler, error return &ma.ca_Hash, nil case "Name": if ma.s&fieldBit__PBLink_Name != 0 { - return nil, ipld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Name} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Name} } ma.s += fieldBit__PBLink_Name ma.state = maState_midValue @@ -995,7 +995,7 @@ func (ma *_PBLink__Assembler) AssembleEntry(k string) (ipld.NodeAssembler, error return &ma.ca_Name, nil case "Tsize": if ma.s&fieldBit__PBLink_Tsize != 0 { - return nil, ipld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Tsize} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Tsize} } ma.s += fieldBit__PBLink_Tsize ma.state = maState_midValue @@ -1004,9 +1004,9 @@ func (ma *_PBLink__Assembler) AssembleEntry(k string) (ipld.NodeAssembler, error ma.ca_Tsize.m = &ma.w.Tsize.m return &ma.ca_Tsize, nil } - return nil, ipld.ErrInvalidKey{TypeName: "dagpb.PBLink", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "dagpb.PBLink", Key: &_String{k}} } -func (ma *_PBLink__Assembler) AssembleKey() ipld.NodeAssembler { +func (ma *_PBLink__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -1024,7 +1024,7 @@ func (ma *_PBLink__Assembler) AssembleKey() ipld.NodeAssembler { ma.state = maState_midKey return (*_PBLink__KeyAssembler)(ma) } -func (ma *_PBLink__Assembler) AssembleValue() ipld.NodeAssembler { +func (ma *_PBLink__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -1071,7 +1071,7 @@ func (ma *_PBLink__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__PBLink_sufficient != fieldBits__PBLink_sufficient { - err := ipld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__PBLink_Hash == 0 { err.Missing = append(err.Missing, "Hash") } @@ -1081,19 +1081,19 @@ func (ma *_PBLink__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_PBLink__Assembler) KeyPrototype() ipld.NodePrototype { +func (ma *_PBLink__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_PBLink__Assembler) ValuePrototype(k string) ipld.NodePrototype { +func (ma *_PBLink__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _PBLink__KeyAssembler _PBLink__Assembler -func (_PBLink__KeyAssembler) BeginMap(sizeHint int64) (ipld.MapAssembler, error) { +func (_PBLink__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "dagpb.PBLink.KeyAssembler"}.BeginMap(0) } -func (_PBLink__KeyAssembler) BeginList(sizeHint int64) (ipld.ListAssembler, error) { +func (_PBLink__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "dagpb.PBLink.KeyAssembler"}.BeginList(0) } func (na *_PBLink__KeyAssembler) AssignNull() error { @@ -1115,7 +1115,7 @@ func (ka *_PBLink__KeyAssembler) AssignString(k string) error { switch k { case "Hash": if ka.s&fieldBit__PBLink_Hash != 0 { - return ipld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Hash} + return ld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Hash} } ka.s += fieldBit__PBLink_Hash ka.state = maState_expectValue @@ -1123,7 +1123,7 @@ func (ka *_PBLink__KeyAssembler) AssignString(k string) error { return nil case "Name": if ka.s&fieldBit__PBLink_Name != 0 { - return ipld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Name} + return ld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Name} } ka.s += fieldBit__PBLink_Name ka.state = maState_expectValue @@ -1131,36 +1131,36 @@ func (ka *_PBLink__KeyAssembler) AssignString(k string) error { return nil case "Tsize": if ka.s&fieldBit__PBLink_Tsize != 0 { - return ipld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Tsize} + return ld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Tsize} } ka.s += fieldBit__PBLink_Tsize ka.state = maState_expectValue ka.f = 2 return nil default: - return ipld.ErrInvalidKey{TypeName: "dagpb.PBLink", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "dagpb.PBLink", Key: &_String{k}} } } func (_PBLink__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "dagpb.PBLink.KeyAssembler"}.AssignBytes(nil) } -func (_PBLink__KeyAssembler) AssignLink(ipld.Link) error { +func (_PBLink__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "dagpb.PBLink.KeyAssembler"}.AssignLink(nil) } -func (ka *_PBLink__KeyAssembler) AssignNode(v ipld.Node) error { +func (ka *_PBLink__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_PBLink__KeyAssembler) Prototype() ipld.NodePrototype { +func (_PBLink__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (PBLink) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n PBLink) Representation() ipld.Node { +func (n PBLink) Representation() ld.Node { return (*_PBLink__Repr)(n) } @@ -1171,43 +1171,43 @@ var ( fieldName__PBLink_Name_serial = _String{"Name"} fieldName__PBLink_Tsize_serial = _String{"Tsize"} ) -var _ ipld.Node = &_PBLink__Repr{} +var _ ld.Node = &_PBLink__Repr{} -func (_PBLink__Repr) Kind() ipld.Kind { - return ipld.Kind_Map +func (_PBLink__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_PBLink__Repr) LookupByString(key string) (ipld.Node, error) { +func (n *_PBLink__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "Hash": return n.Hash.Representation(), nil case "Name": if n.Name.m == schema.Maybe_Absent { - return ipld.Absent, ipld.ErrNotExists{Segment: ipld.PathSegmentOfString(key)} + return ld.Absent, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.Name.v.Representation(), nil case "Tsize": if n.Tsize.m == schema.Maybe_Absent { - return ipld.Absent, ipld.ErrNotExists{Segment: ipld.PathSegmentOfString(key)} + return ld.Absent, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.Tsize.v.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ipld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_PBLink__Repr) LookupByNode(key ipld.Node) (ipld.Node, error) { +func (n *_PBLink__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_PBLink__Repr) LookupByIndex(idx int64) (ipld.Node, error) { +func (_PBLink__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "dagpb.PBLink.Repr"}.LookupByIndex(0) } -func (n _PBLink__Repr) LookupBySegment(seg ipld.PathSegment) (ipld.Node, error) { +func (n _PBLink__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_PBLink__Repr) MapIterator() ipld.MapIterator { +func (n *_PBLink__Repr) MapIterator() ld.MapIterator { end := 3 if n.Tsize.m == schema.Maybe_Absent { end = 2 @@ -1229,10 +1229,10 @@ type _PBLink__ReprMapItr struct { end int } -func (itr *_PBLink__ReprMapItr) Next() (k ipld.Node, v ipld.Node, _ error) { +func (itr *_PBLink__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { advance: if itr.idx >= 3 { - return nil, nil, ipld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -1261,7 +1261,7 @@ advance: func (itr *_PBLink__ReprMapItr) Done() bool { return itr.idx >= itr.end } -func (_PBLink__Repr) ListIterator() ipld.ListIterator { +func (_PBLink__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_PBLink__Repr) Length() int64 { @@ -1295,16 +1295,16 @@ func (_PBLink__Repr) AsString() (string, error) { func (_PBLink__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "dagpb.PBLink.Repr"}.AsBytes() } -func (_PBLink__Repr) AsLink() (ipld.Link, error) { +func (_PBLink__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "dagpb.PBLink.Repr"}.AsLink() } -func (_PBLink__Repr) Prototype() ipld.NodePrototype { +func (_PBLink__Repr) Prototype() ld.NodePrototype { return _PBLink__ReprPrototype{} } type _PBLink__ReprPrototype struct{} -func (_PBLink__ReprPrototype) NewBuilder() ipld.NodeBuilder { +func (_PBLink__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _PBLink__ReprBuilder nb.Reset() return &nb @@ -1314,7 +1314,7 @@ type _PBLink__ReprBuilder struct { _PBLink__ReprAssembler } -func (nb *_PBLink__ReprBuilder) Build() ipld.Node { +func (nb *_PBLink__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -1346,7 +1346,7 @@ func (na *_PBLink__ReprAssembler) reset() { na.ca_Name.reset() na.ca_Tsize.reset() } -func (na *_PBLink__ReprAssembler) BeginMap(int64) (ipld.MapAssembler, error) { +func (na *_PBLink__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -1359,7 +1359,7 @@ func (na *_PBLink__ReprAssembler) BeginMap(int64) (ipld.MapAssembler, error) { } return na, nil } -func (_PBLink__ReprAssembler) BeginList(sizeHint int64) (ipld.ListAssembler, error) { +func (_PBLink__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "dagpb.PBLink.Repr"}.BeginList(0) } func (na *_PBLink__ReprAssembler) AssignNull() error { @@ -1391,10 +1391,10 @@ func (_PBLink__ReprAssembler) AssignString(string) error { func (_PBLink__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "dagpb.PBLink.Repr"}.AssignBytes(nil) } -func (_PBLink__ReprAssembler) AssignLink(ipld.Link) error { +func (_PBLink__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "dagpb.PBLink.Repr"}.AssignLink(nil) } -func (na *_PBLink__ReprAssembler) AssignNode(v ipld.Node) error { +func (na *_PBLink__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -1414,8 +1414,8 @@ func (na *_PBLink__ReprAssembler) AssignNode(v ipld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != ipld.Kind_Map { - return ipld.ErrWrongKind{TypeName: "dagpb.PBLink.Repr", MethodName: "AssignNode", AppropriateKind: ipld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "dagpb.PBLink.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -1432,7 +1432,7 @@ func (na *_PBLink__ReprAssembler) AssignNode(v ipld.Node) error { } return na.Finish() } -func (_PBLink__ReprAssembler) Prototype() ipld.NodePrototype { +func (_PBLink__ReprAssembler) Prototype() ld.NodePrototype { return _PBLink__ReprPrototype{} } func (ma *_PBLink__ReprAssembler) valueFinishTidy() bool { @@ -1466,7 +1466,7 @@ func (ma *_PBLink__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_PBLink__ReprAssembler) AssembleEntry(k string) (ipld.NodeAssembler, error) { +func (ma *_PBLink__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -1484,7 +1484,7 @@ func (ma *_PBLink__ReprAssembler) AssembleEntry(k string) (ipld.NodeAssembler, e switch k { case "Hash": if ma.s&fieldBit__PBLink_Hash != 0 { - return nil, ipld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Hash_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Hash_serial} } ma.s += fieldBit__PBLink_Hash ma.state = maState_midValue @@ -1494,7 +1494,7 @@ func (ma *_PBLink__ReprAssembler) AssembleEntry(k string) (ipld.NodeAssembler, e return &ma.ca_Hash, nil case "Name": if ma.s&fieldBit__PBLink_Name != 0 { - return nil, ipld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Name_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Name_serial} } ma.s += fieldBit__PBLink_Name ma.state = maState_midValue @@ -1505,7 +1505,7 @@ func (ma *_PBLink__ReprAssembler) AssembleEntry(k string) (ipld.NodeAssembler, e return &ma.ca_Name, nil case "Tsize": if ma.s&fieldBit__PBLink_Tsize != 0 { - return nil, ipld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Tsize_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Tsize_serial} } ma.s += fieldBit__PBLink_Tsize ma.state = maState_midValue @@ -1516,9 +1516,9 @@ func (ma *_PBLink__ReprAssembler) AssembleEntry(k string) (ipld.NodeAssembler, e return &ma.ca_Tsize, nil default: } - return nil, ipld.ErrInvalidKey{TypeName: "dagpb.PBLink.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "dagpb.PBLink.Repr", Key: &_String{k}} } -func (ma *_PBLink__ReprAssembler) AssembleKey() ipld.NodeAssembler { +func (ma *_PBLink__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -1536,7 +1536,7 @@ func (ma *_PBLink__ReprAssembler) AssembleKey() ipld.NodeAssembler { ma.state = maState_midKey return (*_PBLink__ReprKeyAssembler)(ma) } -func (ma *_PBLink__ReprAssembler) AssembleValue() ipld.NodeAssembler { +func (ma *_PBLink__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -1585,7 +1585,7 @@ func (ma *_PBLink__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__PBLink_sufficient != fieldBits__PBLink_sufficient { - err := ipld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__PBLink_Hash == 0 { err.Missing = append(err.Missing, "Hash") } @@ -1595,19 +1595,19 @@ func (ma *_PBLink__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_PBLink__ReprAssembler) KeyPrototype() ipld.NodePrototype { +func (ma *_PBLink__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_PBLink__ReprAssembler) ValuePrototype(k string) ipld.NodePrototype { +func (ma *_PBLink__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _PBLink__ReprKeyAssembler _PBLink__ReprAssembler -func (_PBLink__ReprKeyAssembler) BeginMap(sizeHint int64) (ipld.MapAssembler, error) { +func (_PBLink__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "dagpb.PBLink.Repr.KeyAssembler"}.BeginMap(0) } -func (_PBLink__ReprKeyAssembler) BeginList(sizeHint int64) (ipld.ListAssembler, error) { +func (_PBLink__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "dagpb.PBLink.Repr.KeyAssembler"}.BeginList(0) } func (na *_PBLink__ReprKeyAssembler) AssignNull() error { @@ -1629,7 +1629,7 @@ func (ka *_PBLink__ReprKeyAssembler) AssignString(k string) error { switch k { case "Hash": if ka.s&fieldBit__PBLink_Hash != 0 { - return ipld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Hash_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Hash_serial} } ka.s += fieldBit__PBLink_Hash ka.state = maState_expectValue @@ -1637,7 +1637,7 @@ func (ka *_PBLink__ReprKeyAssembler) AssignString(k string) error { return nil case "Name": if ka.s&fieldBit__PBLink_Name != 0 { - return ipld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Name_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Name_serial} } ka.s += fieldBit__PBLink_Name ka.state = maState_expectValue @@ -1645,29 +1645,29 @@ func (ka *_PBLink__ReprKeyAssembler) AssignString(k string) error { return nil case "Tsize": if ka.s&fieldBit__PBLink_Tsize != 0 { - return ipld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Tsize_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__PBLink_Tsize_serial} } ka.s += fieldBit__PBLink_Tsize ka.state = maState_expectValue ka.f = 2 return nil } - return ipld.ErrInvalidKey{TypeName: "dagpb.PBLink.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "dagpb.PBLink.Repr", Key: &_String{k}} } func (_PBLink__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "dagpb.PBLink.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_PBLink__ReprKeyAssembler) AssignLink(ipld.Link) error { +func (_PBLink__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "dagpb.PBLink.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_PBLink__ReprKeyAssembler) AssignNode(v ipld.Node) error { +func (ka *_PBLink__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_PBLink__ReprKeyAssembler) Prototype() ipld.NodePrototype { +func (_PBLink__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -1728,12 +1728,12 @@ func (m MaybePBLinks) IsAbsent() bool { func (m MaybePBLinks) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybePBLinks) AsNode() ipld.Node { +func (m MaybePBLinks) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return ipld.Absent + return ld.Absent case schema.Maybe_Null: - return ipld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -1747,40 +1747,40 @@ func (m MaybePBLinks) Must() PBLinks { return &m.v } -var _ ipld.Node = (PBLinks)(&_PBLinks{}) +var _ ld.Node = (PBLinks)(&_PBLinks{}) var _ schema.TypedNode = (PBLinks)(&_PBLinks{}) -func (PBLinks) Kind() ipld.Kind { - return ipld.Kind_List +func (PBLinks) Kind() ld.Kind { + return ld.Kind_List } -func (PBLinks) LookupByString(string) (ipld.Node, error) { +func (PBLinks) LookupByString(string) (ld.Node, error) { return mixins.List{TypeName: "dagpb.PBLinks"}.LookupByString("") } -func (n PBLinks) LookupByNode(k ipld.Node) (ipld.Node, error) { +func (n PBLinks) LookupByNode(k ld.Node) (ld.Node, error) { idx, err := k.AsInt() if err != nil { return nil, err } return n.LookupByIndex(idx) } -func (n PBLinks) LookupByIndex(idx int64) (ipld.Node, error) { +func (n PBLinks) LookupByIndex(idx int64) (ld.Node, error) { if n.Length() <= idx { - return nil, ipld.ErrNotExists{Segment: ipld.PathSegmentOfInt(idx)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfInt(idx)} } v := &n.x[idx] return v, nil } -func (n PBLinks) LookupBySegment(seg ipld.PathSegment) (ipld.Node, error) { +func (n PBLinks) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { i, err := seg.Index() if err != nil { - return nil, ipld.ErrInvalidSegmentForList{TypeName: "dagpb.PBLinks", TroubleSegment: seg, Reason: err} + return nil, ld.ErrInvalidSegmentForList{TypeName: "dagpb.PBLinks", TroubleSegment: seg, Reason: err} } return n.LookupByIndex(i) } -func (PBLinks) MapIterator() ipld.MapIterator { +func (PBLinks) MapIterator() ld.MapIterator { return nil } -func (n PBLinks) ListIterator() ipld.ListIterator { +func (n PBLinks) ListIterator() ld.ListIterator { return &_PBLinks__ListItr{n, 0} } @@ -1789,9 +1789,9 @@ type _PBLinks__ListItr struct { idx int } -func (itr *_PBLinks__ListItr) Next() (idx int64, v ipld.Node, _ error) { +func (itr *_PBLinks__ListItr) Next() (idx int64, v ld.Node, _ error) { if itr.idx >= len(itr.n.x) { - return -1, nil, ipld.ErrIteratorOverread{} + return -1, nil, ld.ErrIteratorOverread{} } idx = int64(itr.idx) x := &itr.n.x[itr.idx] @@ -1827,16 +1827,16 @@ func (PBLinks) AsString() (string, error) { func (PBLinks) AsBytes() ([]byte, error) { return mixins.List{TypeName: "dagpb.PBLinks"}.AsBytes() } -func (PBLinks) AsLink() (ipld.Link, error) { +func (PBLinks) AsLink() (ld.Link, error) { return mixins.List{TypeName: "dagpb.PBLinks"}.AsLink() } -func (PBLinks) Prototype() ipld.NodePrototype { +func (PBLinks) Prototype() ld.NodePrototype { return _PBLinks__Prototype{} } type _PBLinks__Prototype struct{} -func (_PBLinks__Prototype) NewBuilder() ipld.NodeBuilder { +func (_PBLinks__Prototype) NewBuilder() ld.NodeBuilder { var nb _PBLinks__Builder nb.Reset() return &nb @@ -1846,7 +1846,7 @@ type _PBLinks__Builder struct { _PBLinks__Assembler } -func (nb *_PBLinks__Builder) Build() ipld.Node { +func (nb *_PBLinks__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -1871,10 +1871,10 @@ func (na *_PBLinks__Assembler) reset() { na.state = laState_initial na.va.reset() } -func (_PBLinks__Assembler) BeginMap(sizeHint int64) (ipld.MapAssembler, error) { +func (_PBLinks__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.ListAssembler{TypeName: "dagpb.PBLinks"}.BeginMap(0) } -func (na *_PBLinks__Assembler) BeginList(sizeHint int64) (ipld.ListAssembler, error) { +func (na *_PBLinks__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -1919,10 +1919,10 @@ func (_PBLinks__Assembler) AssignString(string) error { func (_PBLinks__Assembler) AssignBytes([]byte) error { return mixins.ListAssembler{TypeName: "dagpb.PBLinks"}.AssignBytes(nil) } -func (_PBLinks__Assembler) AssignLink(ipld.Link) error { +func (_PBLinks__Assembler) AssignLink(ld.Link) error { return mixins.ListAssembler{TypeName: "dagpb.PBLinks"}.AssignLink(nil) } -func (na *_PBLinks__Assembler) AssignNode(v ipld.Node) error { +func (na *_PBLinks__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -1937,8 +1937,8 @@ func (na *_PBLinks__Assembler) AssignNode(v ipld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != ipld.Kind_List { - return ipld.ErrWrongKind{TypeName: "dagpb.PBLinks", MethodName: "AssignNode", AppropriateKind: ipld.KindSet_JustList, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_List { + return ld.ErrWrongKind{TypeName: "dagpb.PBLinks", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustList, ActualKind: v.Kind()} } itr := v.ListIterator() for !itr.Done() { @@ -1952,7 +1952,7 @@ func (na *_PBLinks__Assembler) AssignNode(v ipld.Node) error { } return na.Finish() } -func (_PBLinks__Assembler) Prototype() ipld.NodePrototype { +func (_PBLinks__Assembler) Prototype() ld.NodePrototype { return _PBLinks__Prototype{} } func (la *_PBLinks__Assembler) valueFinishTidy() bool { @@ -1967,7 +1967,7 @@ func (la *_PBLinks__Assembler) valueFinishTidy() bool { return false } } -func (la *_PBLinks__Assembler) AssembleValue() ipld.NodeAssembler { +func (la *_PBLinks__Assembler) AssembleValue() ld.NodeAssembler { switch la.state { case laState_initial: // carry on @@ -2000,59 +2000,59 @@ func (la *_PBLinks__Assembler) Finish() error { *la.m = schema.Maybe_Value return nil } -func (la *_PBLinks__Assembler) ValuePrototype(_ int64) ipld.NodePrototype { +func (la *_PBLinks__Assembler) ValuePrototype(_ int64) ld.NodePrototype { return _PBLink__Prototype{} } func (PBLinks) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n PBLinks) Representation() ipld.Node { +func (n PBLinks) Representation() ld.Node { return (*_PBLinks__Repr)(n) } type _PBLinks__Repr _PBLinks -var _ ipld.Node = &_PBLinks__Repr{} +var _ ld.Node = &_PBLinks__Repr{} -func (_PBLinks__Repr) Kind() ipld.Kind { - return ipld.Kind_List +func (_PBLinks__Repr) Kind() ld.Kind { + return ld.Kind_List } -func (_PBLinks__Repr) LookupByString(string) (ipld.Node, error) { +func (_PBLinks__Repr) LookupByString(string) (ld.Node, error) { return mixins.List{TypeName: "dagpb.PBLinks.Repr"}.LookupByString("") } -func (nr *_PBLinks__Repr) LookupByNode(k ipld.Node) (ipld.Node, error) { +func (nr *_PBLinks__Repr) LookupByNode(k ld.Node) (ld.Node, error) { v, err := (PBLinks)(nr).LookupByNode(k) - if err != nil || v == ipld.Null { + if err != nil || v == ld.Null { return v, err } return v.(PBLink).Representation(), nil } -func (nr *_PBLinks__Repr) LookupByIndex(idx int64) (ipld.Node, error) { +func (nr *_PBLinks__Repr) LookupByIndex(idx int64) (ld.Node, error) { v, err := (PBLinks)(nr).LookupByIndex(idx) - if err != nil || v == ipld.Null { + if err != nil || v == ld.Null { return v, err } return v.(PBLink).Representation(), nil } -func (n _PBLinks__Repr) LookupBySegment(seg ipld.PathSegment) (ipld.Node, error) { +func (n _PBLinks__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { i, err := seg.Index() if err != nil { - return nil, ipld.ErrInvalidSegmentForList{TypeName: "dagpb.PBLinks.Repr", TroubleSegment: seg, Reason: err} + return nil, ld.ErrInvalidSegmentForList{TypeName: "dagpb.PBLinks.Repr", TroubleSegment: seg, Reason: err} } return n.LookupByIndex(i) } -func (_PBLinks__Repr) MapIterator() ipld.MapIterator { +func (_PBLinks__Repr) MapIterator() ld.MapIterator { return nil } -func (nr *_PBLinks__Repr) ListIterator() ipld.ListIterator { +func (nr *_PBLinks__Repr) ListIterator() ld.ListIterator { return &_PBLinks__ReprListItr{(PBLinks)(nr), 0} } type _PBLinks__ReprListItr _PBLinks__ListItr -func (itr *_PBLinks__ReprListItr) Next() (idx int64, v ipld.Node, err error) { +func (itr *_PBLinks__ReprListItr) Next() (idx int64, v ld.Node, err error) { idx, v, err = (*_PBLinks__ListItr)(itr).Next() - if err != nil || v == ipld.Null { + if err != nil || v == ld.Null { return } return idx, v.(PBLink).Representation(), nil @@ -2085,16 +2085,16 @@ func (_PBLinks__Repr) AsString() (string, error) { func (_PBLinks__Repr) AsBytes() ([]byte, error) { return mixins.List{TypeName: "dagpb.PBLinks.Repr"}.AsBytes() } -func (_PBLinks__Repr) AsLink() (ipld.Link, error) { +func (_PBLinks__Repr) AsLink() (ld.Link, error) { return mixins.List{TypeName: "dagpb.PBLinks.Repr"}.AsLink() } -func (_PBLinks__Repr) Prototype() ipld.NodePrototype { +func (_PBLinks__Repr) Prototype() ld.NodePrototype { return _PBLinks__ReprPrototype{} } type _PBLinks__ReprPrototype struct{} -func (_PBLinks__ReprPrototype) NewBuilder() ipld.NodeBuilder { +func (_PBLinks__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _PBLinks__ReprBuilder nb.Reset() return &nb @@ -2104,7 +2104,7 @@ type _PBLinks__ReprBuilder struct { _PBLinks__ReprAssembler } -func (nb *_PBLinks__ReprBuilder) Build() ipld.Node { +func (nb *_PBLinks__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -2129,10 +2129,10 @@ func (na *_PBLinks__ReprAssembler) reset() { na.state = laState_initial na.va.reset() } -func (_PBLinks__ReprAssembler) BeginMap(sizeHint int64) (ipld.MapAssembler, error) { +func (_PBLinks__ReprAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.ListAssembler{TypeName: "dagpb.PBLinks.Repr"}.BeginMap(0) } -func (na *_PBLinks__ReprAssembler) BeginList(sizeHint int64) (ipld.ListAssembler, error) { +func (na *_PBLinks__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -2177,10 +2177,10 @@ func (_PBLinks__ReprAssembler) AssignString(string) error { func (_PBLinks__ReprAssembler) AssignBytes([]byte) error { return mixins.ListAssembler{TypeName: "dagpb.PBLinks.Repr"}.AssignBytes(nil) } -func (_PBLinks__ReprAssembler) AssignLink(ipld.Link) error { +func (_PBLinks__ReprAssembler) AssignLink(ld.Link) error { return mixins.ListAssembler{TypeName: "dagpb.PBLinks.Repr"}.AssignLink(nil) } -func (na *_PBLinks__ReprAssembler) AssignNode(v ipld.Node) error { +func (na *_PBLinks__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -2195,8 +2195,8 @@ func (na *_PBLinks__ReprAssembler) AssignNode(v ipld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != ipld.Kind_List { - return ipld.ErrWrongKind{TypeName: "dagpb.PBLinks.Repr", MethodName: "AssignNode", AppropriateKind: ipld.KindSet_JustList, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_List { + return ld.ErrWrongKind{TypeName: "dagpb.PBLinks.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustList, ActualKind: v.Kind()} } itr := v.ListIterator() for !itr.Done() { @@ -2210,7 +2210,7 @@ func (na *_PBLinks__ReprAssembler) AssignNode(v ipld.Node) error { } return na.Finish() } -func (_PBLinks__ReprAssembler) Prototype() ipld.NodePrototype { +func (_PBLinks__ReprAssembler) Prototype() ld.NodePrototype { return _PBLinks__ReprPrototype{} } func (la *_PBLinks__ReprAssembler) valueFinishTidy() bool { @@ -2225,7 +2225,7 @@ func (la *_PBLinks__ReprAssembler) valueFinishTidy() bool { return false } } -func (la *_PBLinks__ReprAssembler) AssembleValue() ipld.NodeAssembler { +func (la *_PBLinks__ReprAssembler) AssembleValue() ld.NodeAssembler { switch la.state { case laState_initial: // carry on @@ -2258,7 +2258,7 @@ func (la *_PBLinks__ReprAssembler) Finish() error { *la.m = schema.Maybe_Value return nil } -func (la *_PBLinks__ReprAssembler) ValuePrototype(_ int64) ipld.NodePrototype { +func (la *_PBLinks__ReprAssembler) ValuePrototype(_ int64) ld.NodePrototype { return _PBLink__ReprPrototype{} } @@ -2284,12 +2284,12 @@ func (m MaybePBNode) IsAbsent() bool { func (m MaybePBNode) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybePBNode) AsNode() ipld.Node { +func (m MaybePBNode) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return ipld.Absent + return ld.Absent case schema.Maybe_Null: - return ipld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -2307,39 +2307,39 @@ var ( fieldName__PBNode_Links = _String{"Links"} fieldName__PBNode_Data = _String{"Data"} ) -var _ ipld.Node = (PBNode)(&_PBNode{}) +var _ ld.Node = (PBNode)(&_PBNode{}) var _ schema.TypedNode = (PBNode)(&_PBNode{}) -func (PBNode) Kind() ipld.Kind { - return ipld.Kind_Map +func (PBNode) Kind() ld.Kind { + return ld.Kind_Map } -func (n PBNode) LookupByString(key string) (ipld.Node, error) { +func (n PBNode) LookupByString(key string) (ld.Node, error) { switch key { case "Links": return &n.Links, nil case "Data": if n.Data.m == schema.Maybe_Absent { - return ipld.Absent, nil + return ld.Absent, nil } return &n.Data.v, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ipld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n PBNode) LookupByNode(key ipld.Node) (ipld.Node, error) { +func (n PBNode) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (PBNode) LookupByIndex(idx int64) (ipld.Node, error) { +func (PBNode) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "dagpb.PBNode"}.LookupByIndex(0) } -func (n PBNode) LookupBySegment(seg ipld.PathSegment) (ipld.Node, error) { +func (n PBNode) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n PBNode) MapIterator() ipld.MapIterator { +func (n PBNode) MapIterator() ld.MapIterator { return &_PBNode__MapItr{n, 0} } @@ -2348,9 +2348,9 @@ type _PBNode__MapItr struct { idx int } -func (itr *_PBNode__MapItr) Next() (k ipld.Node, v ipld.Node, _ error) { +func (itr *_PBNode__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 2 { - return nil, nil, ipld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -2359,7 +2359,7 @@ func (itr *_PBNode__MapItr) Next() (k ipld.Node, v ipld.Node, _ error) { case 1: k = &fieldName__PBNode_Data if itr.n.Data.m == schema.Maybe_Absent { - v = ipld.Absent + v = ld.Absent break } v = &itr.n.Data.v @@ -2373,7 +2373,7 @@ func (itr *_PBNode__MapItr) Done() bool { return itr.idx >= 2 } -func (PBNode) ListIterator() ipld.ListIterator { +func (PBNode) ListIterator() ld.ListIterator { return nil } func (PBNode) Length() int64 { @@ -2400,16 +2400,16 @@ func (PBNode) AsString() (string, error) { func (PBNode) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "dagpb.PBNode"}.AsBytes() } -func (PBNode) AsLink() (ipld.Link, error) { +func (PBNode) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "dagpb.PBNode"}.AsLink() } -func (PBNode) Prototype() ipld.NodePrototype { +func (PBNode) Prototype() ld.NodePrototype { return _PBNode__Prototype{} } type _PBNode__Prototype struct{} -func (_PBNode__Prototype) NewBuilder() ipld.NodeBuilder { +func (_PBNode__Prototype) NewBuilder() ld.NodeBuilder { var nb _PBNode__Builder nb.Reset() return &nb @@ -2419,7 +2419,7 @@ type _PBNode__Builder struct { _PBNode__Assembler } -func (nb *_PBNode__Builder) Build() ipld.Node { +func (nb *_PBNode__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -2456,7 +2456,7 @@ var ( fieldBits__PBNode_sufficient = 0 + 1<<0 ) -func (na *_PBNode__Assembler) BeginMap(int64) (ipld.MapAssembler, error) { +func (na *_PBNode__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -2469,7 +2469,7 @@ func (na *_PBNode__Assembler) BeginMap(int64) (ipld.MapAssembler, error) { } return na, nil } -func (_PBNode__Assembler) BeginList(sizeHint int64) (ipld.ListAssembler, error) { +func (_PBNode__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "dagpb.PBNode"}.BeginList(0) } func (na *_PBNode__Assembler) AssignNull() error { @@ -2501,10 +2501,10 @@ func (_PBNode__Assembler) AssignString(string) error { func (_PBNode__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "dagpb.PBNode"}.AssignBytes(nil) } -func (_PBNode__Assembler) AssignLink(ipld.Link) error { +func (_PBNode__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "dagpb.PBNode"}.AssignLink(nil) } -func (na *_PBNode__Assembler) AssignNode(v ipld.Node) error { +func (na *_PBNode__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -2524,8 +2524,8 @@ func (na *_PBNode__Assembler) AssignNode(v ipld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != ipld.Kind_Map { - return ipld.ErrWrongKind{TypeName: "dagpb.PBNode", MethodName: "AssignNode", AppropriateKind: ipld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "dagpb.PBNode", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -2542,7 +2542,7 @@ func (na *_PBNode__Assembler) AssignNode(v ipld.Node) error { } return na.Finish() } -func (_PBNode__Assembler) Prototype() ipld.NodePrototype { +func (_PBNode__Assembler) Prototype() ld.NodePrototype { return _PBNode__Prototype{} } func (ma *_PBNode__Assembler) valueFinishTidy() bool { @@ -2569,7 +2569,7 @@ func (ma *_PBNode__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_PBNode__Assembler) AssembleEntry(k string) (ipld.NodeAssembler, error) { +func (ma *_PBNode__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -2587,7 +2587,7 @@ func (ma *_PBNode__Assembler) AssembleEntry(k string) (ipld.NodeAssembler, error switch k { case "Links": if ma.s&fieldBit__PBNode_Links != 0 { - return nil, ipld.ErrRepeatedMapKey{Key: &fieldName__PBNode_Links} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__PBNode_Links} } ma.s += fieldBit__PBNode_Links ma.state = maState_midValue @@ -2597,7 +2597,7 @@ func (ma *_PBNode__Assembler) AssembleEntry(k string) (ipld.NodeAssembler, error return &ma.ca_Links, nil case "Data": if ma.s&fieldBit__PBNode_Data != 0 { - return nil, ipld.ErrRepeatedMapKey{Key: &fieldName__PBNode_Data} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__PBNode_Data} } ma.s += fieldBit__PBNode_Data ma.state = maState_midValue @@ -2606,9 +2606,9 @@ func (ma *_PBNode__Assembler) AssembleEntry(k string) (ipld.NodeAssembler, error ma.ca_Data.m = &ma.w.Data.m return &ma.ca_Data, nil } - return nil, ipld.ErrInvalidKey{TypeName: "dagpb.PBNode", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "dagpb.PBNode", Key: &_String{k}} } -func (ma *_PBNode__Assembler) AssembleKey() ipld.NodeAssembler { +func (ma *_PBNode__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -2626,7 +2626,7 @@ func (ma *_PBNode__Assembler) AssembleKey() ipld.NodeAssembler { ma.state = maState_midKey return (*_PBNode__KeyAssembler)(ma) } -func (ma *_PBNode__Assembler) AssembleValue() ipld.NodeAssembler { +func (ma *_PBNode__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -2669,7 +2669,7 @@ func (ma *_PBNode__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__PBNode_sufficient != fieldBits__PBNode_sufficient { - err := ipld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__PBNode_Links == 0 { err.Missing = append(err.Missing, "Links") } @@ -2679,19 +2679,19 @@ func (ma *_PBNode__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_PBNode__Assembler) KeyPrototype() ipld.NodePrototype { +func (ma *_PBNode__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_PBNode__Assembler) ValuePrototype(k string) ipld.NodePrototype { +func (ma *_PBNode__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _PBNode__KeyAssembler _PBNode__Assembler -func (_PBNode__KeyAssembler) BeginMap(sizeHint int64) (ipld.MapAssembler, error) { +func (_PBNode__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "dagpb.PBNode.KeyAssembler"}.BeginMap(0) } -func (_PBNode__KeyAssembler) BeginList(sizeHint int64) (ipld.ListAssembler, error) { +func (_PBNode__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "dagpb.PBNode.KeyAssembler"}.BeginList(0) } func (na *_PBNode__KeyAssembler) AssignNull() error { @@ -2713,7 +2713,7 @@ func (ka *_PBNode__KeyAssembler) AssignString(k string) error { switch k { case "Links": if ka.s&fieldBit__PBNode_Links != 0 { - return ipld.ErrRepeatedMapKey{Key: &fieldName__PBNode_Links} + return ld.ErrRepeatedMapKey{Key: &fieldName__PBNode_Links} } ka.s += fieldBit__PBNode_Links ka.state = maState_expectValue @@ -2721,36 +2721,36 @@ func (ka *_PBNode__KeyAssembler) AssignString(k string) error { return nil case "Data": if ka.s&fieldBit__PBNode_Data != 0 { - return ipld.ErrRepeatedMapKey{Key: &fieldName__PBNode_Data} + return ld.ErrRepeatedMapKey{Key: &fieldName__PBNode_Data} } ka.s += fieldBit__PBNode_Data ka.state = maState_expectValue ka.f = 1 return nil default: - return ipld.ErrInvalidKey{TypeName: "dagpb.PBNode", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "dagpb.PBNode", Key: &_String{k}} } } func (_PBNode__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "dagpb.PBNode.KeyAssembler"}.AssignBytes(nil) } -func (_PBNode__KeyAssembler) AssignLink(ipld.Link) error { +func (_PBNode__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "dagpb.PBNode.KeyAssembler"}.AssignLink(nil) } -func (ka *_PBNode__KeyAssembler) AssignNode(v ipld.Node) error { +func (ka *_PBNode__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_PBNode__KeyAssembler) Prototype() ipld.NodePrototype { +func (_PBNode__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (PBNode) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n PBNode) Representation() ipld.Node { +func (n PBNode) Representation() ld.Node { return (*_PBNode__Repr)(n) } @@ -2760,38 +2760,38 @@ var ( fieldName__PBNode_Links_serial = _String{"Links"} fieldName__PBNode_Data_serial = _String{"Data"} ) -var _ ipld.Node = &_PBNode__Repr{} +var _ ld.Node = &_PBNode__Repr{} -func (_PBNode__Repr) Kind() ipld.Kind { - return ipld.Kind_Map +func (_PBNode__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_PBNode__Repr) LookupByString(key string) (ipld.Node, error) { +func (n *_PBNode__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "Links": return n.Links.Representation(), nil case "Data": if n.Data.m == schema.Maybe_Absent { - return ipld.Absent, ipld.ErrNotExists{Segment: ipld.PathSegmentOfString(key)} + return ld.Absent, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.Data.v.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ipld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_PBNode__Repr) LookupByNode(key ipld.Node) (ipld.Node, error) { +func (n *_PBNode__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_PBNode__Repr) LookupByIndex(idx int64) (ipld.Node, error) { +func (_PBNode__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "dagpb.PBNode.Repr"}.LookupByIndex(0) } -func (n _PBNode__Repr) LookupBySegment(seg ipld.PathSegment) (ipld.Node, error) { +func (n _PBNode__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_PBNode__Repr) MapIterator() ipld.MapIterator { +func (n *_PBNode__Repr) MapIterator() ld.MapIterator { end := 2 if n.Data.m == schema.Maybe_Absent { end = 1 @@ -2808,10 +2808,10 @@ type _PBNode__ReprMapItr struct { end int } -func (itr *_PBNode__ReprMapItr) Next() (k ipld.Node, v ipld.Node, _ error) { +func (itr *_PBNode__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { advance: if itr.idx >= 2 { - return nil, nil, ipld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -2833,7 +2833,7 @@ advance: func (itr *_PBNode__ReprMapItr) Done() bool { return itr.idx >= itr.end } -func (_PBNode__Repr) ListIterator() ipld.ListIterator { +func (_PBNode__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_PBNode__Repr) Length() int64 { @@ -2864,16 +2864,16 @@ func (_PBNode__Repr) AsString() (string, error) { func (_PBNode__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "dagpb.PBNode.Repr"}.AsBytes() } -func (_PBNode__Repr) AsLink() (ipld.Link, error) { +func (_PBNode__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "dagpb.PBNode.Repr"}.AsLink() } -func (_PBNode__Repr) Prototype() ipld.NodePrototype { +func (_PBNode__Repr) Prototype() ld.NodePrototype { return _PBNode__ReprPrototype{} } type _PBNode__ReprPrototype struct{} -func (_PBNode__ReprPrototype) NewBuilder() ipld.NodeBuilder { +func (_PBNode__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _PBNode__ReprBuilder nb.Reset() return &nb @@ -2883,7 +2883,7 @@ type _PBNode__ReprBuilder struct { _PBNode__ReprAssembler } -func (nb *_PBNode__ReprBuilder) Build() ipld.Node { +func (nb *_PBNode__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -2913,7 +2913,7 @@ func (na *_PBNode__ReprAssembler) reset() { na.ca_Links.reset() na.ca_Data.reset() } -func (na *_PBNode__ReprAssembler) BeginMap(int64) (ipld.MapAssembler, error) { +func (na *_PBNode__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -2926,7 +2926,7 @@ func (na *_PBNode__ReprAssembler) BeginMap(int64) (ipld.MapAssembler, error) { } return na, nil } -func (_PBNode__ReprAssembler) BeginList(sizeHint int64) (ipld.ListAssembler, error) { +func (_PBNode__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "dagpb.PBNode.Repr"}.BeginList(0) } func (na *_PBNode__ReprAssembler) AssignNull() error { @@ -2958,10 +2958,10 @@ func (_PBNode__ReprAssembler) AssignString(string) error { func (_PBNode__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "dagpb.PBNode.Repr"}.AssignBytes(nil) } -func (_PBNode__ReprAssembler) AssignLink(ipld.Link) error { +func (_PBNode__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "dagpb.PBNode.Repr"}.AssignLink(nil) } -func (na *_PBNode__ReprAssembler) AssignNode(v ipld.Node) error { +func (na *_PBNode__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -2981,8 +2981,8 @@ func (na *_PBNode__ReprAssembler) AssignNode(v ipld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != ipld.Kind_Map { - return ipld.ErrWrongKind{TypeName: "dagpb.PBNode.Repr", MethodName: "AssignNode", AppropriateKind: ipld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "dagpb.PBNode.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -2999,7 +2999,7 @@ func (na *_PBNode__ReprAssembler) AssignNode(v ipld.Node) error { } return na.Finish() } -func (_PBNode__ReprAssembler) Prototype() ipld.NodePrototype { +func (_PBNode__ReprAssembler) Prototype() ld.NodePrototype { return _PBNode__ReprPrototype{} } func (ma *_PBNode__ReprAssembler) valueFinishTidy() bool { @@ -3025,7 +3025,7 @@ func (ma *_PBNode__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_PBNode__ReprAssembler) AssembleEntry(k string) (ipld.NodeAssembler, error) { +func (ma *_PBNode__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -3043,7 +3043,7 @@ func (ma *_PBNode__ReprAssembler) AssembleEntry(k string) (ipld.NodeAssembler, e switch k { case "Links": if ma.s&fieldBit__PBNode_Links != 0 { - return nil, ipld.ErrRepeatedMapKey{Key: &fieldName__PBNode_Links_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__PBNode_Links_serial} } ma.s += fieldBit__PBNode_Links ma.state = maState_midValue @@ -3053,7 +3053,7 @@ func (ma *_PBNode__ReprAssembler) AssembleEntry(k string) (ipld.NodeAssembler, e return &ma.ca_Links, nil case "Data": if ma.s&fieldBit__PBNode_Data != 0 { - return nil, ipld.ErrRepeatedMapKey{Key: &fieldName__PBNode_Data_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__PBNode_Data_serial} } ma.s += fieldBit__PBNode_Data ma.state = maState_midValue @@ -3064,9 +3064,9 @@ func (ma *_PBNode__ReprAssembler) AssembleEntry(k string) (ipld.NodeAssembler, e return &ma.ca_Data, nil default: } - return nil, ipld.ErrInvalidKey{TypeName: "dagpb.PBNode.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "dagpb.PBNode.Repr", Key: &_String{k}} } -func (ma *_PBNode__ReprAssembler) AssembleKey() ipld.NodeAssembler { +func (ma *_PBNode__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -3084,7 +3084,7 @@ func (ma *_PBNode__ReprAssembler) AssembleKey() ipld.NodeAssembler { ma.state = maState_midKey return (*_PBNode__ReprKeyAssembler)(ma) } -func (ma *_PBNode__ReprAssembler) AssembleValue() ipld.NodeAssembler { +func (ma *_PBNode__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -3128,7 +3128,7 @@ func (ma *_PBNode__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__PBNode_sufficient != fieldBits__PBNode_sufficient { - err := ipld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__PBNode_Links == 0 { err.Missing = append(err.Missing, "Links") } @@ -3138,19 +3138,19 @@ func (ma *_PBNode__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_PBNode__ReprAssembler) KeyPrototype() ipld.NodePrototype { +func (ma *_PBNode__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_PBNode__ReprAssembler) ValuePrototype(k string) ipld.NodePrototype { +func (ma *_PBNode__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _PBNode__ReprKeyAssembler _PBNode__ReprAssembler -func (_PBNode__ReprKeyAssembler) BeginMap(sizeHint int64) (ipld.MapAssembler, error) { +func (_PBNode__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "dagpb.PBNode.Repr.KeyAssembler"}.BeginMap(0) } -func (_PBNode__ReprKeyAssembler) BeginList(sizeHint int64) (ipld.ListAssembler, error) { +func (_PBNode__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "dagpb.PBNode.Repr.KeyAssembler"}.BeginList(0) } func (na *_PBNode__ReprKeyAssembler) AssignNull() error { @@ -3172,7 +3172,7 @@ func (ka *_PBNode__ReprKeyAssembler) AssignString(k string) error { switch k { case "Links": if ka.s&fieldBit__PBNode_Links != 0 { - return ipld.ErrRepeatedMapKey{Key: &fieldName__PBNode_Links_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__PBNode_Links_serial} } ka.s += fieldBit__PBNode_Links ka.state = maState_expectValue @@ -3180,29 +3180,29 @@ func (ka *_PBNode__ReprKeyAssembler) AssignString(k string) error { return nil case "Data": if ka.s&fieldBit__PBNode_Data != 0 { - return ipld.ErrRepeatedMapKey{Key: &fieldName__PBNode_Data_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__PBNode_Data_serial} } ka.s += fieldBit__PBNode_Data ka.state = maState_expectValue ka.f = 1 return nil } - return ipld.ErrInvalidKey{TypeName: "dagpb.PBNode.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "dagpb.PBNode.Repr", Key: &_String{k}} } func (_PBNode__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "dagpb.PBNode.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_PBNode__ReprKeyAssembler) AssignLink(ipld.Link) error { +func (_PBNode__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "dagpb.PBNode.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_PBNode__ReprKeyAssembler) AssignNode(v ipld.Node) error { +func (ka *_PBNode__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_PBNode__ReprKeyAssembler) Prototype() ipld.NodePrototype { +func (_PBNode__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -3233,12 +3233,12 @@ func (m MaybeString) IsAbsent() bool { func (m MaybeString) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeString) AsNode() ipld.Node { +func (m MaybeString) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return ipld.Absent + return ld.Absent case schema.Maybe_Null: - return ipld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -3252,28 +3252,28 @@ func (m MaybeString) Must() String { return &m.v } -var _ ipld.Node = (String)(&_String{}) +var _ ld.Node = (String)(&_String{}) var _ schema.TypedNode = (String)(&_String{}) -func (String) Kind() ipld.Kind { - return ipld.Kind_String +func (String) Kind() ld.Kind { + return ld.Kind_String } -func (String) LookupByString(string) (ipld.Node, error) { +func (String) LookupByString(string) (ld.Node, error) { return mixins.String{TypeName: "dagpb.String"}.LookupByString("") } -func (String) LookupByNode(ipld.Node) (ipld.Node, error) { +func (String) LookupByNode(ld.Node) (ld.Node, error) { return mixins.String{TypeName: "dagpb.String"}.LookupByNode(nil) } -func (String) LookupByIndex(idx int64) (ipld.Node, error) { +func (String) LookupByIndex(idx int64) (ld.Node, error) { return mixins.String{TypeName: "dagpb.String"}.LookupByIndex(0) } -func (String) LookupBySegment(seg ipld.PathSegment) (ipld.Node, error) { +func (String) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.String{TypeName: "dagpb.String"}.LookupBySegment(seg) } -func (String) MapIterator() ipld.MapIterator { +func (String) MapIterator() ld.MapIterator { return nil } -func (String) ListIterator() ipld.ListIterator { +func (String) ListIterator() ld.ListIterator { return nil } func (String) Length() int64 { @@ -3300,16 +3300,16 @@ func (n String) AsString() (string, error) { func (String) AsBytes() ([]byte, error) { return mixins.String{TypeName: "dagpb.String"}.AsBytes() } -func (String) AsLink() (ipld.Link, error) { +func (String) AsLink() (ld.Link, error) { return mixins.String{TypeName: "dagpb.String"}.AsLink() } -func (String) Prototype() ipld.NodePrototype { +func (String) Prototype() ld.NodePrototype { return _String__Prototype{} } type _String__Prototype struct{} -func (_String__Prototype) NewBuilder() ipld.NodeBuilder { +func (_String__Prototype) NewBuilder() ld.NodeBuilder { var nb _String__Builder nb.Reset() return &nb @@ -3319,7 +3319,7 @@ type _String__Builder struct { _String__Assembler } -func (nb *_String__Builder) Build() ipld.Node { +func (nb *_String__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -3337,10 +3337,10 @@ type _String__Assembler struct { } func (na *_String__Assembler) reset() {} -func (_String__Assembler) BeginMap(sizeHint int64) (ipld.MapAssembler, error) { +func (_String__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "dagpb.String"}.BeginMap(0) } -func (_String__Assembler) BeginList(sizeHint int64) (ipld.ListAssembler, error) { +func (_String__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "dagpb.String"}.BeginList(0) } func (na *_String__Assembler) AssignNull() error { @@ -3376,10 +3376,10 @@ func (na *_String__Assembler) AssignString(v string) error { func (_String__Assembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "dagpb.String"}.AssignBytes(nil) } -func (_String__Assembler) AssignLink(ipld.Link) error { +func (_String__Assembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "dagpb.String"}.AssignLink(nil) } -func (na *_String__Assembler) AssignNode(v ipld.Node) error { +func (na *_String__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -3398,19 +3398,19 @@ func (na *_String__Assembler) AssignNode(v ipld.Node) error { return na.AssignString(v2) } } -func (_String__Assembler) Prototype() ipld.NodePrototype { +func (_String__Assembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (String) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n String) Representation() ipld.Node { +func (n String) Representation() ld.Node { return (*_String__Repr)(n) } type _String__Repr = _String -var _ ipld.Node = &_String__Repr{} +var _ ld.Node = &_String__Repr{} type _String__ReprPrototype = _String__Prototype type _String__ReprAssembler = _String__Assembler diff --git a/ipldsch_types.go b/ldsch_types.go similarity index 64% rename from ipldsch_types.go rename to ldsch_types.go index ad8ddc5..87ef681 100644 --- a/ipldsch_types.go +++ b/ldsch_types.go @@ -1,12 +1,12 @@ package dagpb -// Code generated by go-ipld-prime gengo. DO NOT EDIT. +// Code generated by go-ld-prime gengo. DO NOT EDIT. import ( - ipld "github.com/ipld/go-ipld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) -var _ ipld.Node = nil // suppress errors when this dependency is not referenced +var _ ld.Node = nil // suppress errors when this dependency is not referenced // Type is a struct embeding a NodePrototype/Type for every Node implementation in this package. // One of its major uses is to start the construction of a value. // You can use it like this: @@ -38,19 +38,19 @@ type typeSlab struct { // --- type definitions follow --- -// Bytes matches the IPLD Schema type "Bytes". It has bytes kind. +// Bytes matches the LD Schema type "Bytes". It has bytes kind. type Bytes = *_Bytes type _Bytes struct{ x []byte } -// Int matches the IPLD Schema type "Int". It has int kind. +// Int matches the LD Schema type "Int". It has int kind. type Int = *_Int type _Int struct{ x int64 } -// Link matches the IPLD Schema type "Link". It has link kind. +// Link matches the LD Schema type "Link". It has link kind. type Link = *_Link -type _Link struct{ x ipld.Link } +type _Link struct{ x ld.Link } -// PBLink matches the IPLD Schema type "PBLink". It has Struct type-kind, and may be interrogated like map kind. +// PBLink matches the LD Schema type "PBLink". It has Struct type-kind, and may be interrogated like map kind. type PBLink = *_PBLink type _PBLink struct { Hash _Link @@ -58,19 +58,19 @@ type _PBLink struct { Tsize _Int__Maybe } -// PBLinks matches the IPLD Schema type "PBLinks". It has list kind. +// PBLinks matches the LD Schema type "PBLinks". It has list kind. type PBLinks = *_PBLinks type _PBLinks struct { x []_PBLink } -// PBNode matches the IPLD Schema type "PBNode". It has Struct type-kind, and may be interrogated like map kind. +// PBNode matches the LD Schema type "PBNode". It has Struct type-kind, and may be interrogated like map kind. type PBNode = *_PBNode type _PBNode struct { Links _PBLinks Data _Bytes__Maybe } -// String matches the IPLD Schema type "String". It has string kind. +// String matches the LD Schema type "String". It has string kind. type String = *_String type _String struct{ x string } diff --git a/marshal.go b/marshal.go index 291ff97..b79b409 100644 --- a/marshal.go +++ b/marshal.go @@ -5,9 +5,9 @@ import ( "io" "sort" - "github.com/ipfs/go-cid" - ipld "github.com/ipld/go-ipld-prime" - cidlink "github.com/ipld/go-ipld-prime/linking/cid" + "gitlab.dms3.io/dms3/go-cid" + ld "gitlab.dms3.io/ld/go-ld-prime" + cidlink "gitlab.dms3.io/ld/go-ld-prime/linking/cid" "google.golang.org/protobuf/encoding/protowire" ) @@ -19,14 +19,14 @@ type pbLink struct { hasTsize bool } -// Encode provides an IPLD codec encode interface for DAG-PB data. Provide a -// conforming Node and a destination for bytes to marshal a DAG-PB IPLD Node. +// Encode provides an LD codec encode interface for DAG-PB data. Provide a +// conforming Node and a destination for bytes to marshal a DAG-PB LD Node. // The Node must strictly conform to the DAG-PB schema -// (https://github.com/ipld/specs/blob/master/block-layer/codecs/dag-pb.md). +// (https://gitlab.dms3.io/ld/specs/blob/master/block-layer/codecs/dag-pb.md). // For safest use, build Nodes using the Type.PBNode type. -// This function is registered via the go-ipld-prime link loader for multicodec +// This function is registered via the go-ld-prime link loader for multicodec // code 0x70 when this package is invoked via init. -func Encode(node ipld.Node, w io.Writer) error { +func Encode(node ld.Node, w io.Writer) error { // 1KiB can be allocated on the stack, and covers most small nodes // without having to grow the buffer and cause allocations. enc := make([]byte, 0, 1024) @@ -42,7 +42,7 @@ func Encode(node ipld.Node, w io.Writer) error { // AppendEncode is like Encode, but it uses a destination buffer directly. // This means less copying of bytes, and if the destination has enough capacity, // fewer allocations. -func AppendEncode(enc []byte, inNode ipld.Node) ([]byte, error) { +func AppendEncode(enc []byte, inNode ld.Node) ([]byte, error) { // Wrap in a typed node for some basic schema form checking builder := Type.PBNode.NewBuilder() if err := builder.AssignNode(inNode); err != nil { diff --git a/multicodec.go b/multicodec.go index 568c777..a6e7897 100644 --- a/multicodec.go +++ b/multicodec.go @@ -3,15 +3,15 @@ package dagpb import ( "io" - ipld "github.com/ipld/go-ipld-prime" - cidlink "github.com/ipld/go-ipld-prime/linking/cid" - "github.com/ipld/go-ipld-prime/multicodec" - "github.com/ipld/go-ipld-prime/traversal" + ld "gitlab.dms3.io/ld/go-ld-prime" + cidlink "gitlab.dms3.io/ld/go-ld-prime/linking/cid" + "gitlab.dms3.io/ld/go-ld-prime/multicodec" + "gitlab.dms3.io/ld/go-ld-prime/traversal" ) var ( - _ ipld.Decoder = Decode - _ ipld.Encoder = Encode + _ ld.Decoder = Decode + _ ld.Encoder = Encode ) func init() { @@ -22,7 +22,7 @@ func init() { // AddSupportToChooser takes an existing node prototype chooser and subs in // PBNode for the dag-pb multicodec code. func AddSupportToChooser(existing traversal.LinkTargetNodePrototypeChooser) traversal.LinkTargetNodePrototypeChooser { - return func(lnk ipld.Link, lnkCtx ipld.LinkContext) (ipld.NodePrototype, error) { + return func(lnk ld.Link, lnkCtx ld.LinkContext) (ld.NodePrototype, error) { if lnk, ok := lnk.(cidlink.Link); ok && lnk.Cid.Prefix().Codec == 0x70 { return Type.PBNode, nil } @@ -36,13 +36,13 @@ func AddSupportToChooser(existing traversal.LinkTargetNodePrototypeChooser) trav // unnecessary to have two supported names for each API. // Deprecated: use Decode instead. -func Decoder(na ipld.NodeAssembler, r io.Reader) error { return Decode(na, r) } +func Decoder(na ld.NodeAssembler, r io.Reader) error { return Decode(na, r) } // Deprecated: use Decode instead. -func Unmarshal(na ipld.NodeAssembler, r io.Reader) error { return Decode(na, r) } +func Unmarshal(na ld.NodeAssembler, r io.Reader) error { return Decode(na, r) } // Deprecated: use Encode instead. -func Encoder(inNode ipld.Node, w io.Writer) error { return Encode(inNode, w) } +func Encoder(inNode ld.Node, w io.Writer) error { return Encode(inNode, w) } // Deprecated: use Encode instead. -func Marshal(inNode ipld.Node, w io.Writer) error { return Encode(inNode, w) } +func Marshal(inNode ld.Node, w io.Writer) error { return Encode(inNode, w) } diff --git a/unmarshal.go b/unmarshal.go index 4049859..229ce66 100644 --- a/unmarshal.go +++ b/unmarshal.go @@ -5,9 +5,9 @@ import ( "io" "io/ioutil" - "github.com/ipfs/go-cid" - ipld "github.com/ipld/go-ipld-prime" - cidlink "github.com/ipld/go-ipld-prime/linking/cid" + "gitlab.dms3.io/dms3/go-cid" + ld "gitlab.dms3.io/ld/go-ld-prime" + cidlink "gitlab.dms3.io/ld/go-ld-prime/linking/cid" "google.golang.org/protobuf/encoding/protowire" ) @@ -15,13 +15,13 @@ import ( // malformed data var ErrIntOverflow = fmt.Errorf("protobuf: varint overflow") -// Decode provides an IPLD codec decode interface for DAG-PB data. Provide a -// compatible NodeAssembler and a byte source to unmarshal a DAG-PB IPLD Node. +// Decode provides an LD codec decode interface for DAG-PB data. Provide a +// compatible NodeAssembler and a byte source to unmarshal a DAG-PB LD Node. // Use the NodeAssembler from the PBNode type for safest construction // (Type.PBNode.NewBuilder()). A Map assembler will also work. -// This function is registered via the go-ipld-prime link loader for multicodec +// This function is registered via the go-ld-prime link loader for multicodec // code 0x70 when this package is invoked via init. -func Decode(na ipld.NodeAssembler, in io.Reader) error { +func Decode(na ld.NodeAssembler, in io.Reader) error { var src []byte if buf, ok := in.(interface{ Bytes() []byte }); ok { src = buf.Bytes() @@ -38,14 +38,14 @@ func Decode(na ipld.NodeAssembler, in io.Reader) error { // DecodeBytes is like Decode, but it uses an input buffer directly. // Decode will grab or read all the bytes from an io.Reader anyway, so this can // save having to copy the bytes or create a bytes.Buffer. -func DecodeBytes(na ipld.NodeAssembler, src []byte) error { +func DecodeBytes(na ld.NodeAssembler, src []byte) error { remaining := src ma, err := na.BeginMap(2) if err != nil { return err } - var links ipld.ListAssembler + var links ld.ListAssembler haveData := false haveLinks := false @@ -66,7 +66,7 @@ func DecodeBytes(na ipld.NodeAssembler, src []byte) error { // Note that we allow Data and Links to come in either order, // since the spec defines that decoding "should" accept either form. - // This is for backwards compatibility with older IPFS data. + // This is for backwards compatibility with older dms3 data. switch fieldNum { case 1: @@ -160,7 +160,7 @@ func DecodeBytes(na ipld.NodeAssembler, src []byte) error { return ma.Finish() } -func unmarshalLink(remaining []byte, ma ipld.MapAssembler) error { +func unmarshalLink(remaining []byte, ma ld.MapAssembler) error { haveHash := false haveName := false haveTsize := false -- GitLab