Skip to content

Commit 3b96162

Browse files
committed
feat(deps): update ipld-prime near master
update to lastest needed sha for filecoin, reinstitute generated node tests
1 parent c49ac71 commit 3b96162

File tree

12 files changed

+2850
-59
lines changed

12 files changed

+2850
-59
lines changed

go.mod

+2-3
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ require (
2525
github.com/ipfs/go-merkledag v0.3.1
2626
github.com/ipfs/go-peertaskqueue v0.2.0
2727
github.com/ipfs/go-unixfs v0.2.4
28-
github.com/ipld/go-ipld-prime v0.5.0
29-
github.com/ipld/go-ipld-prime-proto v0.0.0-20200908180311-da0ab5c81760
28+
github.com/ipld/go-ipld-prime v0.5.1-0.20200828233916-988837377a7f
29+
github.com/ipld/go-ipld-prime-proto v0.0.0-20200922000432-18d8669296eb
3030
github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c
3131
github.com/jbenet/goprocess v0.1.4 // indirect
3232
github.com/libp2p/go-libp2p v0.6.0
@@ -38,7 +38,6 @@ require (
3838
github.com/multiformats/go-multihash v0.0.13
3939
github.com/polydawn/refmt v0.0.0-20190809202753-05966cbd336a // indirect
4040
github.com/smartystreets/assertions v1.0.1 // indirect
41-
github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 // indirect
4241
github.com/stretchr/testify v1.5.1
4342
github.com/whyrusleeping/cbor-gen v0.0.0-20200402171437-3d27c146c105 // indirect
4443
go.uber.org/multierr v1.4.0 // indirect

go.sum

+6-12
Original file line numberDiff line numberDiff line change
@@ -222,16 +222,10 @@ github.com/ipfs/go-unixfs v0.2.4 h1:6NwppOXefWIyysZ4LR/qUBPvXd5//8J3jiMdvpbw6Lo=
222222
github.com/ipfs/go-unixfs v0.2.4/go.mod h1:SUdisfUjNoSDzzhGVxvCL9QO/nKdwXdr+gbMUdqcbYw=
223223
github.com/ipfs/go-verifcid v0.0.1 h1:m2HI7zIuR5TFyQ1b79Da5N9dnnCP1vcu2QqawmWlK2E=
224224
github.com/ipfs/go-verifcid v0.0.1/go.mod h1:5Hrva5KBeIog4A+UpqlaIU+DEstipcJYQQZc0g37pY0=
225-
github.com/ipld/go-ipld-prime v0.0.2-0.20200428162820-8b59dc292b8e h1:ZISbJlM0urTANR9KRfRaqlBmyOj5uUtxs2r4Up9IXsA=
226-
github.com/ipld/go-ipld-prime v0.0.2-0.20200428162820-8b59dc292b8e/go.mod h1:uVIwe/u0H4VdKv3kaN1ck7uCb6yD9cFLS9/ELyXbsw8=
227-
github.com/ipld/go-ipld-prime v0.0.4-0.20200828224805-5ff8c8b0b6ef h1:/yPelt/0CuzZsmRkYzBBnJ499JnAOGaIaAXHujx96ic=
228-
github.com/ipld/go-ipld-prime v0.0.4-0.20200828224805-5ff8c8b0b6ef/go.mod h1:uVIwe/u0H4VdKv3kaN1ck7uCb6yD9cFLS9/ELyXbsw8=
229-
github.com/ipld/go-ipld-prime v0.5.0 h1:kr3nB6/JcFpc3Yj7vveXYuiVyZJzWUkJyLMjQbnoswE=
230-
github.com/ipld/go-ipld-prime v0.5.0/go.mod h1:uVIwe/u0H4VdKv3kaN1ck7uCb6yD9cFLS9/ELyXbsw8=
231-
github.com/ipld/go-ipld-prime-proto v0.0.0-20200828231332-ae0aea07222b h1:ZtlW6pubN17TDaStlxgrwEXXwwUfJaXu9RobwczXato=
232-
github.com/ipld/go-ipld-prime-proto v0.0.0-20200828231332-ae0aea07222b/go.mod h1:OAV6xBmuTLsPZ+epzKkPB1e25FHk/vCtyatkdHcArLs=
233-
github.com/ipld/go-ipld-prime-proto v0.0.0-20200908180311-da0ab5c81760 h1:U616lpfmDGbaRaKvnecuAEj9T05zmW/IkoaYrWaaU0s=
234-
github.com/ipld/go-ipld-prime-proto v0.0.0-20200908180311-da0ab5c81760/go.mod h1:tDYA+DyZ5+imKlOj/2YqJS5cMAFjWKN4aUBQUw8FvqM=
225+
github.com/ipld/go-ipld-prime v0.5.1-0.20200828233916-988837377a7f h1:XpOuNQ5GbXxUcSukbQcW9jkE7REpaFGJU2/T00fo9kA=
226+
github.com/ipld/go-ipld-prime v0.5.1-0.20200828233916-988837377a7f/go.mod h1:0xEgdD6MKbZ1vF0GC+YcR/C4SQCAlRuOjIJ2i0HxqzM=
227+
github.com/ipld/go-ipld-prime-proto v0.0.0-20200922000432-18d8669296eb h1:pNGpxNHva+TCo3SyLe3s4YrBp0PJbbFoOswFoS1A4H8=
228+
github.com/ipld/go-ipld-prime-proto v0.0.0-20200922000432-18d8669296eb/go.mod h1:3pHYooM9Ea65jewRwrb2u5uHZCNkNTe9ABsVB+SrkH0=
235229
github.com/jackpal/gateway v1.0.5 h1:qzXWUJfuMdlLMtt0a3Dgt+xkWQiA5itDEITVJtuSwMc=
236230
github.com/jackpal/gateway v1.0.5/go.mod h1:lTpwd4ACLXmpyiCTRtfiNyVnUmqT9RivzCDQetPfnjA=
237231
github.com/jackpal/go-nat-pmp v1.0.1 h1:i0LektDkO1QlrTm/cSuP+PyBCDnYvjPLGl4LdWEMiaA=
@@ -533,8 +527,8 @@ github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUr
533527
github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod h1:2RVY1rIf+2J2o/IM9+vPq9RzmHDSseB7FoXiSNIUsoU=
534528
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a h1:pa8hGb/2YqsZKovtsgrwcDH1RZhVbTKCjLp47XpqCDs=
535529
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
536-
github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 h1:WN9BUFbdyOsSH/XohnWpXOlq9NBD5sGAB2FciQMUEe8=
537-
github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
530+
github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
531+
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
538532
github.com/smola/gocompat v0.2.0/go.mod h1:1B0MlxbmoZNo3h8guHp8HztB3BSYR5itql9qtVc0ypY=
539533
github.com/spacemonkeygo/openssl v0.0.0-20181017203307-c2dcc5cca94a h1:/eS3yfGjQKG+9kayBkj0ip1BGhq6zJ3eaVksphxAaek=
540534
github.com/spacemonkeygo/openssl v0.0.0-20181017203307-c2dcc5cca94a/go.mod h1:7AyxJNCJ7SBZ1MfVQCWD6Uqo2oubI2Eq2y2eqf+A5r0=

testutil/chaintypes/gen/main.go

+18-33
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,32 @@
11
package main
22

33
import (
4-
"os"
4+
"os/exec"
55

66
"github.com/ipld/go-ipld-prime/schema"
77
gengo "github.com/ipld/go-ipld-prime/schema/gen/go"
88
)
99

1010
func main() {
11-
openOrPanic := func(filename string) *os.File {
12-
y, err := os.OpenFile(filename, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644)
13-
if err != nil {
14-
panic(err)
15-
}
16-
return y
17-
}
18-
19-
tLink := schema.SpawnLink("Link")
20-
tBytes := schema.SpawnBytes("Bytes")
21-
tString := schema.SpawnString("String")
22-
tParents := schema.SpawnList("Parents", tLink, false)
23-
tMessages := schema.SpawnList("Messages", tBytes, false)
24-
tBlock := schema.SpawnStruct("Block",
25-
[]schema.StructField{
26-
schema.SpawnStructField("Parents", tParents, false, false),
27-
schema.SpawnStructField("Messages", tMessages, false, false),
28-
},
29-
schema.StructRepresentation_Map{},
30-
)
3111

12+
ts := schema.TypeSystem{}
13+
ts.Init()
3214
adjCfg := &gengo.AdjunctCfg{}
33-
pkgName := "chaintypes"
3415

35-
f := openOrPanic("testchain_minima.go")
36-
gengo.EmitInternalEnums(pkgName, f)
37-
38-
f = openOrPanic("testchain_gen.go")
39-
gengo.EmitFileHeader(pkgName, f)
40-
gengo.EmitEntireType(gengo.NewBytesReprBytesGenerator(pkgName, tBytes, adjCfg), f)
41-
gengo.EmitEntireType(gengo.NewLinkReprLinkGenerator(pkgName, tLink, adjCfg), f)
42-
gengo.EmitEntireType(gengo.NewStringReprStringGenerator(pkgName, tString, adjCfg), f)
43-
gengo.EmitEntireType(gengo.NewListReprListGenerator(pkgName, tParents, adjCfg), f)
44-
gengo.EmitEntireType(gengo.NewListReprListGenerator(pkgName, tMessages, adjCfg), f)
45-
gengo.EmitEntireType(gengo.NewStructReprMapGenerator(pkgName, tBlock, adjCfg), f)
16+
pkgName := "chaintypes"
4617

18+
ts.Accumulate(schema.SpawnLink("Link"))
19+
ts.Accumulate(schema.SpawnBytes("Bytes"))
20+
ts.Accumulate(schema.SpawnString("String"))
21+
ts.Accumulate(schema.SpawnList("Parents", "Link", false))
22+
ts.Accumulate(schema.SpawnList("Messages", "Bytes", false))
23+
ts.Accumulate(schema.SpawnStruct("Block",
24+
[]schema.StructField{
25+
schema.SpawnStructField("Parents", "Parents", false, false),
26+
schema.SpawnStructField("Messages", "Messages", false, false),
27+
},
28+
schema.SpawnStructRepresentationMap(nil),
29+
))
30+
gengo.Generate(".", pkgName, ts, adjCfg)
31+
exec.Command("go", "fmt").Run()
4732
}

testutil/chaintypes/minima.go

+30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)