Skip to content

Commit 4c76567

Browse files
JorropoJorropo
committed
chore: bump go-ipld-format v0.4.0 and fix related sharness tests
1 parent d6de97b commit 4c76567

7 files changed

+16
-19
lines changed

‎go.mod

+4-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ require (
7979
github.com/libp2p/go-libp2p-peerstore v0.4.0
8080
github.com/libp2p/go-libp2p-pubsub v0.6.0
8181
github.com/libp2p/go-libp2p-pubsub-router v0.5.0
82-
github.com/libp2p/go-libp2p-quic-transport v0.15.0
8382
github.com/libp2p/go-libp2p-record v0.1.3
8483
github.com/libp2p/go-libp2p-routing-helpers v0.2.3
8584
github.com/libp2p/go-libp2p-swarm v0.8.0
@@ -113,3 +112,7 @@ require (
113112
)
114113

115114
go 1.16
115+
116+
replace github.com/ipfs/go-ipld-format => github.com/Jorropo/go-ipld-format v0.3.2-0.20220330014726-942265d1aca7
117+
118+
replace github.com/ipfs/interface-go-ipfs-core => github.com/Jorropo/interface-go-ipfs-core v0.6.2-0.20220331215619-b98f8571cf6b

‎go.sum

+4-10
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 h1:cTp8I5+VIo
4848
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
4949
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
5050
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
51+
github.com/Jorropo/go-ipld-format v0.3.2-0.20220330014726-942265d1aca7 h1:G1yNzr09VZCoOjXsrl6jQk5HF/Ju+eGtYGrimZMu9DY=
52+
github.com/Jorropo/go-ipld-format v0.3.2-0.20220330014726-942265d1aca7/go.mod h1:co/SdBE8h99968X0hViiw1MNlh6fvxxnHpvVLnH7jSM=
53+
github.com/Jorropo/interface-go-ipfs-core v0.6.2-0.20220331215619-b98f8571cf6b h1:uS/dAAwEsTGDj70E3Z01n5U7xje3jtsSAV4wuuH+5xg=
54+
github.com/Jorropo/interface-go-ipfs-core v0.6.2-0.20220331215619-b98f8571cf6b/go.mod h1:h3NuO3wzv2KuKazt0zDF2/i8AFRqiKHusyh5DUQQdPA=
5155
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
5256
github.com/Kubuxu/go-os-helper v0.0.1 h1:EJiD2VUQyh5A9hWJLmc6iWg6yIcJ7jpBcwC8GMGXfDk=
5357
github.com/Kubuxu/go-os-helper v0.0.1/go.mod h1:N8B+I7vPCT80IcP58r50u4+gEEcsZETFUpAzWW2ep1Y=
@@ -513,14 +517,8 @@ github.com/ipfs/go-ipfs-util v0.0.2 h1:59Sswnk1MFaiq+VcaknX7aYEyGyGDAA73ilhEK2PO
513517
github.com/ipfs/go-ipfs-util v0.0.2/go.mod h1:CbPtkWJzjLdEcezDns2XYaehFVNXG9zrdrtMecczcsQ=
514518
github.com/ipfs/go-ipld-cbor v0.0.2/go.mod h1:wTBtrQZA3SoFKMVkp6cn6HMRteIB1VsmHA0AQFOn7Nc=
515519
github.com/ipfs/go-ipld-cbor v0.0.3/go.mod h1:wTBtrQZA3SoFKMVkp6cn6HMRteIB1VsmHA0AQFOn7Nc=
516-
github.com/ipfs/go-ipld-cbor v0.0.4/go.mod h1:BkCduEx3XBCO6t2Sfo5BaHzuok7hbhdMm9Oh8B2Ftq4=
517520
github.com/ipfs/go-ipld-cbor v0.0.5 h1:ovz4CHKogtG2KB/h1zUp5U0c/IzZrL435rCh5+K/5G8=
518521
github.com/ipfs/go-ipld-cbor v0.0.5/go.mod h1:BkCduEx3XBCO6t2Sfo5BaHzuok7hbhdMm9Oh8B2Ftq4=
519-
github.com/ipfs/go-ipld-format v0.0.1/go.mod h1:kyJtbkDALmFHv3QR6et67i35QzO3S0dCDnkOJhcZkms=
520-
github.com/ipfs/go-ipld-format v0.0.2/go.mod h1:4B6+FM2u9OJ9zCV+kSbgFAZlOrv1Hqbf0INGQgiKf9k=
521-
github.com/ipfs/go-ipld-format v0.2.0/go.mod h1:3l3C1uKoadTPbeNfrDi+xMInYKlx2Cvg1BuydPSdzQs=
522-
github.com/ipfs/go-ipld-format v0.3.0 h1:Mwm2oRLzIuUwEPewWAWyMuuBQUsn3awfFEYVb8akMOQ=
523-
github.com/ipfs/go-ipld-format v0.3.0/go.mod h1:co/SdBE8h99968X0hViiw1MNlh6fvxxnHpvVLnH7jSM=
524522
github.com/ipfs/go-ipld-git v0.1.1 h1:TWGnZjS0htmEmlMFEkA3ogrNCqWjIxwr16x1OsdhG+Y=
525523
github.com/ipfs/go-ipld-git v0.1.1/go.mod h1:+VyMqF5lMcJh4rwEppV0e6g4nCCHXThLYYDpKUkJubI=
526524
github.com/ipfs/go-ipld-legacy v0.1.0 h1:wxkkc4k8cnvIGIjPO0waJCe7SHEyFgl+yQdafdjGrpA=
@@ -554,7 +552,6 @@ github.com/ipfs/go-mfs v0.2.1 h1:5jz8+ukAg/z6jTkollzxGzhkl3yxm022Za9f2nL5ab8=
554552
github.com/ipfs/go-mfs v0.2.1/go.mod h1:Woj80iuw4ajDnIP6+seRaoHpPsc9hmL0pk/nDNDWP88=
555553
github.com/ipfs/go-namesys v0.4.0 h1:Gxg4kEWxVcHuUJl60KMNs1k8AiVB3luXbz8ZJkSGacs=
556554
github.com/ipfs/go-namesys v0.4.0/go.mod h1:jpJwzodyP8DZdWN6DShRjVZw6gaqMr4nQLBSxU5cR6E=
557-
github.com/ipfs/go-path v0.0.7/go.mod h1:6KTKmeRnBXgqrTvzFrPV3CamxcgvXX/4z79tfAd2Sno=
558555
github.com/ipfs/go-path v0.0.9/go.mod h1:VpDkSBKQ9EFQOUgi54Tq/O/tGi8n1RfYNks13M3DEs8=
559556
github.com/ipfs/go-path v0.1.1/go.mod h1:vC8q4AKOtrjJz2NnllIrmr2ZbGlF5fW2OKKyhV9ggb0=
560557
github.com/ipfs/go-path v0.2.1/go.mod h1:NOScsVgxfC/eIw4nz6OiGwK42PjaSJ4Y/ZFPn1Xe07I=
@@ -576,9 +573,6 @@ github.com/ipfs/go-unixfsnode v1.1.3 h1:IyqJBGIEvcHvll1wDDVIHOEVXnE+IH6tjzTWpZ6k
576573
github.com/ipfs/go-unixfsnode v1.1.3/go.mod h1:ZZxUM5wXBC+G0Co9FjrYTOm+UlhZTjxLfRYdWY9veZ4=
577574
github.com/ipfs/go-verifcid v0.0.1 h1:m2HI7zIuR5TFyQ1b79Da5N9dnnCP1vcu2QqawmWlK2E=
578575
github.com/ipfs/go-verifcid v0.0.1/go.mod h1:5Hrva5KBeIog4A+UpqlaIU+DEstipcJYQQZc0g37pY0=
579-
github.com/ipfs/interface-go-ipfs-core v0.4.0/go.mod h1:UJBcU6iNennuI05amq3FQ7g0JHUkibHFAfhfUIy927o=
580-
github.com/ipfs/interface-go-ipfs-core v0.6.0 h1:a43QNc3CNayuMjZM+4D9SeyiSF2nKxBaG8qbCAelMNs=
581-
github.com/ipfs/interface-go-ipfs-core v0.6.0/go.mod h1:h3NuO3wzv2KuKazt0zDF2/i8AFRqiKHusyh5DUQQdPA=
582576
github.com/ipfs/tar-utils v0.0.2 h1:UNgHB4x/PPzbMkmJi+7EqC9LNMPDztOVSnx1HAqSNg4=
583577
github.com/ipfs/tar-utils v0.0.2/go.mod h1:4qlnRWgTVljIMhSG2SqRYn66NT+3wrv/kZt9V+eqxDM=
584578
github.com/ipld/go-car v0.3.2 h1:V9wt/80FNfbMRWSD98W5br6fyjUAyVgI2lDOTZX16Lg=

‎test/sharness/t0050-block.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ test_expect_success "multi-block 'ipfs block rm <invalid> <valid> <invalid>'" '
134134
'
135135

136136
test_expect_success "multi-block 'ipfs block rm <invalid> <valid> <invalid>' output looks good" '
137-
echo "cannot remove $RANDOMHASH: $RANDOMHASH not found" >> expect_mixed_rm &&
137+
echo "cannot remove $RANDOMHASH: ipld: could not find $RANDOMHASH" >> expect_mixed_rm &&
138138
echo "removed $TESTHASH" >> expect_mixed_rm &&
139-
echo "cannot remove $RANDOMHASH: $RANDOMHASH not found" >> expect_mixed_rm &&
139+
echo "cannot remove $RANDOMHASH: ipld: could not find $RANDOMHASH" >> expect_mixed_rm &&
140140
echo "Error: some blocks not removed" >> expect_mixed_rm
141141
test_cmp actual_mixed_rm expect_mixed_rm
142142
'

‎test/sharness/t0054-dag-car-import-export.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ EOE
6767
# Explainer:
6868
# naked_root_import_json_expected output is produced by dag import of combined_naked_roots_genesis_and_128.car
6969
# executed when roots are already present in the repo - thus the BlockCount=0
70-
# (if blocks were not present in the repo, blockstore: block not found would be returned)
70+
# (if blocks were not present in the repo, ipld: could not find <CID> would be returned)
7171
cat >naked_root_import_json_expected <<EOE
7272
{"Root":{"Cid":{"/":"bafy2bzaceaxm23epjsmh75yvzcecsrbavlmkcxnva66bkdebdcnyw3bjrc74u"},"PinErrorMsg":""}}
7373
{"Root":{"Cid":{"/":"bafy2bzaced4ueelaegfs5fqu4tzsh6ywbbpfk3cxppupmxfdhbpbhzawfw5oy"},"PinErrorMsg":""}}
@@ -179,7 +179,7 @@ test_expect_success "basic offline export of 'getting started' dag works" '
179179
'
180180

181181

182-
echo "Error: block was not found locally (offline): QmYwAPJXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX not found (currently offline, perhaps retry after attaching to the network)" > offline_fetch_error_expected
182+
echo "Error: block was not found locally (offline): ipld: could not find QmYwAPJXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX (currently offline, perhaps retry after attaching to the network)" > offline_fetch_error_expected
183183
test_expect_success "basic offline export of nonexistent cid" '
184184
! ipfs dag export QmYwAPJXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX 2> offline_fetch_error_actual >/dev/null
185185
'

‎test/sharness/t0080-repo.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ test_expect_success "'ipfs repo gc --silent' succeeds (no output)" '
6464
ipfs repo gc --silent >gc_out_empty &&
6565
test_cmp /dev/null gc_out_empty &&
6666
test_must_fail ipfs cat "$HASH2" 2>err_expected1 &&
67-
grep "Error: $HASH2 not found" err_expected1
67+
grep "Error: ipld: could not find $HASH2" err_expected1
6868
'
6969

7070
test_kill_ipfs_daemon

‎test/sharness/t0081-repo-pinning.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ test_expect_success "some are no longer there" '
238238
test_launch_ipfs_daemon_without_network
239239
test_expect_success "recursive pin fails without objects" '
240240
test_must_fail ipfs pin add -r "$HASH_DIR1" 2>err_expected8 &&
241-
grep "not found" err_expected8 ||
241+
grep "ipld: could not find" err_expected8 ||
242242
test_fsh cat err_expected8
243243
'
244244

‎test/sharness/t0085-pins.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ test_pins_error_reporting() {
115115

116116
test_expect_success "'ipfs pin add $PIN_ARGS' on non-existent hash should fail" '
117117
test_must_fail ipfs pin add $PIN_ARGS $RANDOM_HASH 2> err &&
118-
grep -q "not found" err
118+
grep -q "ipld: could not find" err
119119
'
120120
}
121121

@@ -147,7 +147,7 @@ test_pin_dag() {
147147
test_expect_success "pin file, should fail" '
148148
test_must_fail ipfs pin add --recursive=true $HASH 2> err &&
149149
cat err &&
150-
grep -q "not found" err
150+
grep -q "ipld: could not find" err
151151
'
152152
}
153153

0 commit comments

Comments
 (0)