switch to base32 by default for CIDv1
fixes #6220 License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>
Steven Allen committed
May 6, 2019 at 10:34 UTC
9886fc06fc1310c3f10a1cf3e218b5870b2a0c0b
20 files changed
+96
-94
docs/gateway.md
+1
-1
@@ -55,5 +55,5 @@ a read-only, "safe" subset of the normal API.
55
For example, you use this to download a block:
56
57
```
58
-> curl https://ipfs.io/api/v0/block/get/zb2rhi36Gc9GJWijLEL6zW45MBux5FcFv5gJmjXA7VAMozEXY
58
+> curl https://ipfs.io/api/v0/block/get/bafkreifjjcie6lypi6ny7amxnfftagclbuxndqonfipmb64f2km2devei4
59
```
go.mod
+3
-3
@@ -19,8 +19,8 @@ require (
19
github.com/ipfs/go-bitswap v0.0.4
20
github.com/ipfs/go-block-format v0.0.2
21
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
24
github.com/ipfs/go-datastore v0.0.5
25
github.com/ipfs/go-detect-race v0.0.1
26
github.com/ipfs/go-ds-badger v0.0.3
@@ -54,7 +54,7 @@ require (
54
github.com/ipfs/go-unixfs v0.0.5
55
github.com/ipfs/go-verifcid v0.0.1
56
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
58
github.com/ipfs/iptb v1.4.0
59
github.com/ipfs/iptb-plugins v0.0.2
60
github.com/jbenet/go-is-domain v1.0.2
go.sum
+6
-4
@@ -145,8 +145,10 @@ github.com/ipfs/go-blockservice v0.0.3 h1:40OvwrxeudTAlUGUAKNYnNPcwQeLtXedjzTWec
145
github.com/ipfs/go-blockservice v0.0.3/go.mod h1:/NNihwTi6V2Yr6g8wBI+BSwPuURpBRMtYNGrlxZ8KuI=
146
github.com/ipfs/go-cid v0.0.1 h1:GBjWPktLnNyX0JiQCNFpUuUSoMw5KMyqrsejHYlILBE=
147
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=
152
github.com/ipfs/go-datastore v0.0.1 h1:AW/KZCScnBWlSb5JbnEnLKFWXL224LBEh/9KXXOrUms=
153
github.com/ipfs/go-datastore v0.0.1/go.mod h1:d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE=
154
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
239
github.com/ipfs/go-verifcid v0.0.1/go.mod h1:5Hrva5KBeIog4A+UpqlaIU+DEstipcJYQQZc0g37pY0=
240
github.com/ipfs/hang-fds v0.0.1 h1:KGAxiGtJPT3THVRNT6yxgpdFPeX4ZemUjENOt6NlOn4=
241
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=
244
github.com/ipfs/iptb v1.4.0 h1:YFYTrCkLMRwk/35IMyC6+yjoQSHTEcNcefBStLJzgvo=
245
github.com/ipfs/iptb v1.4.0/go.mod h1:1rzHpCYtNp87/+hTxG5TfCVn/yMY3dKnLn8tBiMfdmg=
246
github.com/ipfs/iptb-plugins v0.0.2 h1:JZp4h/+7f00dY4Epr8gzF+VqKITXmVGsZabvmZp7E9I=
test/sharness/t0040-add-and-cat.sh
+18
-18
@@ -422,7 +422,7 @@ test_add_cat_raw() {
422
'
423
424
test_expect_success "zero length file has correct hash" '
425
- test "$ZEROHASH" = zb2rhmy65F3REf8SZp7De11gxtECBGgUKaLdiDj7MCGCHxbDW
425
+ test "$ZEROHASH" = bafkreihdwdcefgh4dqkjv67uzcmw7ojee6xedzdetojuzjevtenxquvyku
426
'
427
428
test_expect_success "cat zero length file" '
@@ -715,23 +715,23 @@ VENUS="QmU5kp3BH3B8tnWUU2Pikdb2maksBNkb92FHRr56hyghh4"
715
add_directory
716
717
PLANETS="QmfWfQfKCY5Ukv9peBbxM5vqWM9BzmqUSXvdCgjT2wsiBT"
718
-MARS="zb2rhZdTkQNawVajsTNiYc9cTPHqgLdJVvBRkZok9RjkgQYRU"
719
-VENUS="zb2rhn6TGvnUaMAg4VV4y9HVx5W42HihcH4jsyrDv8mkepFqq"
718
+MARS="bafkreibmlvvgdyihetgocpof6xk64kjjzdeq2e4c7hqs3krdheosk4tgj4"
719
+VENUS="bafkreihfsphazrk2ilejpekyltjeh5k4yvwgjuwg26ueafohqioeo3sdca"
720
add_directory '--raw-leaves'
721
722
-PLANETS="zdj7Wnbun6P41Z5ddTkNvZaDTmQ8ZLdiKFcJrL9sV87rPScMP"
723
-MARS="zb2rhZdTkQNawVajsTNiYc9cTPHqgLdJVvBRkZok9RjkgQYRU"
724
-VENUS="zb2rhn6TGvnUaMAg4VV4y9HVx5W42HihcH4jsyrDv8mkepFqq"
722
+PLANETS="bafybeih7e5dmkyk25up5vxug4q3hrg2fxbzf23dfrac2fns5h7z4aa7ioi"
723
+MARS="bafkreibmlvvgdyihetgocpof6xk64kjjzdeq2e4c7hqs3krdheosk4tgj4"
724
+VENUS="bafkreihfsphazrk2ilejpekyltjeh5k4yvwgjuwg26ueafohqioeo3sdca"
725
add_directory '--cid-version=1'
726
727
-PLANETS="zdj7WiC51v78BjBcmZR7uuBvmDWxSn5EDr5MiyTwE18e8qvb7"
728
-MARS="zdj7WWx6fGNrNGkdpkuTAxCjKbQ1pPtarqA6VQhedhLTZu34J"
729
-VENUS="zdj7WbB1BUF8WejmVpQCmMLd1RbPnxJtvAj1Lep6eTmXRFbrz"
727
+PLANETS="bafybeif5tuep5ap2d7zyhbktucey75aoacxufgt6i3v4gebmixyipnyp7y"
728
+MARS="bafybeiawta2ntdmsy24aro35w3homzl4ak7svr3si7l7gesvq4erglyye4"
729
+VENUS="bafybeicvkvhs2fr75ynebtdjqpgm4g2fc63abqbmysupwpmcjl4gx7mzrm"
730
add_directory '--cid-version=1 --raw-leaves=false'
731
732
-PLANETS="zDMZof1kqxDAx9myQbXsyWwyWP9qRPsXsWH7XuTz6isT7Rh1S6nM"
733
-MARS="zCT5htkdz1ZBHYVQXFQn51ngPXLVqaHSWoae87V1d6e9qWpSAjXw"
734
-VENUS="zCT5htke5JcdoMM4WhmUKXWf2QC3TnQToqGZHH1WsZERv6kPhFPg"
732
+PLANETS="bafykbzaceaptbcs7ik5mdfpot3b4ackvxlwh7loc5jcrtkayf64ukl7zyk46e"
733
+MARS="bafk2bzaceaqcxw46uzkyd2jmczoogof6pnkqt4dpiv3pwkunsv4g5rkkmecie"
734
+VENUS="bafk2bzacebxnke2fb5mgzxyjuuavvcfht4fd3gvn4klkujz6k72wboynhuvfw"
735
add_directory '--hash=blake2b-256'
736
737
test_expect_success "'ipfs add -rn' succeeds" '
@@ -769,32 +769,32 @@ test_add_cat_5MB --raw-leaves "QmbdLHCmdi48eM8T7D67oXjA1S2Puo8eMfngdHhdPukFd6"
769
770
# note: the specified hash implies that internal nodes are stored
771
# 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"
773
774
# note: the specified hash implies that internal nodes are stored
775
# using CidV1 and leaves are stored using CidV1 but using the legacy
776
# 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"
778
779
# note: --hash=blake2b-256 implies --cid-version=1 which implies --raw-leaves=true
780
# the specified hash represents the leaf nodes stored as raw leaves and
781
# 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"
783
784
# the specified hash represents the leaf nodes stored as protoful nodes and
785
# 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"
787
788
test_add_cat_expensive "" "QmU9SWAPPmNEKZB8umYMmjYvN7VyHqABNvdA6GUi4MMEz3"
789
790
# note: the specified hash implies that internal nodes are stored
791
# 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"
793
794
# note: --hash=blake2b-256 implies --cid-version=1 which implies --raw-leaves=true
795
# the specified hash represents the leaf nodes stored as raw leaves and
796
# 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"
798
799
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:"
800
test/sharness/t0043-add-w.sh
+7
-7
@@ -27,13 +27,13 @@ added QmYC3u5jGWuyFwvTxtvLYm2K3SpWZ31tg3NjpVVvh9cJaJ _jo7/wzvsihy
27
added QmQkib3f9XNX5sj6WEahLUPFpheTcwSRJwUCSvjcv8b9by _jo7
28
added QmNQoesMj1qp8ApE51NbtTjFYksyzkezPD4cat7V2kzbKN '
29
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 '
37
38
add_w_d2='added Qme987pqNBhZZXy4ckeXiR7zaRQwBabB7fTgHurW2yJfNu 4r93
39
added QmU9Jqks8TPu4vFr6t7EKkAKQrSJuEujNj1AkzoCeTEDFJ gnz66h/1k0xpx34
test/sharness/t0044-add-symlink.sh
+1
-1
@@ -34,7 +34,7 @@ test_add_symlinks() {
34
35
test_expect_success "output looks good" '
36
# note this hash implies all internal nodes are stored using CidV1
37
- echo zdj7WZDQ2xMmr4qn6aRZTsE9fCUs2KmvPigpHdpssqUobwcWK > filehash_exp &&
37
+ echo bafybeibyhlx64cklod6isy3h7tsmr4qvam3ae3b74n3hfes5bythjrwyua > filehash_exp &&
38
test_cmp filehash_exp filehash_out
39
'
40
test/sharness/t0045-ls.sh
+1
-1
@@ -227,7 +227,7 @@ test_ls_cmd_raw_leaves() {
227
echo bar > somedir/foo &&
228
ipfs add --raw-leaves -r somedir/ > /dev/null &&
229
ipfs ls '$1' QmThNTdtKaVoCVrYmM5EBS6U3S5vfKFue2TxbxxAxRcKKE > ls-actual
230
- echo "zb2rhf6GzX4ckKZtjy8yy8iyq1KttCrRyqDedD6xubhY3sw2F 4 foo" > ls-expect
230
+ echo "bafkreid5qzpjlgzem2iyzgddv7fjilipxcoxzgwazgn27q3usucn5wlxga 4 foo" > ls-expect
231
test_cmp ls-actual ls-expect
232
'
233
}
test/sharness/t0046-id-hash.sh
+1
-1
@@ -6,7 +6,7 @@ test_description="Test basic operations with identity hash"
6
7
test_init_ipfs
8
9
-ID_HASH0=z25RnHTQ7DveGAsV6YDSDR8EkWvD
9
+ID_HASH0=bafkqaedknncdsodknncdsnzvnbvuioak
10
ID_HASH0_CONTENTS=jkD98jkD975hkD8
11
12
test_expect_success "can fetch random id hash" '
test/sharness/t0050-block.sh
+2
-2
@@ -203,7 +203,7 @@ test_expect_success "can set multihash type and length on block put" '
203
'
204
205
test_expect_success "output looks good" '
206
- test "z83bYcqyBkbx5fuNAcvbdv4pr5RYQiEpK" = "$HASH"
206
+ test "bafkrifctrq4xazzixy2v4ezymjcvzpskqdwlxra" = "$HASH"
207
'
208
209
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
228
'
229
230
test_expect_success "output looks good" '
231
- test "z8bwYCvQPhyDY7VUTsUdGdE8Evm1ktSPV" = "$HASH"
231
+ test "bafybifctrq4xazzixy2v4ezymjcvzpskqdwlxra" = "$HASH"
232
'
233
234
test_expect_success "put with sha3 and cidv0 fails" '
test/sharness/t0051-object.sh
+1
-1
@@ -400,7 +400,7 @@ test_object_cmd() {
400
'
401
402
HASHv0=QmXg9Pp2ytZ14xgmQjYEiHjVjMFXzCVVEcRTWJBmLgR39V
403
- HASHv1=z4CrgyEyhm4tAw1pgzQtNNuP7
403
+ HASHv1=bafkqadsimvwgy3zajb2w2yloeefau
404
405
test_expect_success "ipfs object get with --cid-base=base32 uses base32 for CidV1 link only" '
406
ipfs object get --cid-base=base32 $MIXED > mixed.actual &&
test/sharness/t0052-object-diff.sh
+5
-5
@@ -89,7 +89,7 @@ test_expect_success "diff (raw-leaves) added link works" '
89
'
90
91
test_expect_success "diff (raw-leaves) added link looks right" '
92
- echo + zb2rhmWNFDCdMjJoCZPE5b5NuU38yoRzRmEtfzb4exxk3R8g4 \"cat\" > diff_raw_exp &&
92
+ echo + bafkreig43bpnc6sjo6izaiqzzq5esapazosa3f3wt6jsflwiu3x7ydhq2u \"cat\" > diff_raw_exp &&
93
test_cmp diff_raw_exp diff_raw_out
94
'
95
@@ -107,7 +107,7 @@ test_expect_success "verbose diff (raw-leaves) added link works" '
107
'
108
109
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 &&
111
test_cmp diff_raw_exp diff_raw_out
112
'
113
@@ -125,7 +125,7 @@ test_expect_success "diff (raw-leaves) removed link works" '
125
'
126
127
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 &&
129
test_cmp diff_raw_exp diff_raw_out
130
'
131
@@ -143,7 +143,7 @@ test_expect_success "diff (raw-leaves) nested add works" '
143
'
144
145
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 &&
147
test_cmp diff_raw_exp diff_raw_out
148
'
149
@@ -161,7 +161,7 @@ test_expect_success "diff (raw-leaves) changed link works" '
161
'
162
163
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 &&
165
test_cmp diff_raw_exp diff_raw_out
166
'
167
test/sharness/t0053-dag.sh
+6
-6
@@ -48,7 +48,7 @@ test_dag_cmd() {
48
'
49
50
test_expect_success "output looks correct" '
51
- EXPHASH="zdpuAsXfkHapxohc8LtsCzYiAsy84ESqKRD8eWuY64tt9r2CE"
51
+ EXPHASH="bafyreidjtjfmavdk7epvztob2m5vlm3pxp3gjmpyewro4qlbw5n4f4iz64"
52
test $EXPHASH = $IPLDHASH
53
'
54
@@ -139,13 +139,13 @@ test_dag_cmd() {
139
140
test_expect_success "non-canonical cbor input is normalized" '
141
HASH=$(cat ../t0053-dag-data/non-canon.cbor | ipfs dag put --format=cbor --input-enc=raw) &&
142
- test $HASH = "zdpuAmxF8q6iTUtkB3xtEYzmc5Sw762qwQJftt5iW8NTWLtjC" ||
142
+ test $HASH = "bafyreiawx7ona7oa2ptcoh6vwq4q6bmd7x2ibtkykld327bgb7t73ayrqm" ||
143
test_fsh echo $HASH
144
'
145
146
test_expect_success "non-canonical cbor input is normalized with input-enc cbor" '
147
HASH=$(cat ../t0053-dag-data/non-canon.cbor | ipfs dag put --format=cbor --input-enc=cbor) &&
148
- test $HASH = "zdpuAmxF8q6iTUtkB3xtEYzmc5Sw762qwQJftt5iW8NTWLtjC" ||
148
+ test $HASH = "bafyreiawx7ona7oa2ptcoh6vwq4q6bmd7x2ibtkykld327bgb7t73ayrqm" ||
149
test_fsh echo $HASH
150
'
151
@@ -163,7 +163,7 @@ test_dag_cmd() {
163
'
164
165
test_expect_success "output looks correct" '
166
- EXPHASH="zBwWX8u9LYZdCWqaryJW8QsBstghHSPy41nfhhFLY9qw1Vu2BWqnMFtk1jL3qCtEdGd7Kqw1HNPZv5z8LxP2eHGGDCdRE"
166
+ EXPHASH="bafyriqgae54zjl3bjebmbat2rjem4ewj6vni6jxohandmvk3bibfgv3sioyeidppsghvulryxats43br3b7afa6jy77x6gqzqaicer6ljicck"
167
test $EXPHASH = $IPLDHASH
168
'
169
@@ -205,8 +205,8 @@ test_dag_cmd() {
205
'
206
207
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 &&
210
211
test_cmp dag_put_exp dag_put_out
212
'
test/sharness/t0087-repo-robust-gc.sh
+4
-4
@@ -18,14 +18,14 @@ test_gc_robust_part1() {
18
19
HASH1FILE=.ipfs/blocks/L3/CIQNIPL4GP62ZMNNSLZ2G33Z3T5VAN3YHCJTGT5FG45XWH5FGZRXL3A.data
20
21
- LEAF1=zb2rhZWKCMcHCfCym41ocwE5BhNQsEVLrwBkLEQaxJzRHHZch
21
+ LEAF1=bafkreibkrcw7hf6nhr6dvwecqxc5rqc7u7pkhkti53byyznqp23dk5fc2y
22
LEAF1FILE=.ipfs/blocks/C2/AFKREIBKRCW7HF6NHR6DVWECQXC5RQC7U7PKHKTI53BYYZNQP23DK5FC2Y.data
23
24
- LEAF2=zb2rhdUpCuyoQPRtvBW8JhAEfPaNd9dBb3QQCMMWYS1V8hjBR
24
+ LEAF2=bafkreidfsuir43gjphndxxqa45gjvnrzbet3crpumyjcblk3rtn7zamq6q
25
LEAF2FILE=.ipfs/blocks/Q6/BAFKREIDFSUIR43GJPHNDXXQA45GJVNRZBET3CRPUMYJCBLK3RTN7ZAMQ6Q
26
27
- LEAF3=zb2rhnwyvreekPqEMAbKqs35KYHxkNi7pXED7L2TfJKveTTva
28
- LEAF4=zb2rhnvAVvfDDnndcfQkwqNgUm94ba3zBSXyJKCfVXwU4FXx2
27
+ LEAF3=bafkreihsipwnaj3mrc5plg24lpy6dw2bpixl2pe5iapzvc6ct2n33uhqjm
28
+ LEAF4=bafkreihrzs3rh4yxel4olv54vxettu5hv6wxy3krh6huzwhjub7kusnen4
29
30
test_expect_success "remove a leaf node from the repo manually" '
31
rm "$LEAF1FILE"
test/sharness/t0250-files-api.sh
+11
-11
@@ -711,34 +711,34 @@ tests_for_files_api() {
711
test_files_api "($EXTRA, raw-leaves)" '' --raw-leaves
712
713
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
717
if [ "$EXTRA" = "offline" ]; then
718
test_files_api "($EXTRA, cidv1)" --cid-version=1
719
fi
720
721
test_expect_success "can update root hash to cidv1" '
722
ipfs files chcid --cid-version=1 / &&
723
- echo zdj7WbTaiJT1fgatdet9Ei9iDB5hdCxkbVyhyh8YTUnXMiwYi > hash_expect &&
723
+ echo bafybeiczsscdsbs7ffqz55asqdf3smv6klcw3gofszvwlyarci47bgf354 > hash_expect &&
724
ipfs files stat --hash / > hash_actual &&
725
test_cmp hash_expect hash_actual
726
'
727
728
- ROOT_HASH=zdj7Whmtnx23bR7c7E1Yn3zWYWjnvT4tpzWYGaBMyqcopDWrx
728
+ ROOT_HASH=bafybeifxnoetaa2jetwmxubv3gqiyaknnujwkkkhdeua63kulm63dcr5wu
729
test_files_api "($EXTRA, cidv1 root)"
730
731
if [ "$EXTRA" = "offline" ]; then
732
test_expect_success "can update root hash to blake2b-256" '
733
ipfs files chcid --hash=blake2b-256 / &&
734
- echo zDMZof1kvswQMT8txrmnb3JGBuna6qXCTry6hSifrkZEd6VmHbBm > hash_expect &&
734
+ echo bafykbzacebugfutjir6qie7apo5shpry32ruwfi762uytd5g3u2gk7tpscndq > hash_expect &&
735
ipfs files stat --hash / > hash_actual &&
736
test_cmp hash_expect hash_actual
737
'
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
742
test_files_api "($EXTRA, blake2b-256 root)"
743
fi
744
@@ -769,7 +769,7 @@ test_launch_ipfs_daemon --offline
769
SHARD_HASH=QmPkwLJTYZRGPJ8Lazr9qPdrLmswPtUjaDbEpmR9jEh1se
770
test_sharding "(cidv0)"
771
772
-SHARD_HASH=zdj7WZXr6vG2Ne7ZLHGEKrGyF3pHBfAViEnmH9CoyvjrFQM8E
772
+SHARD_HASH=bafybeib46tpawg2d2hhlmmn2jvgio33wqkhlehxrem7wbfvqqikure37rm
773
test_sharding "(cidv1 root)" "--cid-version=1"
774
775
test_kill_ipfs_daemon
test/sharness/t0260-sharding.sh
+1
-1
@@ -108,7 +108,7 @@ test_add_large_dir_v1() {
108
}
109
110
# this hash implies the directory is CIDv1 and leaf entries are CIDv1 and raw
111
-SHARDEDV1="zdj7WY8aNcxF49q1ZpFXfchNmbswnUxiVDVjmrHb53xRM8W4C"
111
+SHARDEDV1="bafybeibiemewfzzdyhq2l74wrd6qj2oz42usjlktgnlqv4yfawgouaqn4u"
112
test_add_large_dir_v1 "$SHARDEDV1"
113
114
test_launch_ipfs_daemon
test/sharness/t0271-filestore-utils.sh
+14
-14
@@ -38,27 +38,27 @@ test_init() {
38
EXPHASH="QmRueCuPMYYvdxWz1vWncF7wzCScEx4qasZXo5aVBb1R4V"
39
40
cat <<EOF > ls_expect_file_order
41
-zb2rhbcZ3aUXYcrbhhDH1JyrpDcpdw1KFJ5Xs5covjnvMpxDR 1000 somedir/file1 0
42
-zb2rhaPkR7ZF9BzSC2BfqbcGivi9QMdauermW9YB6NvS7FZMo 10000 somedir/file2 0
43
-zb2rhe28UqCDm7TFib7PRyQYEkvuq8iahcXA2AbgaxCLvNhfk 262144 somedir/file3 0
44
-zb2rhebtyTTuHKyTbJPnkDUSruU5Uma4DN8t2EkvYZ6fP36mm 262144 somedir/file3 262144
45
-zb2rhav4wcdvNXtaKDTWHYAqtUHMEpygT1cxqMsfK7QrDuHxH 262144 somedir/file3 524288
46
-zb2rhm9VTrX2mfatggYUk8mHLz78XBxVUTTzLvM2N3d6frdAU 213568 somedir/file3 786432
41
+bafkreicj3ezgtrh3euw2gyub6w3jydhnouqobxt7stbgtns3mv3iwv6bqq 1000 somedir/file1 0
42
+bafkreibxwxisv4cld6x76ybqbvf2uwbkoswjqt4hut46af6rps2twme7ey 10000 somedir/file2 0
43
+bafkreidntk6ciin24oez6yjz4b25fgwecncvi4ua4uhr2tdyenogpzpid4 262144 somedir/file3 0
44
+bafkreidwie26yauqbhpd2nhhhmod55irq3z372mh6gw4ikl2ifo34c5jra 262144 somedir/file3 262144
45
+bafkreib7piyesy3dr22sawmycdftrmpyt3z4tmhxrdig2zt5zdp7qwbuay 262144 somedir/file3 524288
46
+bafkreigxp5k3k6b3i5sldu4r3im74nfxmoptuuubcvq6rg632nfznskglu 213568 somedir/file3 786432
47
EOF
48
49
sort < ls_expect_file_order > ls_expect_key_order
50
51
-FILE1_HASH=zb2rhbcZ3aUXYcrbhhDH1JyrpDcpdw1KFJ5Xs5covjnvMpxDR
52
-FILE2_HASH=zb2rhaPkR7ZF9BzSC2BfqbcGivi9QMdauermW9YB6NvS7FZMo
51
+FILE1_HASH=bafkreicj3ezgtrh3euw2gyub6w3jydhnouqobxt7stbgtns3mv3iwv6bqq
52
+FILE2_HASH=bafkreibxwxisv4cld6x76ybqbvf2uwbkoswjqt4hut46af6rps2twme7ey
53
FILE3_HASH=QmfE4SDQazxTD7u8VTYs9AJqQL8rrJPUAorLeJXKSZrVf9
54
55
cat <<EOF > verify_expect_file_order
56
-ok zb2rhbcZ3aUXYcrbhhDH1JyrpDcpdw1KFJ5Xs5covjnvMpxDR 1000 somedir/file1 0
57
-ok zb2rhaPkR7ZF9BzSC2BfqbcGivi9QMdauermW9YB6NvS7FZMo 10000 somedir/file2 0
58
-ok zb2rhe28UqCDm7TFib7PRyQYEkvuq8iahcXA2AbgaxCLvNhfk 262144 somedir/file3 0
59
-ok zb2rhebtyTTuHKyTbJPnkDUSruU5Uma4DN8t2EkvYZ6fP36mm 262144 somedir/file3 262144
60
-ok zb2rhav4wcdvNXtaKDTWHYAqtUHMEpygT1cxqMsfK7QrDuHxH 262144 somedir/file3 524288
61
-ok zb2rhm9VTrX2mfatggYUk8mHLz78XBxVUTTzLvM2N3d6frdAU 213568 somedir/file3 786432
56
+ok bafkreicj3ezgtrh3euw2gyub6w3jydhnouqobxt7stbgtns3mv3iwv6bqq 1000 somedir/file1 0
57
+ok bafkreibxwxisv4cld6x76ybqbvf2uwbkoswjqt4hut46af6rps2twme7ey 10000 somedir/file2 0
58
+ok bafkreidntk6ciin24oez6yjz4b25fgwecncvi4ua4uhr2tdyenogpzpid4 262144 somedir/file3 0
59
+ok bafkreidwie26yauqbhpd2nhhhmod55irq3z372mh6gw4ikl2ifo34c5jra 262144 somedir/file3 262144
60
+ok bafkreib7piyesy3dr22sawmycdftrmpyt3z4tmhxrdig2zt5zdp7qwbuay 262144 somedir/file3 524288
61
+ok bafkreigxp5k3k6b3i5sldu4r3im74nfxmoptuuubcvq6rg632nfznskglu 213568 somedir/file3 786432
62
EOF
63
64
sort < verify_expect_file_order > verify_expect_key_order
test/sharness/t0272-urlstore.sh
+8
-8
@@ -69,9 +69,9 @@ test_urlstore() {
69
'
70
71
cat <<EOF | sort > ls_expect
72
-zb2rhX1q5oFFzEkPNsTe1Y8osUdFqSQGjUWRZsqC9fbY6WVSk 262144 http://127.0.0.1:$GWAY_PORT/ipfs/QmUow2T4P69nEsqTQDZCt8yg9CPS8GFmpuDAr5YtsPhTdM 0
73
-zb2rhYbKFn1UWGHXaAitcdVTkDGTykX8RFpGWzRFuLpoe9VE4 237856 http://127.0.0.1:$GWAY_PORT/ipfs/QmUow2T4P69nEsqTQDZCt8yg9CPS8GFmpuDAr5YtsPhTdM 262144
74
-zb2rhjddJ5DNzBrFu8G6CP1ApY25BukwCeskXHzN1H18CiVVZ 2222 http://127.0.0.1:$GWAY_PORT/ipfs/QmcHm3BL2cXuQ6rJdKQgPrmT9suqGkfy2KzH3MkXPEBXU6 0
72
+bafkreiafqvawjpukk4achpu7edu4d6x5dbzwgigl6nxunjif3ser6bnfpu 262144 http://127.0.0.1:$GWAY_PORT/ipfs/QmUow2T4P69nEsqTQDZCt8yg9CPS8GFmpuDAr5YtsPhTdM 0
73
+bafkreia46t3jwchosehfcq7kponx26shcjkatxek4m2tzzd67i6o3frpou 237856 http://127.0.0.1:$GWAY_PORT/ipfs/QmUow2T4P69nEsqTQDZCt8yg9CPS8GFmpuDAr5YtsPhTdM 262144
74
+bafkreiga7ukbxrxs26fiseijjd7zdd6gmlrmnxhalwfbagxwjv7ck4o34a 2222 http://127.0.0.1:$GWAY_PORT/ipfs/QmcHm3BL2cXuQ6rJdKQgPrmT9suqGkfy2KzH3MkXPEBXU6 0
75
EOF
76
77
test_expect_success "ipfs filestore ls works with urls" '
@@ -80,9 +80,9 @@ EOF
80
'
81
82
cat <<EOF | sort > verify_expect
83
-ok zb2rhX1q5oFFzEkPNsTe1Y8osUdFqSQGjUWRZsqC9fbY6WVSk 262144 http://127.0.0.1:$GWAY_PORT/ipfs/QmUow2T4P69nEsqTQDZCt8yg9CPS8GFmpuDAr5YtsPhTdM 0
84
-ok zb2rhYbKFn1UWGHXaAitcdVTkDGTykX8RFpGWzRFuLpoe9VE4 237856 http://127.0.0.1:$GWAY_PORT/ipfs/QmUow2T4P69nEsqTQDZCt8yg9CPS8GFmpuDAr5YtsPhTdM 262144
85
-ok zb2rhjddJ5DNzBrFu8G6CP1ApY25BukwCeskXHzN1H18CiVVZ 2222 http://127.0.0.1:$GWAY_PORT/ipfs/QmcHm3BL2cXuQ6rJdKQgPrmT9suqGkfy2KzH3MkXPEBXU6 0
83
+ok bafkreiafqvawjpukk4achpu7edu4d6x5dbzwgigl6nxunjif3ser6bnfpu 262144 http://127.0.0.1:$GWAY_PORT/ipfs/QmUow2T4P69nEsqTQDZCt8yg9CPS8GFmpuDAr5YtsPhTdM 0
84
+ok bafkreia46t3jwchosehfcq7kponx26shcjkatxek4m2tzzd67i6o3frpou 237856 http://127.0.0.1:$GWAY_PORT/ipfs/QmUow2T4P69nEsqTQDZCt8yg9CPS8GFmpuDAr5YtsPhTdM 262144
85
+ok bafkreiga7ukbxrxs26fiseijjd7zdd6gmlrmnxhalwfbagxwjv7ck4o34a 2222 http://127.0.0.1:$GWAY_PORT/ipfs/QmcHm3BL2cXuQ6rJdKQgPrmT9suqGkfy2KzH3MkXPEBXU6 0
86
EOF
87
88
test_expect_success "ipfs filestore verify works with urls" '
@@ -116,8 +116,8 @@ EOF
116
'
117
118
cat <<EOF | sort > verify_expect_2
119
-error zb2rhX1q5oFFzEkPNsTe1Y8osUdFqSQGjUWRZsqC9fbY6WVSk 262144 http://127.0.0.1:$GWAY_PORT/ipfs/QmUow2T4P69nEsqTQDZCt8yg9CPS8GFmpuDAr5YtsPhTdM 0
120
-error zb2rhYbKFn1UWGHXaAitcdVTkDGTykX8RFpGWzRFuLpoe9VE4 237856 http://127.0.0.1:$GWAY_PORT/ipfs/QmUow2T4P69nEsqTQDZCt8yg9CPS8GFmpuDAr5YtsPhTdM 262144
119
+error bafkreiafqvawjpukk4achpu7edu4d6x5dbzwgigl6nxunjif3ser6bnfpu 262144 http://127.0.0.1:$GWAY_PORT/ipfs/QmUow2T4P69nEsqTQDZCt8yg9CPS8GFmpuDAr5YtsPhTdM 0
120
+error bafkreia46t3jwchosehfcq7kponx26shcjkatxek4m2tzzd67i6o3frpou 237856 http://127.0.0.1:$GWAY_PORT/ipfs/QmUow2T4P69nEsqTQDZCt8yg9CPS8GFmpuDAr5YtsPhTdM 262144
121
EOF
122
123
test_expect_success "ipfs filestore verify is correct" '
test/sharness/t0275-cid-security.sh
+3
-3
@@ -30,7 +30,7 @@ test_expect_success "error reason is pointed out" '
30
test_cat_get() {
31
32
test_expect_success "ipfs cat fails with unsafe hash function" '
33
- test_must_fail ipfs cat zDvnoLcPKWR 2>ipfs_cat
33
+ test_must_fail ipfs cat bafksebhh7d53e 2>ipfs_cat
34
'
35
36
@@ -40,7 +40,7 @@ test_cat_get() {
40
41
42
test_expect_success "ipfs get fails with too short function" '
43
- test_must_fail ipfs get z2ba5YhCCFNFxLtxMygQwjBjYSD8nUeN 2>ipfs_get
43
+ test_must_fail ipfs get bafkreez3itiri7ghbbf6lzej7paxyxy2qznpw 2>ipfs_get
44
45
'
46
@@ -58,7 +58,7 @@ test_gc() {
58
59
test_expect_success "gc works" 'ipfs repo gc > gc_out'
60
test_expect_success "gc removed bad block" '
61
- grep zDvnoGUyhEq gc_out
61
+ grep bafksebcgpujze gc_out
62
'
63
}
64
test/sharness/t0276-cidv0v1.sh
+2
-2
@@ -30,7 +30,7 @@ test_expect_success "add file using CIDv0" '
30
test_expect_success "check hashes" '
31
test "$(cid-fmt %v-%c $AHASHv0)" = "cidv0-protobuf" &&
32
test "$(cid-fmt %v-%c $AHASHv1)" = "cidv1-protobuf" &&
33
- test "$(cid-fmt -v 0 %s $AHASHv1)" = "$AHASHv0"
33
+ test "$(cid-fmt -b z -v 0 %s $AHASHv1)" = "$AHASHv0"
34
'
35
36
test_expect_success "make sure CIDv1 hash really is in the repo" '
@@ -117,7 +117,7 @@ test_expect_success "add bfile using CIDv1 to node 0" '
117
'
118
119
test_expect_success "get bfile using CIDv0 via node 1" '
120
- BHASHv0=$(cid-fmt -v 0 %s $BHASHv1)
120
+ BHASHv0=$(cid-fmt -b z -v 0 %s $BHASHv1)
121
echo $BHASHv1 &&
122
iptb -quiet run 1 -- ipfs --timeout=2s cat $BHASHv0 > thefile &&
123
test_cmp bfile thefile
test/sharness/t0280-plugin-git.sh
+1
-1
@@ -33,7 +33,7 @@ test_dag_git() {
33
34
test_expect_success "path traversals work" '
35
echo \"YmxvYiA3ACcsLnB5Zgo=\" > file1 &&
36
- ipfs dag get z8mWaJh5RLq16Zwgtd8gZxd63P4hgwNNx/object/parents/0/tree/dir2/hash/f3/hash > out1
36
+ ipfs dag get baf4bcfhzi72pcj5cc4ocz7igcduubuu7aa3cddi/object/parents/0/tree/dir2/hash/f3/hash > out1
37
'
38
39
test_expect_success "outputs look correct" '