Use cbor-gen with reader (filecoin-project#98)

iand · web-flow · commit e64cf3a87b34 · 2022-06-21T09:33:35.000-07:00
diff --git a/cbor_gen.go b/cbor_gen.go
diff --git a/go.mod b/go.mod
@@ -6,9 +6,11 @@ require (
 	github.com/ipfs/go-ipld-cbor v0.0.4
 	github.com/spaolacci/murmur3 v1.1.0
 	github.com/stretchr/testify v1.7.0
-	github.com/whyrusleeping/cbor-gen v0.0.0-20200806213330-63aa96ca5488
+	github.com/whyrusleeping/cbor-gen v0.0.0-20220323183124-98fa8256a799
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
+	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
+	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 )
 
 require (
@@ -27,8 +29,6 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/polydawn/refmt v0.0.0-20190221155625-df39d6c2d992 // indirect
 	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect
-	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
-	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )
 
diff --git a/go.sum b/go.sum
@@ -65,8 +65,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/warpfork/go-wish v0.0.0-20180510122957-5ad1f5abf436 h1:qOpVTI+BrstcjTZLm2Yz/3sOnqkzj3FQoh0g+E5s3Gc=
 github.com/warpfork/go-wish v0.0.0-20180510122957-5ad1f5abf436/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw=
 github.com/whyrusleeping/cbor-gen v0.0.0-20200123233031-1cdf64d27158/go.mod h1:Xj/M2wWU+QdTdRbu/L/1dIZY8/Wb2K9pAhtroQuxJJI=
-github.com/whyrusleeping/cbor-gen v0.0.0-20200806213330-63aa96ca5488 h1:P/Q9QT99FpyHtFke7ERUqX7yYtZ/KigO880L+TKFyTQ=
-github.com/whyrusleeping/cbor-gen v0.0.0-20200806213330-63aa96ca5488/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=
+github.com/whyrusleeping/cbor-gen v0.0.0-20220323183124-98fa8256a799 h1:DOOT2B85S0tHoLGTzV+FakaSSihgRCVwZkjqKQP5L/w=
+github.com/whyrusleeping/cbor-gen v0.0.0-20220323183124-98fa8256a799/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=
 golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 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=
diff --git a/pointer_cbor.go b/pointer_cbor.go
@@ -16,19 +16,19 @@ func (t *Pointer) MarshalCBOR(w io.Writer) error {
 		return fmt.Errorf("hamt Pointer cannot have both a link and KVs")
 	}
 
-	scratch := make([]byte, 9)
+	cw := cbg.NewCborWriter(w)
 
 	if t.Link != cid.Undef {
-		if err := cbg.WriteCidBuf(scratch, w, t.Link); err != nil {
+		if err := cbg.WriteCid(cw, t.Link); err != nil {
 			return err
 		}
 	} else {
-		if err := cbg.WriteMajorTypeHeaderBuf(scratch, w, cbg.MajArray, uint64(len(t.KVs))); err != nil {
+		if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.KVs))); err != nil {
 			return err
 		}
 
 		for _, kv := range t.KVs {
-			if err := kv.MarshalCBOR(w); err != nil {
+			if err := kv.MarshalCBOR(cw); err != nil {
 				return err
 			}
 		}
@@ -37,10 +37,10 @@ func (t *Pointer) MarshalCBOR(w io.Writer) error {
 	return nil
 }
 
-func (t *Pointer) UnmarshalCBOR(br io.Reader) error {
-	scratch := make([]byte, 8)
+func (t *Pointer) UnmarshalCBOR(r io.Reader) error {
+	cr := cbg.NewCborReader(r)
 
-	maj, extra, err := cbg.CborReadHeaderBuf(br, scratch)
+	maj, extra, err := cr.ReadHeader()
 	if err != nil {
 		return err
 	}
@@ -50,7 +50,7 @@ func (t *Pointer) UnmarshalCBOR(br io.Reader) error {
 			return fmt.Errorf("expected tag 42 for child node link")
 		}
 
-		ba, err := cbg.ReadByteArray(br, 512)
+		ba, err := cbg.ReadByteArray(cr, 512)
 		if err != nil {
 			return err
 		}
@@ -72,7 +72,7 @@ func (t *Pointer) UnmarshalCBOR(br io.Reader) error {
 		t.KVs = make([]*KV, length)
 		for i := 0; i < int(length); i++ {
 			var kv KV
-			if err := kv.UnmarshalCBOR(br); err != nil {
+			if err := kv.UnmarshalCBOR(cr); err != nil {
 				return err
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -16,19 +16,19 @@ func (t *Pointer) MarshalCBOR(w io.Writer) error {`
`16`	`16`	`return fmt.Errorf("hamt Pointer cannot have both a link and KVs")`
`17`	`17`	`}`
`18`	`18`
`19`		`- scratch := make([]byte, 9)`
	`19`	`+ cw := cbg.NewCborWriter(w)`
`20`	`20`
`21`	`21`	`if t.Link != cid.Undef {`
`22`		`- if err := cbg.WriteCidBuf(scratch, w, t.Link); err != nil {`
	`22`	`+ if err := cbg.WriteCid(cw, t.Link); err != nil {`
`23`	`23`	`return err`
`24`	`24`	`}`
`25`	`25`	`} else {`
`26`		`- if err := cbg.WriteMajorTypeHeaderBuf(scratch, w, cbg.MajArray, uint64(len(t.KVs))); err != nil {`
	`26`	`+ if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.KVs))); err != nil {`
`27`	`27`	`return err`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`for _, kv := range t.KVs {`
`31`		`- if err := kv.MarshalCBOR(w); err != nil {`
	`31`	`+ if err := kv.MarshalCBOR(cw); err != nil {`
`32`	`32`	`return err`
`33`	`33`	`}`
`34`	`34`	`}`
`@@ -37,10 +37,10 @@ func (t *Pointer) MarshalCBOR(w io.Writer) error {`
`37`	`37`	`return nil`
`38`	`38`	`}`
`39`	`39`
`40`		`-func (t *Pointer) UnmarshalCBOR(br io.Reader) error {`
`41`		`- scratch := make([]byte, 8)`
	`40`	`+func (t *Pointer) UnmarshalCBOR(r io.Reader) error {`
	`41`	`+ cr := cbg.NewCborReader(r)`
`42`	`42`
`43`		`- maj, extra, err := cbg.CborReadHeaderBuf(br, scratch)`
	`43`	`+ maj, extra, err := cr.ReadHeader()`
`44`	`44`	`if err != nil {`
`45`	`45`	`return err`
`46`	`46`	`}`
`@@ -50,7 +50,7 @@ func (t *Pointer) UnmarshalCBOR(br io.Reader) error {`
`50`	`50`	`return fmt.Errorf("expected tag 42 for child node link")`
`51`	`51`	`}`
`52`	`52`
`53`		`- ba, err := cbg.ReadByteArray(br, 512)`
	`53`	`+ ba, err := cbg.ReadByteArray(cr, 512)`
`54`	`54`	`if err != nil {`
`55`	`55`	`return err`
`56`	`56`	`}`
`@@ -72,7 +72,7 @@ func (t *Pointer) UnmarshalCBOR(br io.Reader) error {`
`72`	`72`	`t.KVs = make([]*KV, length)`
`73`	`73`	`for i := 0; i < int(length); i++ {`
`74`	`74`	`var kv KV`
`75`		`- if err := kv.UnmarshalCBOR(br); err != nil {`
	`75`	`+ if err := kv.UnmarshalCBOR(cr); err != nil {`
`76`	`76`	`return err`
`77`	`77`	`}`
`78`	`78`