From 5f2f3811f25d5a420aae2da84339e4b50bef05ac Mon Sep 17 00:00:00 2001 From: tavit ohanian Date: Tue, 24 Aug 2021 09:24:39 -0400 Subject: [PATCH] refactor after forking multiformats --- cbor_cid.go | 2 +- gen.go | 8 ++++---- go.mod | 6 +++--- go.sum | 40 +++++++++++++++++++++++---------------- package.go | 4 ++-- testgen/main.go | 4 ++-- testing/bench_test.go | 4 ++-- testing/cbor_gen.go | 6 +++--- testing/cbor_map_gen.go | 6 +++--- testing/roundtrip_test.go | 21 ++++++++++---------- testing/types.go | 16 ++++++++-------- utils.go | 2 +- utils_test.go | 2 +- 13 files changed, 65 insertions(+), 56 deletions(-) diff --git a/cbor_cid.go b/cbor_cid.go index 57d6ec2..77ae8ba 100644 --- a/cbor_cid.go +++ b/cbor_cid.go @@ -3,7 +3,7 @@ package typegen import ( "io" - cid "github.com/ipfs/go-cid" + cid "gitlab.dms3.io/dms3/go-cid" ) type CborCid cid.Cid diff --git a/gen.go b/gen.go index e93e00c..be3cec8 100644 --- a/gen.go +++ b/gen.go @@ -8,7 +8,7 @@ import ( "strings" "text/template" - "github.com/ipfs/go-cid" + "gitlab.dms3.io/dms3/go-cid" ) const MaxLength = 8192 @@ -50,7 +50,7 @@ func PrintHeaderAndUtilityMethods(w io.Writer, pkg string, typeInfos []*GenTypeI Package string Imports []Import }{pkg, imports} - return doTemplate(w, data, `// Code generated by github.com/whyrusleeping/cbor-gen. DO NOT EDIT. + return doTemplate(w, data, `// Code generated by gitlab.dms3.io/dms3/cbor-gen. DO NOT EDIT. package {{ .Package }} @@ -941,7 +941,7 @@ func emitCborUnmarshalSliceField(w io.Writer, f Field) error { case reflect.Struct: fname := e.PkgPath() + "." + e.Name() switch fname { - case "github.com/ipfs/go-cid.Cid": + case "gitlab.dms3.io/dms3/go-cid.Cid": err := doTemplate(w, f, ` c, err := cbg.ReadCid(br) if err != nil { @@ -982,7 +982,7 @@ func emitCborUnmarshalSliceField(w io.Writer, f Field) error { if maj != cbg.MajUnsignedInt { return xerrors.Errorf("value read for array {{ .Name }} was not a uint, instead got %d", maj) } - + {{ .Name }}[{{ .IterLabel}}] = {{ .ElemName }}(val) `) if err != nil { diff --git a/go.mod b/go.mod index ebbabe4..3fb80df 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ -module github.com/whyrusleeping/cbor-gen +module gitlab.dms3.io/dms3/cbor-gen -go 1.12 +go 1.15 require ( github.com/google/go-cmp v0.4.0 - github.com/ipfs/go-cid v0.0.6 + gitlab.dms3.io/dms3/go-cid v0.0.4 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 ) diff --git a/go.sum b/go.sum index 67d9ac6..5c0484c 100644 --- a/go.sum +++ b/go.sum @@ -1,34 +1,42 @@ github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/ipfs/go-cid v0.0.6 h1:go0y+GcDOGeJIV01FeBsta4FHngoA4Wz7KMeLkXAhMs= -github.com/ipfs/go-cid v0.0.6/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I= +github.com/klauspost/cpuid/v2 v2.0.4 h1:g0I61F2K2DjRHz1cnxlkNSBIaePVoJIjjnHui8QHbiw= +github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= 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.1.1-0.20190913151208-6de447530771 h1:MHkK1uRtFbVqvAgvWxafZe54+5uBxLluGylDiKgdhwo= -github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= +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 h1:Y51FGVJ91WBqCEabAi5OPUz38eAx8DakuAm5svLcsfQ= github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8= -github.com/mr-tron/base58 v1.1.3 h1:v+sk57XuaCKGXpWtVBX8YJzO7hMGx4Aajh4TQbdEFdc= -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= github.com/multiformats/go-base32 v0.0.3 h1:tw5+NhuwaOjJCC5Pp82QuXbrmLzWg7uxlMFp8Nq/kkI= 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.3 h1:l/B6bJDQjvQ5G52jw4QGSYeOTZoAwIO77RblWplfIqk= github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc= -github.com/multiformats/go-multihash v0.0.13 h1:06x+mk/zj1FoMsgNejLpy6QTvJqlSt/BhLEy87zidlc= -github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc= -github.com/multiformats/go-varint v0.0.5 h1:XVZwSo04Cs3j/jS0uAEPpT3JY6DzMcVLLoWOSnCxOjg= -github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= -github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= -github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +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.6 h1:gk85QWKxh3TazbLxED/NlDVv8+q+ReFJk7Y2W/KhfNY= +github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= +gitlab.dms3.io/dms3/go-cid v0.0.4 h1:exbA6/YstDUVBPDOtSW/ue+iIrb5nM9/7nfsc8rvcGA= +gitlab.dms3.io/dms3/go-cid v0.0.4/go.mod h1:WLJV2nnU0k7PBj+758e8SGAZj/wklZQZfq1BUwwZbOA= 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/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf h1:B2n+Zi5QeYRDAEodEu72OS36gmTWjgpXr2+cWcBW90o= +golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/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/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 h1:46ULzRKLh1CwgRq2dC5SlBzEqqNCi8rreOZnNrbqcIY= +golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= 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= diff --git a/package.go b/package.go index 7fa26f7..3f6decd 100644 --- a/package.go +++ b/package.go @@ -14,9 +14,9 @@ var ( pkgPathToPkgName = make(map[string]string) defaultImports = []Import{ - {Name: "cbg", PkgPath: "github.com/whyrusleeping/cbor-gen"}, + {Name: "cbg", PkgPath: "gitlab.dms3.io/dms3/cbor-gen"}, {Name: "xerrors", PkgPath: "golang.org/x/xerrors"}, - {Name: "cid", PkgPath: "github.com/ipfs/go-cid"}, + {Name: "cid", PkgPath: "gitlab.dms3.io/dms3/go-cid"}, } ) diff --git a/testgen/main.go b/testgen/main.go index c94aee7..386c798 100644 --- a/testgen/main.go +++ b/testgen/main.go @@ -1,8 +1,8 @@ package main import ( - cbg "github.com/whyrusleeping/cbor-gen" - types "github.com/whyrusleeping/cbor-gen/testing" + cbg "gitlab.dms3.io/dms3/cbor-gen" + types "gitlab.dms3.io/dms3/cbor-gen/testing" ) func main() { diff --git a/testing/bench_test.go b/testing/bench_test.go index 88216ed..2cc71e7 100644 --- a/testing/bench_test.go +++ b/testing/bench_test.go @@ -9,8 +9,8 @@ import ( "testing" "testing/quick" - "github.com/ipfs/go-cid" - cbg "github.com/whyrusleeping/cbor-gen" + cbg "gitlab.dms3.io/dms3/cbor-gen" + "gitlab.dms3.io/dms3/go-cid" ) func BenchmarkMarshaling(b *testing.B) { diff --git a/testing/cbor_gen.go b/testing/cbor_gen.go index f587961..96f756a 100644 --- a/testing/cbor_gen.go +++ b/testing/cbor_gen.go @@ -1,4 +1,4 @@ -// Code generated by github.com/whyrusleeping/cbor-gen. DO NOT EDIT. +// Code generated by gitlab.dms3.io/dms3/cbor-gen. DO NOT EDIT. package testing @@ -8,8 +8,8 @@ import ( "math" "sort" - cid "github.com/ipfs/go-cid" - cbg "github.com/whyrusleeping/cbor-gen" + cbg "gitlab.dms3.io/dms3/cbor-gen" + cid "gitlab.dms3.io/dms3/go-cid" xerrors "golang.org/x/xerrors" ) diff --git a/testing/cbor_map_gen.go b/testing/cbor_map_gen.go index b7d9000..d9667f1 100644 --- a/testing/cbor_map_gen.go +++ b/testing/cbor_map_gen.go @@ -1,4 +1,4 @@ -// Code generated by github.com/whyrusleeping/cbor-gen. DO NOT EDIT. +// Code generated by gitlab.dms3.io/dms3/cbor-gen. DO NOT EDIT. package testing @@ -8,8 +8,8 @@ import ( "math" "sort" - cid "github.com/ipfs/go-cid" - cbg "github.com/whyrusleeping/cbor-gen" + cbg "gitlab.dms3.io/dms3/cbor-gen" + cid "gitlab.dms3.io/dms3/go-cid" xerrors "golang.org/x/xerrors" ) diff --git a/testing/roundtrip_test.go b/testing/roundtrip_test.go index af5be82..1bf7780 100644 --- a/testing/roundtrip_test.go +++ b/testing/roundtrip_test.go @@ -3,15 +3,16 @@ package testing import ( "bytes" "encoding/json" - "github.com/ipfs/go-cid" "math/rand" "reflect" "testing" "testing/quick" "time" + "gitlab.dms3.io/dms3/go-cid" + "github.com/google/go-cmp/cmp" - cbg "github.com/whyrusleeping/cbor-gen" + cbg "gitlab.dms3.io/dms3/cbor-gen" ) var alwaysEqual = cmp.Comparer(func(_, _ interface{}) bool { return true }) @@ -174,12 +175,12 @@ func TestLessToMoreFieldsRoundTrip(t *testing.T) { NString: "namedstr", } obj := &SimpleStructV1{ - OldStr: "hello", - OldBytes: []byte("bytes"), - OldNum: 10, - OldPtr: &dummyCid, - OldMap: map[string]SimpleTypeOne{"first": simpleTypeOne}, - OldArray: []SimpleTypeOne{simpleTypeOne}, + OldStr: "hello", + OldBytes: []byte("bytes"), + OldNum: 10, + OldPtr: &dummyCid, + OldMap: map[string]SimpleTypeOne{"first": simpleTypeOne}, + OldArray: []SimpleTypeOne{simpleTypeOne}, OldStruct: simpleTypeOne, } @@ -274,8 +275,8 @@ func TestMoreToLessFieldsRoundTrip(t *testing.T) { NewPtr: &dummyCid2, OldMap: map[string]SimpleTypeOne{"foo": simpleType1}, NewMap: map[string]SimpleTypeOne{"bar": simpleType2}, - OldArray: []SimpleTypeOne{simpleType1}, - NewArray: []SimpleTypeOne{simpleType1, simpleType2}, + OldArray: []SimpleTypeOne{simpleType1}, + NewArray: []SimpleTypeOne{simpleType1, simpleType2}, OldStruct: simpleType1, NewStruct: simpleType2, } diff --git a/testing/types.go b/testing/types.go index 09216a9..8452ad7 100644 --- a/testing/types.go +++ b/testing/types.go @@ -1,8 +1,8 @@ package testing import ( - "github.com/ipfs/go-cid" - cbg "github.com/whyrusleeping/cbor-gen" + cbg "gitlab.dms3.io/dms3/cbor-gen" + "gitlab.dms3.io/dms3/go-cid" ) const Thingc = 3 @@ -45,12 +45,12 @@ type SimpleTypeTree struct { } type SimpleStructV1 struct { - OldStr string - OldBytes []byte - OldNum uint64 - OldPtr *cid.Cid - OldMap map[string]SimpleTypeOne - OldArray []SimpleTypeOne + OldStr string + OldBytes []byte + OldNum uint64 + OldPtr *cid.Cid + OldMap map[string]SimpleTypeOne + OldArray []SimpleTypeOne OldStruct SimpleTypeOne } diff --git a/utils.go b/utils.go index 2243ad4..fd78202 100644 --- a/utils.go +++ b/utils.go @@ -11,7 +11,7 @@ import ( "math" "time" - cid "github.com/ipfs/go-cid" + cid "gitlab.dms3.io/dms3/go-cid" ) const maxCidLength = 100 diff --git a/utils_test.go b/utils_test.go index f220cfd..9f9450c 100644 --- a/utils_test.go +++ b/utils_test.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "testing" - cid "github.com/ipfs/go-cid" + cid "gitlab.dms3.io/dms3/go-cid" ) func TestLinkScan(t *testing.T) { -- GitLab