@cryptotaxi247 / kubo / commits / ce4966983

switch to base32 cidv1 by default

This commit was moved from ipfs/interface-go-ipfs-core@6287246646853656271cbd190acab071950d4060 This commit was moved from ipfs/boxo@763b3d8a00d19fd1ba9d5b5b8825cbd7a7f01d1e

Steven Allen committed May 7, 2019 at 00:57 UTC ce49669839c31312bbcff89cda410c46a842a026
3 files changed +17 -17
core/coreiface/tests/block.go
+2 -2
@@ -61,7 +61,7 @@ func (tp *provider) TestBlockPutFormat(t *testing.T) {
61 t.Fatal(err)
62 }
63
64 - if res.Path().Cid().String() != "zdpuAn4amuLWo8Widi5v6VQpuo2dnpnwbVE3oB6qqs7mDSeoa" {
64 + if res.Path().Cid().String() != "bafyreiayl6g3gitr7ys7kyng7sjywlrgimdoymco3jiyab6rozecmoazne" {
65 t.Errorf("got wrong cid: %s", res.Path().Cid().String())
66 }
67 }
@@ -79,7 +79,7 @@ func (tp *provider) TestBlockPutHash(t *testing.T) {
79 t.Fatal(err)
80 }
81
82 - if res.Path().Cid().String() != "zBurKB9YZkcDf6xa53WBE8CFX4ydVqAyf9KPXBFZt5stJzEstaS8Hukkhu4gwpMtc1xHNDbzP7sPtQKyWsP3C8fbhkmrZ" {
82 + if res.Path().Cid().String() != "bafyb2qgdh7w6dcq24u65xbtdoehyavegnpvxcqce7ttvs6ielgmwdfxrahmu37d33atik57x5y6s7d7qz32aasuwgirh3ocn6ywswqdifvu6e" {
83 t.Errorf("got wrong cid: %s", res.Path().Cid().String())
84 }
85 }
core/coreiface/tests/dag.go
+3 -3
@@ -58,7 +58,7 @@ func (tp *provider) TestPut(t *testing.T) {
58 t.Fatal(err)
59 }
60
61 - if nd.Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
61 + if nd.Cid().String() != "bafyreicnga62zhxnmnlt6ymq5hcbsg7gdhqdu6z4ehu3wpjhvqnflfy6nm" {
62 t.Errorf("got wrong cid: %s", nd.Cid().String())
63 }
64 }
@@ -81,7 +81,7 @@ func (tp *provider) TestPutWithHash(t *testing.T) {
81 t.Fatal(err)
82 }
83
84 - if nd.Cid().String() != "z5hRLNd2sv4z1c" {
84 + if nd.Cid().String() != "bafyqabtfjbswy3dp" {
85 t.Errorf("got wrong cid: %s", nd.Cid().String())
86 }
87 }
@@ -179,7 +179,7 @@ func (tp *provider) TestBatch(t *testing.T) {
179 t.Fatal(err)
180 }
181
182 - if nd.Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
182 + if nd.Cid().String() != "bafyreicnga62zhxnmnlt6ymq5hcbsg7gdhqdu6z4ehu3wpjhvqnflfy6nm" {
183 t.Errorf("got wrong cid: %s", nd.Cid().String())
184 }
185
core/coreiface/tests/unixfs.go
+12 -12
@@ -170,20 +170,20 @@ func (tp *provider) TestAdd(t *testing.T) {
170 {
171 name: "addCidV1",
172 data: strFile(helloStr),
173 - path: "/ipfs/zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd",
173 + path: "/ipfs/bafkreidi4zlleupgp2bvrpxyja5lbvi4mym7hz5bvhyoowby2qp7g2hxfa",
174 opts: []options.UnixfsAddOption{options.Unixfs.CidVersion(1)},
175 },
176 {
177 name: "addCidV1NoLeaves",
178 data: strFile(helloStr),
179 - path: "/ipfs/zdj7WY4GbN8NDbTW1dfCShAQNVovams2xhq9hVCx5vXcjvT8g",
179 + path: "/ipfs/bafybeibhbcn7k7o2m6xsqkrlfiokod3nxwe47viteynhruh6uqx7hvkjfu",
180 opts: []options.UnixfsAddOption{options.Unixfs.CidVersion(1), options.Unixfs.RawLeaves(false)},
181 },
182 // Non sha256 hash vs CID
183 {
184 name: "addCidSha3",
185 data: strFile(helloStr),
186 - path: "/ipfs/zb2wwnYtXBxpndNABjtYxWAPt3cwWNRnc11iT63fvkYV78iRb",
186 + path: "/ipfs/bafkrmichjflejeh6aren53o7pig7zk3m3vxqcoc2i5dv326k3x6obh7jry",
187 opts: []options.UnixfsAddOption{options.Unixfs.Hash(mh.SHA3_256)},
188 },
189 {
@@ -196,25 +196,25 @@ func (tp *provider) TestAdd(t *testing.T) {
196 {
197 name: "addInline",
198 data: strFile(helloStr),
199 - path: "/ipfs/zaYomJdLndMku8P9LHngHB5w2CQ7NenLbv",
199 + path: "/ipfs/bafyaafikcmeaeeqnnbswy3dpfqqho33snrsccgan",
200 opts: []options.UnixfsAddOption{options.Unixfs.Inline(true)},
201 },
202 {
203 name: "addInlineLimit",
204 data: strFile(helloStr),
205 - path: "/ipfs/zaYomJdLndMku8P9LHngHB5w2CQ7NenLbv",
205 + path: "/ipfs/bafyaafikcmeaeeqnnbswy3dpfqqho33snrsccgan",
206 opts: []options.UnixfsAddOption{options.Unixfs.InlineLimit(32), options.Unixfs.Inline(true)},
207 },
208 {
209 name: "addInlineZero",
210 data: strFile(""),
211 - path: "/ipfs/z2yYDV",
211 + path: "/ipfs/bafkqaaa",
212 opts: []options.UnixfsAddOption{options.Unixfs.InlineLimit(0), options.Unixfs.Inline(true), options.Unixfs.RawLeaves(true)},
213 },
214 { //TODO: after coreapi add is used in `ipfs add`, consider making this default for inline
215 name: "addInlineRaw",
216 data: strFile(helloStr),
217 - path: "/ipfs/zj7Gr8AcBreqGEfrnR5kPFe",
217 + path: "/ipfs/bafkqadlimvwgy3zmeb3w64tmmqqq",
218 opts: []options.UnixfsAddOption{options.Unixfs.InlineLimit(32), options.Unixfs.Inline(true), options.Unixfs.RawLeaves(true)},
219 },
220 // Chunker / Layout
@@ -291,20 +291,20 @@ func (tp *provider) TestAdd(t *testing.T) {
291 {
292 name: "simpleNoCopy",
293 data: realFile,
294 - path: "/ipfs/zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd",
294 + path: "/ipfs/bafkreidi4zlleupgp2bvrpxyja5lbvi4mym7hz5bvhyoowby2qp7g2hxfa",
295 opts: []options.UnixfsAddOption{options.Unixfs.Nocopy(true)},
296 },
297 {
298 name: "noCopyNoRaw",
299 data: realFile,
300 - path: "/ipfs/zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd",
300 + path: "/ipfs/bafkreidi4zlleupgp2bvrpxyja5lbvi4mym7hz5bvhyoowby2qp7g2hxfa",
301 opts: []options.UnixfsAddOption{options.Unixfs.Nocopy(true), options.Unixfs.RawLeaves(false)},
302 err: "nocopy option requires '--raw-leaves' to be enabled as well",
303 },
304 {
305 name: "noCopyNoPath",
306 data: strFile(helloStr),
307 - path: "/ipfs/zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd",
307 + path: "/ipfs/bafkreidi4zlleupgp2bvrpxyja5lbvi4mym7hz5bvhyoowby2qp7g2hxfa",
308 opts: []options.UnixfsAddOption{options.Unixfs.Nocopy(true)},
309 err: helpers.ErrMissingFsRef.Error(),
310 },
@@ -312,9 +312,9 @@ func (tp *provider) TestAdd(t *testing.T) {
312 {
313 name: "simpleAddEvent",
314 data: strFile(helloStr),
315 - path: "/ipfs/zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd",
315 + path: "/ipfs/bafkreidi4zlleupgp2bvrpxyja5lbvi4mym7hz5bvhyoowby2qp7g2hxfa",
316 events: []coreiface.AddEvent{
317 - {Name: "zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd", Path: p("zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd"), Size: strconv.Itoa(len(helloStr))},
317 + {Name: "bafkreidi4zlleupgp2bvrpxyja5lbvi4mym7hz5bvhyoowby2qp7g2hxfa", Path: p("bafkreidi4zlleupgp2bvrpxyja5lbvi4mym7hz5bvhyoowby2qp7g2hxfa"), Size: strconv.Itoa(len(helloStr))},
318 },
319 opts: []options.UnixfsAddOption{options.Unixfs.RawLeaves(true)},
320 },