Merge pull request #46 from ipfs/fix/deferred-kv-nil

update cbor-gen code to fix nested nil deferred unmarshals

Author: whyrusleeping

cbor_gen.go

@@ -6,7 +6,7 @@ require (
 	github.com/ipfs/go-ipld-cbor v0.0.4
 	github.com/ipfs/go-ipld-format v0.0.2 // indirect
 	github.com/spaolacci/murmur3 v1.1.0
-	github.com/whyrusleeping/cbor-gen v0.0.0-20200123233031-1cdf64d27158
+	github.com/whyrusleeping/cbor-gen v0.0.0-20200501014322-5f9941ef88e0
 	golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb // indirect
 	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
 )

go.mod

@@ -53,6 +53,10 @@ github.com/warpfork/go-wish v0.0.0-20180510122957-5ad1f5abf436 h1:qOpVTI+BrstcjT
 github.com/warpfork/go-wish v0.0.0-20180510122957-5ad1f5abf436/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=
+github.com/whyrusleeping/cbor-gen v0.0.0-20200414195334-429a0b5e922e h1:JY8o/ebUUrCYetWmjRCNghxC59cOEaili83rxPRQCLw=
+github.com/whyrusleeping/cbor-gen v0.0.0-20200414195334-429a0b5e922e/go.mod h1:Xj/M2wWU+QdTdRbu/L/1dIZY8/Wb2K9pAhtroQuxJJI=
+github.com/whyrusleeping/cbor-gen v0.0.0-20200501014322-5f9941ef88e0 h1:dmdwCOVtJAm7qwONARangN4jgCisVFmSJ486JZ1LYaA=
+github.com/whyrusleeping/cbor-gen v0.0.0-20200501014322-5f9941ef88e0/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=

go.sum

@@ -13,6 +13,7 @@ import (
 	block "github.com/ipfs/go-block-format"
 	cid "github.com/ipfs/go-cid"
 	cbor "github.com/ipfs/go-ipld-cbor"
+	cbg "github.com/whyrusleeping/cbor-gen"
 )
 
 type mockBlocks struct {
@@ -596,3 +597,49 @@ func TestValueLinking(t *testing.T) {
 	fmt.Println("thingy1", c1)
 	fmt.Println(nd.Links()[0])
 }
+
+func TestSetNilValues(t *testing.T) {
+	ctx := context.Background()
+	cs := cbor.NewCborStore(newMockBlocks())
+
+	n := NewNode(cs)
+
+	k := make([]byte, 1)
+
+	for i := 0; i < 500; i++ {
+		k[0] = byte(i)
+		var um cbg.CBORMarshaler
+		if err := n.Set(ctx, string(k), um); err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	nn := NewNode(cs)
+
+	rc, err := cs.Put(ctx, nn)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	for i := 0; i < 500; i++ {
+		tn, err := LoadNode(ctx, cs, rc)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		k[0] = byte(i)
+		var n cbg.CBORMarshaler
+		if err := tn.Set(ctx, string(k), n); err != nil {
+			t.Fatal(err)
+		}
+
+		if err := tn.Flush(ctx); err != nil {
+			t.Fatal(err)
+		}
+
+		rc, err = cs.Put(ctx, tn)
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+}