Skip to content
This repository was archived by the owner on Jun 19, 2023. It is now read-only.

Commit 55d09af

Browse files
authored
Merge pull request #29 from ipfs/feat/cidv1-default-base32
switch to base32 cidv1 by default
2 parents 7786158 + 6287246 commit 55d09af

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

tests/block.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func (tp *provider) TestBlockPutFormat(t *testing.T) {
6161
t.Fatal(err)
6262
}
6363

64-
if res.Path().Cid().String() != "zdpuAn4amuLWo8Widi5v6VQpuo2dnpnwbVE3oB6qqs7mDSeoa" {
64+
if res.Path().Cid().String() != "bafyreiayl6g3gitr7ys7kyng7sjywlrgimdoymco3jiyab6rozecmoazne" {
6565
t.Errorf("got wrong cid: %s", res.Path().Cid().String())
6666
}
6767
}
@@ -79,7 +79,7 @@ func (tp *provider) TestBlockPutHash(t *testing.T) {
7979
t.Fatal(err)
8080
}
8181

82-
if res.Path().Cid().String() != "zBurKB9YZkcDf6xa53WBE8CFX4ydVqAyf9KPXBFZt5stJzEstaS8Hukkhu4gwpMtc1xHNDbzP7sPtQKyWsP3C8fbhkmrZ" {
82+
if res.Path().Cid().String() != "bafyb2qgdh7w6dcq24u65xbtdoehyavegnpvxcqce7ttvs6ielgmwdfxrahmu37d33atik57x5y6s7d7qz32aasuwgirh3ocn6ywswqdifvu6e" {
8383
t.Errorf("got wrong cid: %s", res.Path().Cid().String())
8484
}
8585
}

tests/dag.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func (tp *provider) TestPut(t *testing.T) {
5858
t.Fatal(err)
5959
}
6060

61-
if nd.Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
61+
if nd.Cid().String() != "bafyreicnga62zhxnmnlt6ymq5hcbsg7gdhqdu6z4ehu3wpjhvqnflfy6nm" {
6262
t.Errorf("got wrong cid: %s", nd.Cid().String())
6363
}
6464
}
@@ -81,7 +81,7 @@ func (tp *provider) TestPutWithHash(t *testing.T) {
8181
t.Fatal(err)
8282
}
8383

84-
if nd.Cid().String() != "z5hRLNd2sv4z1c" {
84+
if nd.Cid().String() != "bafyqabtfjbswy3dp" {
8585
t.Errorf("got wrong cid: %s", nd.Cid().String())
8686
}
8787
}
@@ -179,7 +179,7 @@ func (tp *provider) TestBatch(t *testing.T) {
179179
t.Fatal(err)
180180
}
181181

182-
if nd.Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
182+
if nd.Cid().String() != "bafyreicnga62zhxnmnlt6ymq5hcbsg7gdhqdu6z4ehu3wpjhvqnflfy6nm" {
183183
t.Errorf("got wrong cid: %s", nd.Cid().String())
184184
}
185185

