deps: update to go-ipld-cbor v0.0.4

Author: frrist

.gx/lastpubver

@@ -1,13 +1,14 @@
-all: deps
+all: build
 
-gx:
-	go get github.com/whyrusleeping/gx
-	go get github.com/whyrusleeping/gx-go
+build:
+	go build ./...
+.PHONY: build
 
-deps: gx 
-	gx --verbose install --global
-	gx-go rewrite
+test:
+	go test ./...
+.PHONY: test
 
-publish:
-	gx-go rewrite --undo
+benchmark:
+	go test -bench=./...
+.PHONY: benchmark
 

Makefile

@@ -1,32 +1,15 @@
 package main
 
 import (
-	"os"
-
 	cbg "github.com/whyrusleeping/cbor-gen"
 
 	hamt "github.com/ipfs/go-hamt-ipld"
 )
 
 func main() {
-	fi, err := os.Create("cbor_gen.go")
-	if err != nil {
-		panic(err)
-	}
-	defer fi.Close()
-
-	if err := cbg.PrintHeaderAndUtilityMethods(fi, "hamt"); err != nil {
+	// FIXME this will not generate the correct code, leave the cbor_gen.go file untouched.
+	if err := cbg.WriteMapEncodersToFile("cbor_gen.go", "hamt", hamt.Node{}, hamt.KV{}); err != nil {
 		panic(err)
 	}
 
-	t := []interface{}{
-		hamt.Node{},
-		hamt.KV{},
-	}
-
-	for _, t := range t {
-		if err := cbg.GenTupleEncodersForType(t, fi); err != nil {
-			panic(err)
-		}
-	}
 }

gen/main.go

@@ -3,12 +3,10 @@ module github.com/ipfs/go-hamt-ipld
 require (
 	github.com/ipfs/go-block-format v0.0.2
 	github.com/ipfs/go-cid v0.0.3
-	github.com/ipfs/go-ipld-cbor v0.0.3
-	github.com/multiformats/go-multihash v0.0.8
-	github.com/polydawn/refmt v0.0.0-20190221155625-df39d6c2d992
+	github.com/ipfs/go-ipld-cbor v0.0.4
 	github.com/spaolacci/murmur3 v1.1.0
-	github.com/whyrusleeping/cbor-gen v0.0.0-20190910031516-c1cbffdb01bb
-	golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
+	github.com/whyrusleeping/cbor-gen v0.0.0-20200123233031-1cdf64d27158
+	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
 )
 
 go 1.13

go.mod

@@ -1,3 +1,4 @@
+github.com/google/go-cmp v0.4.0/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/gxed/hashland/keccakpg v0.0.1 h1:wrk3uMNaMxbXiHibbPO4S0ymqJMm41WiudyFSs7UnsU=
@@ -7,17 +8,17 @@ github.com/gxed/hashland/murmur3 v0.0.1/go.mod h1:KjXop02n4/ckmZSnY2+HKcLud/tcmv
 github.com/ipfs/go-block-format v0.0.2 h1:qPDvcP19izTjU8rgo6p7gTXZlkMkF5bz5G3fqIsSCPE=
 github.com/ipfs/go-block-format v0.0.2/go.mod h1:AWR46JfpcObNfg3ok2JHDUfdiHRgWhJgCQF+KIgOPJY=
 github.com/ipfs/go-cid v0.0.1/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
-github.com/ipfs/go-cid v0.0.2/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
 github.com/ipfs/go-cid v0.0.3 h1:UIAh32wymBpStoe83YCzwVQQ5Oy/H0FdxvUS6DJDzms=
 github.com/ipfs/go-cid v0.0.3/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
 github.com/ipfs/go-ipfs-util v0.0.1 h1:Wz9bL2wB2YBJqggkA4dD7oSmqB4cAnpNbGrlHJulv50=
 github.com/ipfs/go-ipfs-util v0.0.1/go.mod h1:spsl5z8KUnrve+73pOhSVZND1SIxPW5RyBCNzQxlJBc=
-github.com/ipfs/go-ipld-cbor v0.0.3 h1:ENsxvybwkmke7Z/QJOmeJfoguj6GH3Y0YOaGrfy9Q0I=
-github.com/ipfs/go-ipld-cbor v0.0.3/go.mod h1:wTBtrQZA3SoFKMVkp6cn6HMRteIB1VsmHA0AQFOn7Nc=
+github.com/ipfs/go-ipld-cbor v0.0.4 h1:Aw3KPOKXjvrm6VjwJvFf1F1ekR/BH3jdof3Bk7OTiSA=
+github.com/ipfs/go-ipld-cbor v0.0.4/go.mod h1:BkCduEx3XBCO6t2Sfo5BaHzuok7hbhdMm9Oh8B2Ftq4=
 github.com/ipfs/go-ipld-format v0.0.1 h1:HCu4eB/Gh+KD/Q0M8u888RFkorTWNIL3da4oc5dwc80=
 github.com/ipfs/go-ipld-format v0.0.1/go.mod h1:kyJtbkDALmFHv3QR6et67i35QzO3S0dCDnkOJhcZkms=
-github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE=
 github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g=
 github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
 github.com/minio/sha256-simd v0.0.0-20190131020904-2d45a736cd16 h1:5W7KhL8HVF3XCFOweFD3BNESdnO8ewyYTFT2R+/b8FQ=
@@ -34,31 +35,36 @@ github.com/multiformats/go-multibase v0.0.1 h1:PN9/v21eLywrFWdFNsFKaU04kLJzuYzmr
 github.com/multiformats/go-multibase v0.0.1/go.mod h1:bja2MqRZ3ggyXtZSEDKpl0uO/gviWFaSteVbWT51qgs=
 github.com/multiformats/go-multihash v0.0.1 h1:HHwN1K12I+XllBCrqKnhX949Orn4oawPkegHMu2vDqQ=
 github.com/multiformats/go-multihash v0.0.1/go.mod h1:w/5tugSrLEbWqlcgJabL3oHFKTwfvkofsjW2Qa1ct4U=
-github.com/multiformats/go-multihash v0.0.8 h1:wrYcW5yxSi3dU07n5jnuS5PrNwyHy0zRHGVoUugWvXg=
-github.com/multiformats/go-multihash v0.0.8/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
+github.com/multiformats/go-multihash v0.0.10 h1:lMoNbh2Ssd9PUF74Nz008KGzGPlfeV6wH3rit5IIGCM=
+github.com/multiformats/go-multihash v0.0.10/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
 github.com/polydawn/refmt v0.0.0-20190221155625-df39d6c2d992 h1:bzMe+2coZJYHnhGgVlcQKuRy4FSny4ds8dLQjw5P1XE=
 github.com/polydawn/refmt v0.0.0-20190221155625-df39d6c2d992/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 v0.0.0-20190222223459-a17d461953aa h1:E+gaaifzi2xF65PbDmuKI3PhLWY6G5opMLniFq8vmXA=
 github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod h1:2RVY1rIf+2J2o/IM9+vPq9RzmHDSseB7FoXiSNIUsoU=
+github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-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-20190910031516-c1cbffdb01bb h1:8yBVx6dgk1GfkiWOQ+RbeDDBLCOZxOtmZ949O2uj5H4=
-github.com/whyrusleeping/cbor-gen v0.0.0-20190910031516-c1cbffdb01bb/go.mod h1:xdlJQaiqipF0HW+Mzpg7XRM3fWbGvfgFlcppuvlkIvY=
+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=
+github.com/whyrusleeping/cbor-gen v0.0.0-20200123233031-1cdf64d27158 h1:WXhVOwj2USAXB5oMDwRl3piOux2XMV9TANaYxXHdkoE=
+github.com/whyrusleeping/cbor-gen v0.0.0-20200123233031-1cdf64d27158/go.mod h1:Xj/M2wWU+QdTdRbu/L/1dIZY8/Wb2K9pAhtroQuxJJI=
 golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67 h1:ng3VDlRp5/DHpSWl02R4rM9I+8M2rhmsuLwAMmkLQWE=
 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 h1:1wopBVtVdWnn03fZelqdXTqk7U7zPQCb+T4rbU9ZEoU=
 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190219092855-153ac476189d h1:Z0Ahzd7HltpJtjAHHxX8QFP3j1yYgiuvjbjRzDj/KH0=
 golang.org/x/sys v0.0.0-20190219092855-153ac476189d/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

go.sum

@@ -19,9 +19,10 @@ type Node struct {
 	Bitfield *big.Int   `refmt:"bf"`
 	Pointers []*Pointer `refmt:"p"`
 
-	// for fetching and storing children
-	store    CborIpldStore
 	bitWidth int
+
+	// for fetching and storing children
+	store cbor.IpldStore
 }
 
 // Option is a function that configures the node
@@ -39,7 +40,7 @@ func UseTreeBitWidth(bitWidth int) Option {
 
 // NewNode creates a new IPLD HAMT Node with the given store and given
 // options
-func NewNode(cs CborIpldStore, options ...Option) *Node {
+func NewNode(cs cbor.IpldStore, options ...Option) *Node {
 	nd := &Node{
 		Bitfield: big.NewInt(0),
 		Pointers: make([]*Pointer, 0),
@@ -123,7 +124,7 @@ func (n *Node) getValue(ctx context.Context, hv *hashBits, k string, cb func(*KV
 	return ErrNotFound
 }
 
-func (p *Pointer) loadChild(ctx context.Context, ns CborIpldStore, bitWidth int) (*Node, error) {
+func (p *Pointer) loadChild(ctx context.Context, ns cbor.IpldStore, bitWidth int) (*Node, error) {
 	if p.cache != nil {
 		return p.cache, nil
 	}
@@ -138,7 +139,7 @@ func (p *Pointer) loadChild(ctx context.Context, ns CborIpldStore, bitWidth int)
 	return out, nil
 }
 
-func LoadNode(ctx context.Context, cs CborIpldStore, c cid.Cid, options ...Option) (*Node, error) {
+func LoadNode(ctx context.Context, cs cbor.IpldStore, c cid.Cid, options ...Option) (*Node, error) {
 	var out Node
 	if err := cs.Get(ctx, c, &out); err != nil {
 		return nil, err

hamt.go

@@ -7,6 +7,8 @@ import (
 	"math/rand"
 	"runtime"
 	"testing"
+
+	cbor "github.com/ipfs/go-ipld-cbor"
 )
 
 type rander struct {
@@ -28,7 +30,7 @@ func (r *rander) randValue() []byte {
 func BenchmarkSerializeNode(b *testing.B) {
 	r := rander{rand.New(rand.NewSource(1234))}
 
-	cs := NewCborStore()
+	cs := cbor.NewCborStore(newMockBlocks())
 	n := NewNode(cs)
 
 	for i := 0; i < 50; i++ {
@@ -69,7 +71,7 @@ func BenchmarkSet(b *testing.B) {
 	for _, t := range table {
 		b.Run(fmt.Sprintf("%d/%d", t.count, t.bitwidth), func(b *testing.B) {
 			ctx := context.Background()
-			n := NewNode(NewCborStore(), UseTreeBitWidth(t.bitwidth))
+			n := NewNode(cbor.NewCborStore(newMockBlocks()), UseTreeBitWidth(t.bitwidth))
 			b.ResetTimer()
 			for i := 0; i < b.N; i++ {
 				for j := 0; j < t.count; j++ {
@@ -95,7 +97,7 @@ func BenchmarkFind(b *testing.B) {
 func doBenchmarkEntriesCount(num int, bitWidth int) func(b *testing.B) {
 	r := rander{rand.New(rand.NewSource(int64(num)))}
 	return func(b *testing.B) {
-		cs := NewCborStore()
+		cs := cbor.NewCborStore(newMockBlocks())
 		n := NewNode(cs, UseTreeBitWidth(bitWidth))
 
 		var keys []string

hamt_bench_test.go

@@ -10,9 +10,32 @@ import (
 	"testing"
 	"time"
 
+	block "github.com/ipfs/go-block-format"
+	cid "github.com/ipfs/go-cid"
 	cbor "github.com/ipfs/go-ipld-cbor"
 )
 
+type mockBlocks struct {
+	data map[cid.Cid]block.Block
+}
+
+func newMockBlocks() *mockBlocks {
+	return &mockBlocks{make(map[cid.Cid]block.Block)}
+}
+
+func (mb *mockBlocks) Get(c cid.Cid) (block.Block, error) {
+	d, ok := mb.data[c]
+	if ok {
+		return d, nil
+	}
+	return nil, fmt.Errorf("Not Found")
+}
+
+func (mb *mockBlocks) Put(b block.Block) error {
+	mb.data[b.Cid()] = b
+	return nil
+}
+
 func randString() string {
 	buf := make([]byte, 18)
 	rand.Read(buf)
@@ -77,7 +100,7 @@ func TestOverflow(t *testing.T) {
 		keys[i] = strings.Repeat("A", 32) + fmt.Sprintf("%d", i)
 	}
 
-	cs := NewCborStore()
+	cs := cbor.NewCborStore(newMockBlocks())
 	n := NewNode(cs)
 	for _, k := range keys[:3] {
 		if err := n.Set(context.Background(), k, "foobar"); err != nil {
@@ -110,7 +133,7 @@ func addAndRemoveKeys(t *testing.T, bitWidth int, keys []string, extraKeys []str
 		vals[s] = randValue()
 	}
 
-	cs := NewCborStore()
+	cs := cbor.NewCborStore(newMockBlocks())
 	begn := NewNode(cs, UseTreeBitWidth(bitWidth))
 	for _, k := range keys {
 		if err := begn.Set(ctx, k, vals[k]); err != nil {
@@ -236,7 +259,7 @@ func TestHash(t *testing.T) {
 
 func TestBasic(t *testing.T) {
 	ctx := context.Background()
-	cs := NewCborStore()
+	cs := cbor.NewCborStore(newMockBlocks())
 	begn := NewNode(cs)
 
 	val := []byte("cat dog bear")
@@ -275,7 +298,7 @@ func TestBasic(t *testing.T) {
 
 func TestDelete(t *testing.T) {
 	ctx := context.Background()
-	cs := NewCborStore()
+	cs := cbor.NewCborStore(newMockBlocks())
 	begn := NewNode(cs)
 
 	val := []byte("cat dog bear")
@@ -322,7 +345,7 @@ func TestSetGet(t *testing.T) {
 		keys = append(keys, s)
 	}
 
-	cs := NewCborStore()
+	cs := cbor.NewCborStore(newMockBlocks())
 	begn := NewNode(cs)
 	for _, k := range keys {
 		if err := begn.Set(ctx, k, vals[k]); err != nil {
@@ -413,7 +436,7 @@ func TestSetGet(t *testing.T) {
 	}
 }
 
-func nodesEqual(t *testing.T, store CborIpldStore, n1, n2 *Node) bool {
+func nodesEqual(t *testing.T, store cbor.IpldStore, n1, n2 *Node) bool {
 	ctx := context.Background()
 	err := n1.Flush(ctx)
 	if err != nil {
@@ -436,7 +459,7 @@ func nodesEqual(t *testing.T, store CborIpldStore, n1, n2 *Node) bool {
 
 func TestReloadEmpty(t *testing.T) {
 	ctx := context.Background()
-	cs := NewCborStore()
+	cs := cbor.NewCborStore(newMockBlocks())
 
 	n := NewNode(cs)
 	c, err := cs.Put(ctx, n)
@@ -456,7 +479,7 @@ func TestReloadEmpty(t *testing.T) {
 
 func TestCopy(t *testing.T) {
 	ctx := context.Background()
-	cs := NewCborStore()
+	cs := cbor.NewCborStore(newMockBlocks())
 
 	n := NewNode(cs)
 	nc := n.Copy()
@@ -479,7 +502,7 @@ func TestCopy(t *testing.T) {
 }
 
 func TestCopyCopiesNilSlices(t *testing.T) {
-	cs := NewCborStore()
+	cs := cbor.NewCborStore(newMockBlocks())
 
 	n := NewNode(cs)
 	pointer := &Pointer{}
@@ -498,7 +521,7 @@ func TestCopyCopiesNilSlices(t *testing.T) {
 
 func TestCopyWithoutFlush(t *testing.T) {
 	ctx := context.Background()
-	cs := NewCborStore()
+	cs := cbor.NewCborStore(newMockBlocks())
 
 	count := 200
 	n := NewNode(cs)
@@ -535,7 +558,7 @@ func TestCopyWithoutFlush(t *testing.T) {
 
 func TestValueLinking(t *testing.T) {
 	ctx := context.Background()
-	cs := NewCborStore()
+	cs := cbor.NewCborStore(newMockBlocks())
 
 	thingy1 := map[string]string{"cat": "dog"}
 	c1, err := cs.Put(ctx, thingy1)
@@ -559,7 +582,7 @@ func TestValueLinking(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	blk, err := cs.Blocks.GetBlock(ctx, tcid)
+	blk, err := cs.Blocks.Get(tcid)
 	if err != nil {
 		t.Fatal(err)
 	}