Skip to content

Commit 9886fc0

Browse files
StebalienStebalien
committed
switch to base32 by default for CIDv1
fixes #6220 License: MIT Signed-off-by: Steven Allen <[email protected]>
1 parent 1c6043d commit 9886fc0

20 files changed

+96
-94
lines changed

‎docs/gateway.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@ a read-only, "safe" subset of the normal API.
5555
For example, you use this to download a block:
5656

5757
```
58-
> curl https://ipfs.io/api/v0/block/get/zb2rhi36Gc9GJWijLEL6zW45MBux5FcFv5gJmjXA7VAMozEXY
58+
> curl https://ipfs.io/api/v0/block/get/bafkreifjjcie6lypi6ny7amxnfftagclbuxndqonfipmb64f2km2devei4
5959
```

‎go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ require (
1919
github.com/ipfs/go-bitswap v0.0.4
2020
github.com/ipfs/go-block-format v0.0.2
2121
github.com/ipfs/go-blockservice v0.0.3
22-
github.com/ipfs/go-cid v0.0.1
23-
github.com/ipfs/go-cidutil v0.0.1
22+
github.com/ipfs/go-cid v0.0.2
23+
github.com/ipfs/go-cidutil v0.0.2
2424
github.com/ipfs/go-datastore v0.0.5
2525
github.com/ipfs/go-detect-race v0.0.1
2626
github.com/ipfs/go-ds-badger v0.0.3
@@ -54,7 +54,7 @@ require (
5454
github.com/ipfs/go-unixfs v0.0.5
5555
github.com/ipfs/go-verifcid v0.0.1
5656
github.com/ipfs/hang-fds v0.0.1
57-
github.com/ipfs/interface-go-ipfs-core v0.0.7
57+
github.com/ipfs/interface-go-ipfs-core v0.0.8
5858
github.com/ipfs/iptb v1.4.0
5959
github.com/ipfs/iptb-plugins v0.0.2
6060
github.com/jbenet/go-is-domain v1.0.2

‎go.sum

+6-4
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,10 @@ github.com/ipfs/go-blockservice v0.0.3 h1:40OvwrxeudTAlUGUAKNYnNPcwQeLtXedjzTWec
145145
github.com/ipfs/go-blockservice v0.0.3/go.mod h1:/NNihwTi6V2Yr6g8wBI+BSwPuURpBRMtYNGrlxZ8KuI=
146146
github.com/ipfs/go-cid v0.0.1 h1:GBjWPktLnNyX0JiQCNFpUuUSoMw5KMyqrsejHYlILBE=
147147
github.com/ipfs/go-cid v0.0.1/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
148-
github.com/ipfs/go-cidutil v0.0.1 h1:UpDQI2LrihqOGY2mHaMhjrhh1DJ14N/58BQb7lKXvlQ=
149-
github.com/ipfs/go-cidutil v0.0.1/go.mod h1:/0H649ymJksNEZvBAkM18HIctk7tkONH9tspTeLok48=
148+
github.com/ipfs/go-cid v0.0.2 h1:tuuKaZPU1M6HcejsO3AcYWW8sZ8MTvyxfc4uqB4eFE8=
149+
github.com/ipfs/go-cid v0.0.2/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
150+
github.com/ipfs/go-cidutil v0.0.2 h1:CNOboQf1t7Qp0nuNh8QMmhJs0+Q//bRL1axtCnIB1Yo=
151+
github.com/ipfs/go-cidutil v0.0.2/go.mod h1:ewllrvrxG6AMYStla3GD7Cqn+XYSLqjK0vc+086tB6s=
150152
github.com/ipfs/go-datastore v0.0.1 h1:AW/KZCScnBWlSb5JbnEnLKFWXL224LBEh/9KXXOrUms=
151153
github.com/ipfs/go-datastore v0.0.1/go.mod h1:d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE=
152154
github.com/ipfs/go-datastore v0.0.3 h1:/eP3nMDmLzMJNoWSSYvEkmMTTrm9FFCN+JraP9NdlwU=
@@ -237,8 +239,8 @@ github.com/ipfs/go-verifcid v0.0.1 h1:m2HI7zIuR5TFyQ1b79Da5N9dnnCP1vcu2QqawmWlK2
237239
github.com/ipfs/go-verifcid v0.0.1/go.mod h1:5Hrva5KBeIog4A+UpqlaIU+DEstipcJYQQZc0g37pY0=
238240
github.com/ipfs/hang-fds v0.0.1 h1:KGAxiGtJPT3THVRNT6yxgpdFPeX4ZemUjENOt6NlOn4=
239241
github.com/ipfs/hang-fds v0.0.1/go.mod h1:U4JNbzwTpk/qP2Ms4VgrZ4HcgJGVosBJqMXvwe4udSY=
240-
github.com/ipfs/interface-go-ipfs-core v0.0.7 h1:KfPVykJTT2viS/NdIC7xUEmnS9jDufl3FXivatAxtZM=
241-
github.com/ipfs/interface-go-ipfs-core v0.0.7/go.mod h1:VceUOYu+kPEy8Ev/gAhzXFTIfc/7xILKnL4fgZg8tZM=
242+
github.com/ipfs/interface-go-ipfs-core v0.0.8 h1:nmEYOfK6QRf3VIdggoZ4rmbKXcC2g6cEdU13Z1CvmL4=
243+
github.com/ipfs/interface-go-ipfs-core v0.0.8/go.mod h1:RU+DSZXV+JdA7Yagu3OrSoB6hngSmMtK1w6ENOqmfQ8=
242244
github.com/ipfs/iptb v1.4.0 h1:YFYTrCkLMRwk/35IMyC6+yjoQSHTEcNcefBStLJzgvo=
243245
github.com/ipfs/iptb v1.4.0/go.mod h1:1rzHpCYtNp87/+hTxG5TfCVn/yMY3dKnLn8tBiMfdmg=
244246
github.com/ipfs/iptb-plugins v0.0.2 h1:JZp4h/+7f00dY4Epr8gzF+VqKITXmVGsZabvmZp7E9I=

‎test/sharness/t0040-add-and-cat.sh

+18-18
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ test_add_cat_raw() {
422422
'
423423

424424
test_expect_success "zero length file has correct hash" '
425-
test "$ZEROHASH" = zb2rhmy65F3REf8SZp7De11gxtECBGgUKaLdiDj7MCGCHxbDW
425+
test "$ZEROHASH" = bafkreihdwdcefgh4dqkjv67uzcmw7ojee6xedzdetojuzjevtenxquvyku
426426
'
427427

428428
test_expect_success "cat zero length file" '
@@ -715,23 +715,23 @@ VENUS="QmU5kp3BH3B8tnWUU2Pikdb2maksBNkb92FHRr56hyghh4"
715715
add_directory
716716

717717
PLANETS="QmfWfQfKCY5Ukv9peBbxM5vqWM9BzmqUSXvdCgjT2wsiBT"
718-
MARS="zb2rhZdTkQNawVajsTNiYc9cTPHqgLdJVvBRkZok9RjkgQYRU"
719-
VENUS="zb2rhn6TGvnUaMAg4VV4y9HVx5W42HihcH4jsyrDv8mkepFqq"
718+
MARS="bafkreibmlvvgdyihetgocpof6xk64kjjzdeq2e4c7hqs3krdheosk4tgj4"
719+
VENUS="bafkreihfsphazrk2ilejpekyltjeh5k4yvwgjuwg26ueafohqioeo3sdca"
720720
add_directory '--raw-leaves'
721721

722-
PLANETS="zdj7Wnbun6P41Z5ddTkNvZaDTmQ8ZLdiKFcJrL9sV87rPScMP"
723-
MARS="zb2rhZdTkQNawVajsTNiYc9cTPHqgLdJVvBRkZok9RjkgQYRU"
724-
VENUS="zb2rhn6TGvnUaMAg4VV4y9HVx5W42HihcH4jsyrDv8mkepFqq"
722+
PLANETS="bafybeih7e5dmkyk25up5vxug4q3hrg2fxbzf23dfrac2fns5h7z4aa7ioi"
723+
MARS="bafkreibmlvvgdyihetgocpof6xk64kjjzdeq2e4c7hqs3krdheosk4tgj4"
724+
VENUS="bafkreihfsphazrk2ilejpekyltjeh5k4yvwgjuwg26ueafohqioeo3sdca"
725725
add_directory '--cid-version=1'
726726

727-
PLANETS="zdj7WiC51v78BjBcmZR7uuBvmDWxSn5EDr5MiyTwE18e8qvb7"
728-
MARS="zdj7WWx6fGNrNGkdpkuTAxCjKbQ1pPtarqA6VQhedhLTZu34J"
729-
VENUS="zdj7WbB1BUF8WejmVpQCmMLd1RbPnxJtvAj1Lep6eTmXRFbrz"
727+
PLANETS="bafybeif5tuep5ap2d7zyhbktucey75aoacxufgt6i3v4gebmixyipnyp7y"
728+
MARS="bafybeiawta2ntdmsy24aro35w3homzl4ak7svr3si7l7gesvq4erglyye4"
729+
VENUS="bafybeicvkvhs2fr75ynebtdjqpgm4g2fc63abqbmysupwpmcjl4gx7mzrm"
730730
add_directory '--cid-version=1 --raw-leaves=false'
731731

732-
PLANETS="zDMZof1kqxDAx9myQbXsyWwyWP9qRPsXsWH7XuTz6isT7Rh1S6nM"
733-
MARS="zCT5htkdz1ZBHYVQXFQn51ngPXLVqaHSWoae87V1d6e9qWpSAjXw"
734-
VENUS="zCT5htke5JcdoMM4WhmUKXWf2QC3TnQToqGZHH1WsZERv6kPhFPg"
732+
PLANETS="bafykbzaceaptbcs7ik5mdfpot3b4ackvxlwh7loc5jcrtkayf64ukl7zyk46e"
733+
MARS="bafk2bzaceaqcxw46uzkyd2jmczoogof6pnkqt4dpiv3pwkunsv4g5rkkmecie"
734+
VENUS="bafk2bzacebxnke2fb5mgzxyjuuavvcfht4fd3gvn4klkujz6k72wboynhuvfw"
735735
add_directory '--hash=blake2b-256'
736736

737737
test_expect_success "'ipfs add -rn' succeeds" '
@@ -769,32 +769,32 @@ test_add_cat_5MB --raw-leaves "QmbdLHCmdi48eM8T7D67oXjA1S2Puo8eMfngdHhdPukFd6"
769769

770770
# note: the specified hash implies that internal nodes are stored
771771
# using CidV1 and leaves are stored using raw blocks
772-
test_add_cat_5MB --cid-version=1 "zdj7WiiaedqVBXjX4SNqx3jfuZideDqdLYnDzCDJ66JDMK9o2"
772+
test_add_cat_5MB --cid-version=1 "bafybeigfnx3tka2rf5ovv2slb7ymrt4zbwa3ryeqibe6fipyt5vgsrli3u"
773773

774774
# note: the specified hash implies that internal nodes are stored
775775
# using CidV1 and leaves are stored using CidV1 but using the legacy
776776
# format (i.e. not raw)
777-
test_add_cat_5MB '--cid-version=1 --raw-leaves=false' "zdj7WfgEsj897BBZj2mcfsRLhaPZcCixPV2G7DkWgF1Wdr64P"
777+
test_add_cat_5MB '--cid-version=1 --raw-leaves=false' "bafybeieyifrgpjn3yengthr7qaj72ozm2aq3wm53srgeprc43w67qpvfqa"
778778

779779
# note: --hash=blake2b-256 implies --cid-version=1 which implies --raw-leaves=true
780780
# the specified hash represents the leaf nodes stored as raw leaves and
781781
# encoded with the blake2b-256 hash funtion
782-
test_add_cat_5MB '--hash=blake2b-256' "zDMZof1kuxn7ebvKyvmkYLPvocSvFYxxAWT1yQBN1wWiXXr7w5mY"
782+
test_add_cat_5MB '--hash=blake2b-256' "bafykbzacebnmjcl4sn37b3ehtibvf263oun2w6idghenrvlpehq5w5jqyvhjo"
783783

784784
# the specified hash represents the leaf nodes stored as protoful nodes and
785785
# encoded with the blake2b-256 hash funtion
786-
test_add_cat_5MB '--hash=blake2b-256 --raw-leaves=false' "zDMZof1krz3SFTyhboRyWZyUP2qNgVdn9wjtaX211aHJ8WgeyT9v"
786+
test_add_cat_5MB '--hash=blake2b-256 --raw-leaves=false' "bafykbzaceaxiiykzgpbhnzlecffqm3zbuvhujyvxe5scltksyafagkyw4rjn2"
787787

788788
test_add_cat_expensive "" "QmU9SWAPPmNEKZB8umYMmjYvN7VyHqABNvdA6GUi4MMEz3"
789789

790790
# note: the specified hash implies that internal nodes are stored
791791
# using CidV1 and leaves are stored using raw blocks
792-
test_add_cat_expensive "--cid-version=1" "zdj7WcatQrtuE4WMkS4XsfsMixuQN2po4irkYhqxeJyW1wgCq"
792+
test_add_cat_expensive "--cid-version=1" "bafybeidkj5ecbhrqmzrcee2rw7qwsx24z3364qya3fnp2ktkg2tnsrewhi"
793793

794794
# note: --hash=blake2b-256 implies --cid-version=1 which implies --raw-leaves=true
795795
# the specified hash represents the leaf nodes stored as raw leaves and
796796
# encoded with the blake2b-256 hash funtion
797-
test_add_cat_expensive '--hash=blake2b-256' "zDMZof1kwndounDzQCANUHjiE3zt1mPEgx7RE3JTHoZrRRa79xcv"
797+
test_add_cat_expensive '--hash=blake2b-256' "bafykbzaceb26fnq5hz5iopzamcb4yqykya5x6a4nvzdmcyuu4rj2akzs3z7r6"
798798

799799
test_add_named_pipe " Post http://$API_ADDR/api/v0/add?chunker=size-262144&encoding=json&hash=sha2-256&inline-limit=32&pin=true&progress=true&recursive=true&stream-channels=true:"
800800

‎test/sharness/t0043-add-w.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ added QmYC3u5jGWuyFwvTxtvLYm2K3SpWZ31tg3NjpVVvh9cJaJ _jo7/wzvsihy
2727
added QmQkib3f9XNX5sj6WEahLUPFpheTcwSRJwUCSvjcv8b9by _jo7
2828
added QmNQoesMj1qp8ApE51NbtTjFYksyzkezPD4cat7V2kzbKN '
2929

30-
add_w_d1_v1='added zb2rhjXyHbbgwgtAUwHtpBd8iXLgK22ZjVmaiJSMNmqBTpXS3 _jo7/-s782qgs
31-
added zb2rhi6PQqQFbS4QsvrV8sL9ue1fvFoqtLVqogNPCZri8rquN _jo7/15totauzkak-
32-
added zb2rhjQthC6LgnNZztpsF9LcfPxznh3cJnmzUx8dnSqNqJ8Yz _jo7/galecuirrj4r
33-
added zb2rhYh9hgDw1DpaZfLUU5MkKNezPWjPTkgGQPiTyLpZYu3jn _jo7/mzo50r-1xidf5zx
34-
added zb2rhZK5xwEUhY4uskfj4sn979aCH27cnqseVVznYDn7NFWtt _jo7/wzvsihy
35-
added zdj7WfNC8EZchqskczxsgrVEqwLVpksQ9B5kopf391jVbCGwv _jo7
36-
added zdj7Wn5jf686mfYE8gUKWzY7aTjp5eAQcecD8q4ZtqLJbDNxe '
30+
add_w_d1_v1='added bafkreif7rizm7yeem72okzlwr2ls73cyemfyv5mjghdew3kzhtfznzz4dq _jo7/-s782qgs
31+
added bafkreifkecyeevzcocvjliaz3ssiej5tkp32xyuogizonybihapdzovlsu _jo7/15totauzkak-
32+
added bafkreif5xhyhjhqp3muvj52wp37nutafsznckeuhikrl3h6w2sx3xdyeqm _jo7/galecuirrj4r
33+
added bafkreia6ooswgjtadq5n5zxkn2qyw3dpuyutvam7grtxn36ywykv52vkje _jo7/mzo50r-1xidf5zx
34+
added bafkreibhvbkg6zgra4bu56a36h25g52g6yxsb25qvgqv2trx4zbmhkmxku _jo7/wzvsihy
35+
added bafybeietuhja6ipwwnxefjecz6c5yls4j4q7r5gxiesyzfzkwsaimpa5mu _jo7
36+
added bafybeihxnrujsxdwyzuf3rq6wigzitrj6vjvxphttrtsx6tqabzpqfbd54 '
3737

3838
add_w_d2='added Qme987pqNBhZZXy4ckeXiR7zaRQwBabB7fTgHurW2yJfNu 4r93
3939
added QmU9Jqks8TPu4vFr6t7EKkAKQrSJuEujNj1AkzoCeTEDFJ gnz66h/1k0xpx34

‎test/sharness/t0044-add-symlink.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ test_add_symlinks() {
3434

3535
test_expect_success "output looks good" '
3636
# note this hash implies all internal nodes are stored using CidV1
37-
echo zdj7WZDQ2xMmr4qn6aRZTsE9fCUs2KmvPigpHdpssqUobwcWK > filehash_exp &&
37+
echo bafybeibyhlx64cklod6isy3h7tsmr4qvam3ae3b74n3hfes5bythjrwyua > filehash_exp &&
3838
test_cmp filehash_exp filehash_out
3939
'
4040

‎test/sharness/t0045-ls.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ test_ls_cmd_raw_leaves() {
227227
echo bar > somedir/foo &&
228228
ipfs add --raw-leaves -r somedir/ > /dev/null &&
229229
ipfs ls '$1' QmThNTdtKaVoCVrYmM5EBS6U3S5vfKFue2TxbxxAxRcKKE > ls-actual
230-
echo "zb2rhf6GzX4ckKZtjy8yy8iyq1KttCrRyqDedD6xubhY3sw2F 4 foo" > ls-expect
230+
echo "bafkreid5qzpjlgzem2iyzgddv7fjilipxcoxzgwazgn27q3usucn5wlxga 4 foo" > ls-expect
231231
test_cmp ls-actual ls-expect
232232
'
233233
}

‎test/sharness/t0046-id-hash.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ test_description="Test basic operations with identity hash"
66

77
test_init_ipfs
88

9-
ID_HASH0=z25RnHTQ7DveGAsV6YDSDR8EkWvD
9+
ID_HASH0=bafkqaedknncdsodknncdsnzvnbvuioak
1010
ID_HASH0_CONTENTS=jkD98jkD975hkD8
1111

1212
test_expect_success "can fetch random id hash" '

‎test/sharness/t0050-block.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ test_expect_success "can set multihash type and length on block put" '
203203
'
204204

205205
test_expect_success "output looks good" '
206-
test "z83bYcqyBkbx5fuNAcvbdv4pr5RYQiEpK" = "$HASH"
206+
test "bafkrifctrq4xazzixy2v4ezymjcvzpskqdwlxra" = "$HASH"
207207
'
208208

209209
test_expect_success "can read block with different hash" '
@@ -228,7 +228,7 @@ test_expect_success "can set multihash type and length on block put without form
228228
'
229229

230230
test_expect_success "output looks good" '
231-
test "z8bwYCvQPhyDY7VUTsUdGdE8Evm1ktSPV" = "$HASH"
231+
test "bafybifctrq4xazzixy2v4ezymjcvzpskqdwlxra" = "$HASH"
232232
'
233233

234234
test_expect_success "put with sha3 and cidv0 fails" '

‎test/sharness/t0051-object.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ test_object_cmd() {
400400
'
401401

402402
HASHv0=QmXg9Pp2ytZ14xgmQjYEiHjVjMFXzCVVEcRTWJBmLgR39V
403-
HASHv1=z4CrgyEyhm4tAw1pgzQtNNuP7
403+
HASHv1=bafkqadsimvwgy3zajb2w2yloeefau
404404

405405
test_expect_success "ipfs object get with --cid-base=base32 uses base32 for CidV1 link only" '
406406
ipfs object get --cid-base=base32 $MIXED > mixed.actual &&

‎test/sharness/t0052-object-diff.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ test_expect_success "diff (raw-leaves) added link works" '
8989
'
9090

9191
test_expect_success "diff (raw-leaves) added link looks right" '
92-
echo + zb2rhmWNFDCdMjJoCZPE5b5NuU38yoRzRmEtfzb4exxk3R8g4 \"cat\" > diff_raw_exp &&
92+
echo + bafkreig43bpnc6sjo6izaiqzzq5esapazosa3f3wt6jsflwiu3x7ydhq2u \"cat\" > diff_raw_exp &&
9393
test_cmp diff_raw_exp diff_raw_out
9494
'
9595

@@ -107,7 +107,7 @@ test_expect_success "verbose diff (raw-leaves) added link works" '
107107
'
108108

109109
test_expect_success "verbose diff (raw-leaves) added link looks right" '
110-
echo Added new link \"cat\" pointing to zb2rhmWNFDCdMjJoCZPE5b5NuU38yoRzRmEtfzb4exxk3R8g4. > diff_raw_exp &&
110+
echo Added new link \"cat\" pointing to bafkreig43bpnc6sjo6izaiqzzq5esapazosa3f3wt6jsflwiu3x7ydhq2u. > diff_raw_exp &&
111111
test_cmp diff_raw_exp diff_raw_out
112112
'
113113

@@ -125,7 +125,7 @@ test_expect_success "diff (raw-leaves) removed link works" '
125125
'
126126

127127
test_expect_success "diff (raw-leaves) removed link looks right" '
128-
echo Removed link \"cat\" \(was zb2rhmWNFDCdMjJoCZPE5b5NuU38yoRzRmEtfzb4exxk3R8g4\). > diff_raw_exp &&
128+
echo Removed link \"cat\" \(was bafkreig43bpnc6sjo6izaiqzzq5esapazosa3f3wt6jsflwiu3x7ydhq2u\). > diff_raw_exp &&
129129
test_cmp diff_raw_exp diff_raw_out
130130
'
131131

@@ -143,7 +143,7 @@ test_expect_success "diff (raw-leaves) nested add works" '
143143
'
144144

145145
test_expect_success "diff (raw-leaves) looks right" '
146-
echo Added new link \"baz/dog\" pointing to zb2rhaM8wjDfi8A22dEqk89raWtViq8pjxvKQu2eaKtWhYKgE. > diff_raw_exp &&
146+
echo Added new link \"baz/dog\" pointing to bafkreibxbkgajofglo2esqtv53bcp4nwstnqjr3nu2ylrlui5unldf4qum. > diff_raw_exp &&
147147
test_cmp diff_raw_exp diff_raw_out
148148
'
149149

@@ -161,7 +161,7 @@ test_expect_success "diff (raw-leaves) changed link works" '
161161
'
162162

163163
test_expect_success "diff（raw-leaves) looks right" '
164-
echo Changed \"bar\" from zb2rhdUECGnPgMJNgmghaMKdqqGdpTe9GmEJiPna488ThfLBz to zb2rhfEA1M13SPoeayrsPcKhCezgMQPjguGFLH56G8qQ2qpDn. > diff_raw_exp &&
164+
echo Changed \"bar\" from bafkreidfn2oemjv5ns2fnc4ukgbjwt6bq5gdd4ciz4mpnehqi2dvwxfbde to bafkreid7rmo7yrtlmje7a3f6kxerotpsk6hhovg2pe755use55olukry6e. > diff_raw_exp &&
165165
test_cmp diff_raw_exp diff_raw_out
166166
'
167167

‎test/sharness/t0053-dag.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ test_dag_cmd() {
4848
'
4949

5050
test_expect_success "output looks correct" '
51-
EXPHASH="zdpuAsXfkHapxohc8LtsCzYiAsy84ESqKRD8eWuY64tt9r2CE"
51+
EXPHASH="bafyreidjtjfmavdk7epvztob2m5vlm3pxp3gjmpyewro4qlbw5n4f4iz64"
5252
test $EXPHASH = $IPLDHASH
5353
'
5454

@@ -139,13 +139,13 @@ test_dag_cmd() {
139139

140140
test_expect_success "non-canonical cbor input is normalized" '
141141
HASH=$(cat ../t0053-dag-data/non-canon.cbor | ipfs dag put --format=cbor --input-enc=raw) &&
142-
test $HASH = "zdpuAmxF8q6iTUtkB3xtEYzmc5Sw762qwQJftt5iW8NTWLtjC" ||
142+
test $HASH = "bafyreiawx7ona7oa2ptcoh6vwq4q6bmd7x2ibtkykld327bgb7t73ayrqm" ||
143143
test_fsh echo $HASH
144144
'
145145

146146
test_expect_success "non-canonical cbor input is normalized with input-enc cbor" '
147147
HASH=$(cat ../t0053-dag-data/non-canon.cbor | ipfs dag put --format=cbor --input-enc=cbor) &&
148-
test $HASH = "zdpuAmxF8q6iTUtkB3xtEYzmc5Sw762qwQJftt5iW8NTWLtjC" ||
148+
test $HASH = "bafyreiawx7ona7oa2ptcoh6vwq4q6bmd7x2ibtkykld327bgb7t73ayrqm" ||
149149
test_fsh echo $HASH
150150
'
151151

@@ -163,7 +163,7 @@ test_dag_cmd() {
163163
'
164164

165165
test_expect_success "output looks correct" '
166-
EXPHASH="zBwWX8u9LYZdCWqaryJW8QsBstghHSPy41nfhhFLY9qw1Vu2BWqnMFtk1jL3qCtEdGd7Kqw1HNPZv5z8LxP2eHGGDCdRE"
166+
EXPHASH="bafyriqgae54zjl3bjebmbat2rjem4ewj6vni6jxohandmvk3bibfgv3sioyeidppsghvulryxats43br3b7afa6jy77x6gqzqaicer6ljicck"
167167
test $EXPHASH = $IPLDHASH
168168
'
169169

@@ -205,8 +205,8 @@ test_dag_cmd() {
205205
'
206206

207207
test_expect_success "dag put multiple files output looks good" '
208-
echo zdpuAoKMEvka7gKGSjF9B3of1F5gE5MyMMywxTC13wCmouQrf > dag_put_exp &&
209-
echo zdpuAogmDEvpvGjMFsNTGDEU1JMYe6v69oxR8nG81EurmGHMj >> dag_put_exp &&
208+
echo bafyreiblaotetvwobe7cu2uqvnddr6ew2q3cu75qsoweulzku2egca4dxq > dag_put_exp &&
209+
echo bafyreibqp7zvp6dvrqhtkbwuzzk7jhtmfmngtiqjajqpm6gtw55o7kqzfi >> dag_put_exp &&
210210
211211
test_cmp dag_put_exp dag_put_out
212212
'

‎test/sharness/t0087-repo-robust-gc.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ test_gc_robust_part1() {
1818

1919
HASH1FILE=.ipfs/blocks/L3/CIQNIPL4GP62ZMNNSLZ2G33Z3T5VAN3YHCJTGT5FG45XWH5FGZRXL3A.data
2020

21-
LEAF1=zb2rhZWKCMcHCfCym41ocwE5BhNQsEVLrwBkLEQaxJzRHHZch
21+
LEAF1=bafkreibkrcw7hf6nhr6dvwecqxc5rqc7u7pkhkti53byyznqp23dk5fc2y
2222
LEAF1FILE=.ipfs/blocks/C2/AFKREIBKRCW7HF6NHR6DVWECQXC5RQC7U7PKHKTI53BYYZNQP23DK5FC2Y.data
2323

24-
LEAF2=zb2rhdUpCuyoQPRtvBW8JhAEfPaNd9dBb3QQCMMWYS1V8hjBR
24+
LEAF2=bafkreidfsuir43gjphndxxqa45gjvnrzbet3crpumyjcblk3rtn7zamq6q
2525
LEAF2FILE=.ipfs/blocks/Q6/BAFKREIDFSUIR43GJPHNDXXQA45GJVNRZBET3CRPUMYJCBLK3RTN7ZAMQ6Q
2626

27-
LEAF3=zb2rhnwyvreekPqEMAbKqs35KYHxkNi7pXED7L2TfJKveTTva
28-
LEAF4=zb2rhnvAVvfDDnndcfQkwqNgUm94ba3zBSXyJKCfVXwU4FXx2
27+
LEAF3=bafkreihsipwnaj3mrc5plg24lpy6dw2bpixl2pe5iapzvc6ct2n33uhqjm
28+
LEAF4=bafkreihrzs3rh4yxel4olv54vxettu5hv6wxy3krh6huzwhjub7kusnen4
2929

3030
test_expect_success "remove a leaf node from the repo manually" '
3131
rm "$LEAF1FILE"

‎test/sharness/t0250-files-api.sh

+11-11
Original file line numberDiff line numberDiff line change
@@ -711,34 +711,34 @@ tests_for_files_api() {
711711
test_files_api "($EXTRA, raw-leaves)" '' --raw-leaves
712712

713713
ROOT_HASH=QmageRWxC7wWjPv5p36NeAgBAiFdBHaNfxAehBSwzNech2
714-
CATS_HASH=zdj7WkEzPLNAr5TYJSQC8CFcBjLvWFfGdx6kaBrJXnBguwWeX
715-
FILE_HASH=zdj7WYHvf5sBRgSBjYnq64QFr449CCbgupXfBvoYL3aHC1DzJ
716-
TRUNC_HASH=zdj7Wjr8GHZonPFVCWvz2SLLo9H6MmqBxyeB34ArHfyCbmdJG
714+
CATS_HASH=bafybeig4cpvfu2qwwo3u4ffazhqdhyynfhnxqkzvbhrdbamauthf5mfpuq
715+
FILE_HASH=bafybeibkrazpbejqh3qun7xfnsl7yofl74o4jwhxebpmtrcpavebokuqtm
716+
TRUNC_HASH=bafybeigwhb3q36yrm37jv5fo2ap6r6eyohckqrxmlejrenex4xlnuxiy3e
717717
if [ "$EXTRA" = "offline" ]; then
718718
test_files_api "($EXTRA, cidv1)" --cid-version=1
719719
fi
720720

721721
test_expect_success "can update root hash to cidv1" '
722722
ipfs files chcid --cid-version=1 / &&
723-
echo zdj7WbTaiJT1fgatdet9Ei9iDB5hdCxkbVyhyh8YTUnXMiwYi > hash_expect &&
723+
echo bafybeiczsscdsbs7ffqz55asqdf3smv6klcw3gofszvwlyarci47bgf354 > hash_expect &&
724724
ipfs files stat --hash / > hash_actual &&
725725
test_cmp hash_expect hash_actual
726726
'
727727

728-
ROOT_HASH=zdj7Whmtnx23bR7c7E1Yn3zWYWjnvT4tpzWYGaBMyqcopDWrx
728+
ROOT_HASH=bafybeifxnoetaa2jetwmxubv3gqiyaknnujwkkkhdeua63kulm63dcr5wu
729729
test_files_api "($EXTRA, cidv1 root)"
730730

731731
if [ "$EXTRA" = "offline" ]; then
732732
test_expect_success "can update root hash to blake2b-256" '
733733
ipfs files chcid --hash=blake2b-256 / &&
734-
echo zDMZof1kvswQMT8txrmnb3JGBuna6qXCTry6hSifrkZEd6VmHbBm > hash_expect &&
734+
echo bafykbzacebugfutjir6qie7apo5shpry32ruwfi762uytd5g3u2gk7tpscndq > hash_expect &&
735735
ipfs files stat --hash / > hash_actual &&
736736
test_cmp hash_expect hash_actual
737737
'
738-
ROOT_HASH=zDMZof1kxEsAwSgCZsGQRVcHCMtHLjkUQoiZUbZ87erpPQJGUeW8
739-
CATS_HASH=zDMZof1kuAhr3zBkxq48V7o9HJZCTVyu1Wd9wnZtVcPJLW8xnGft
740-
FILE_HASH=zDMZof1kxbB9CvxgRioBzESbGnZUxtSCsZ18H1EUkxDdWt1DYEkK
741-
TRUNC_HASH=zDMZof1kpH1vxK3k2TeYc8w59atCbzMzrhZonsztMWSptVro2zQa
738+
ROOT_HASH=bafykbzaceb6jv27itwfun6wsrbaxahpqthh5be2bllsjtb3qpmly3vji4mlfk
739+
CATS_HASH=bafykbzacebhpn7rtcjjc5oa4zgzivhs7a6e2tq4uk4px42bubnmhpndhqtjig
740+
FILE_HASH=bafykbzaceca45w2i3o3q3ctqsezdv5koakz7sxsw37ygqjg4w54m2bshzevxy
741+
TRUNC_HASH=bafykbzaceadeu7onzmlq7v33ytjpmo37rsqk2q6mzeqf5at55j32zxbcdbwig
742742
test_files_api "($EXTRA, blake2b-256 root)"
743743
fi
744744

@@ -769,7 +769,7 @@ test_launch_ipfs_daemon --offline
769769
SHARD_HASH=QmPkwLJTYZRGPJ8Lazr9qPdrLmswPtUjaDbEpmR9jEh1se
770770
test_sharding "(cidv0)"
771771

772-
SHARD_HASH=zdj7WZXr6vG2Ne7ZLHGEKrGyF3pHBfAViEnmH9CoyvjrFQM8E
772+
SHARD_HASH=bafybeib46tpawg2d2hhlmmn2jvgio33wqkhlehxrem7wbfvqqikure37rm
773773
test_sharding "(cidv1 root)" "--cid-version=1"
774774

775775
test_kill_ipfs_daemon

‎test/sharness/t0260-sharding.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ test_add_large_dir_v1() {
108108
}
109109

110110
# this hash implies the directory is CIDv1 and leaf entries are CIDv1 and raw
111-
SHARDEDV1="zdj7WY8aNcxF49q1ZpFXfchNmbswnUxiVDVjmrHb53xRM8W4C"
111+
SHARDEDV1="bafybeibiemewfzzdyhq2l74wrd6qj2oz42usjlktgnlqv4yfawgouaqn4u"
112112
test_add_large_dir_v1 "$SHARDEDV1"
113113

114114
test_launch_ipfs_daemon

0 commit comments

Comments
 (0)