tests/unixfs.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -170,20 +170,20 @@ func (tp *provider) TestAdd(t *testing.T) {
170170
{
171171
name: "addCidV1",
172172
data: strFile(helloStr),
173-
path: "/ipfs/zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd",
173+
path: "/ipfs/bafkreidi4zlleupgp2bvrpxyja5lbvi4mym7hz5bvhyoowby2qp7g2hxfa",
174174
opts: []options.UnixfsAddOption{options.Unixfs.CidVersion(1)},
175175
},
176176
{
177177
name: "addCidV1NoLeaves",
178178
data: strFile(helloStr),
179-
path: "/ipfs/zdj7WY4GbN8NDbTW1dfCShAQNVovams2xhq9hVCx5vXcjvT8g",
179+
path: "/ipfs/bafybeibhbcn7k7o2m6xsqkrlfiokod3nxwe47viteynhruh6uqx7hvkjfu",
180180
opts: []options.UnixfsAddOption{options.Unixfs.CidVersion(1), options.Unixfs.RawLeaves(false)},
181181
},
182182
// Non sha256 hash vs CID
183183
{
184184
name: "addCidSha3",
185185
data: strFile(helloStr),
186-
path: "/ipfs/zb2wwnYtXBxpndNABjtYxWAPt3cwWNRnc11iT63fvkYV78iRb",
186+
path: "/ipfs/bafkrmichjflejeh6aren53o7pig7zk3m3vxqcoc2i5dv326k3x6obh7jry",
187187
opts: []options.UnixfsAddOption{options.Unixfs.Hash(mh.SHA3_256)},
188188
},
189189
{
@@ -196,25 +196,25 @@ func (tp *provider) TestAdd(t *testing.T) {
196196
{
197197
name: "addInline",
198198
data: strFile(helloStr),
199-
path: "/ipfs/zaYomJdLndMku8P9LHngHB5w2CQ7NenLbv",
199+
path: "/ipfs/bafyaafikcmeaeeqnnbswy3dpfqqho33snrsccgan",
200200
opts: []options.UnixfsAddOption{options.Unixfs.Inline(true)},
201201
},
202202
{
203203
name: "addInlineLimit",
204204
data: strFile(helloStr),
205-
path: "/ipfs/zaYomJdLndMku8P9LHngHB5w2CQ7NenLbv",
205+
path: "/ipfs/bafyaafikcmeaeeqnnbswy3dpfqqho33snrsccgan",
206206
opts: []options.UnixfsAddOption{options.Unixfs.InlineLimit(32), options.Unixfs.Inline(true)},
207207
},
208208
{
209209
name: "addInlineZero",
210210
data: strFile(""),
211-
path: "/ipfs/z2yYDV",
211+
path: "/ipfs/bafkqaaa",
212212
opts: []options.UnixfsAddOption{options.Unixfs.InlineLimit(0), options.Unixfs.Inline(true), options.Unixfs.RawLeaves(true)},
213213
},
214214
{ //TODO: after coreapi add is used in `ipfs add`, consider making this default for inline
215215
name: "addInlineRaw",
216216
data: strFile(helloStr),
217-
path: "/ipfs/zj7Gr8AcBreqGEfrnR5kPFe",
217+
path: "/ipfs/bafkqadlimvwgy3zmeb3w64tmmqqq",
218218
opts: []options.UnixfsAddOption{options.Unixfs.InlineLimit(32), options.Unixfs.Inline(true), options.Unixfs.RawLeaves(true)},
219219
},
220220
// Chunker / Layout
@@ -291,30 +291,30 @@ func (tp *provider) TestAdd(t *testing.T) {
291291
{
292292
name: "simpleNoCopy",
293293
data: realFile,
294-
path: "/ipfs/zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd",
294+
path: "/ipfs/bafkreidi4zlleupgp2bvrpxyja5lbvi4mym7hz5bvhyoowby2qp7g2hxfa",
295295
opts: []options.UnixfsAddOption{options.Unixfs.Nocopy(true)},
296296
},
297297
{
298298
name: "noCopyNoRaw",
299299
data: realFile,
300-
path: "/ipfs/zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd",
300+
path: "/ipfs/bafkreidi4zlleupgp2bvrpxyja5lbvi4mym7hz5bvhyoowby2qp7g2hxfa",
301301
opts: []options.UnixfsAddOption{options.Unixfs.Nocopy(true), options.Unixfs.RawLeaves(false)},
302302
err: "nocopy option requires '--raw-leaves' to be enabled as well",
303303
},
304304
{
305305
name: "noCopyNoPath",
306306
data: strFile(helloStr),
307-
path: "/ipfs/zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd",
307+
path: "/ipfs/bafkreidi4zlleupgp2bvrpxyja5lbvi4mym7hz5bvhyoowby2qp7g2hxfa",
308308
opts: []options.UnixfsAddOption{options.Unixfs.Nocopy(true)},
309309
err: helpers.ErrMissingFsRef.Error(),
310310
},
311311
// Events / Progress
312312
{
313313
name: "simpleAddEvent",
314314
data: strFile(helloStr),
315-
path: "/ipfs/zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd",
315+
path: "/ipfs/bafkreidi4zlleupgp2bvrpxyja5lbvi4mym7hz5bvhyoowby2qp7g2hxfa",
316316
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))},
318318
},
319319
opts: []options.UnixfsAddOption{options.Unixfs.RawLeaves(true)},
320320
},

0 commit comments

Comments
 (0)