chore: bump go-ipld-format v0.4.0 and fix related sharness tests
Jorropo committed
Apr 1, 2022 at 00:41 UTC
e36f28d58190e071b652009b4c2fa1b082f28e68
7 files changed
+14
-13
go.mod
+2
-2
@@ -42,7 +42,7 @@ require (
42
github.com/ipfs/go-ipfs-routing v0.2.1
43
github.com/ipfs/go-ipfs-util v0.0.2
44
github.com/ipfs/go-ipld-cbor v0.0.5
45
- github.com/ipfs/go-ipld-format v0.3.0
45
+ github.com/ipfs/go-ipld-format v0.4.0
46
github.com/ipfs/go-ipld-git v0.1.1
47
github.com/ipfs/go-ipld-legacy v0.1.0
48
github.com/ipfs/go-ipns v0.1.2
@@ -57,7 +57,7 @@ require (
57
github.com/ipfs/go-unixfs v0.3.1
58
github.com/ipfs/go-unixfsnode v1.1.3
59
github.com/ipfs/go-verifcid v0.0.1
60
- github.com/ipfs/interface-go-ipfs-core v0.6.0
60
+ github.com/ipfs/interface-go-ipfs-core v0.6.2
61
github.com/ipfs/tar-utils v0.0.2
62
github.com/ipld/go-car v0.3.2
63
github.com/ipld/go-codec-dagpb v1.3.0
go.sum
+4
-3
@@ -519,8 +519,9 @@ github.com/ipfs/go-ipld-cbor v0.0.5/go.mod h1:BkCduEx3XBCO6t2Sfo5BaHzuok7hbhdMm9
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=
522
github.com/ipfs/go-ipld-format v0.3.0/go.mod h1:co/SdBE8h99968X0hViiw1MNlh6fvxxnHpvVLnH7jSM=
523
+github.com/ipfs/go-ipld-format v0.4.0 h1:yqJSaJftjmjc9jEOFYlpkwOLVKv68OD27jFLlSghBlQ=
524
+github.com/ipfs/go-ipld-format v0.4.0/go.mod h1:co/SdBE8h99968X0hViiw1MNlh6fvxxnHpvVLnH7jSM=
525
github.com/ipfs/go-ipld-git v0.1.1 h1:TWGnZjS0htmEmlMFEkA3ogrNCqWjIxwr16x1OsdhG+Y=
526
github.com/ipfs/go-ipld-git v0.1.1/go.mod h1:+VyMqF5lMcJh4rwEppV0e6g4nCCHXThLYYDpKUkJubI=
527
github.com/ipfs/go-ipld-legacy v0.1.0 h1:wxkkc4k8cnvIGIjPO0waJCe7SHEyFgl+yQdafdjGrpA=
@@ -577,8 +578,8 @@ github.com/ipfs/go-unixfsnode v1.1.3/go.mod h1:ZZxUM5wXBC+G0Co9FjrYTOm+UlhZTjxLf
578
github.com/ipfs/go-verifcid v0.0.1 h1:m2HI7zIuR5TFyQ1b79Da5N9dnnCP1vcu2QqawmWlK2E=
579
github.com/ipfs/go-verifcid v0.0.1/go.mod h1:5Hrva5KBeIog4A+UpqlaIU+DEstipcJYQQZc0g37pY0=
580
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=
581
+github.com/ipfs/interface-go-ipfs-core v0.6.2 h1:nnkq9zhb5O8lPzkZeynEymc83RqkTRqfYH4x5JNUkT4=
582
+github.com/ipfs/interface-go-ipfs-core v0.6.2/go.mod h1:h3NuO3wzv2KuKazt0zDF2/i8AFRqiKHusyh5DUQQdPA=
583
github.com/ipfs/tar-utils v0.0.2 h1:UNgHB4x/PPzbMkmJi+7EqC9LNMPDztOVSnx1HAqSNg4=
584
github.com/ipfs/tar-utils v0.0.2/go.mod h1:4qlnRWgTVljIMhSG2SqRYn66NT+3wrv/kZt9V+eqxDM=
585
github.com/ipld/go-car v0.3.2 h1:V9wt/80FNfbMRWSD98W5br6fyjUAyVgI2lDOTZX16Lg=
test/sharness/t0050-block.sh
+2
-2
@@ -134,9 +134,9 @@ test_expect_success "multi-block 'ipfs block rm <invalid> <valid> <invalid>'" '
134
'
135
136
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 &&
138
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 &&
140
echo "Error: some blocks not removed" >> expect_mixed_rm
141
test_cmp actual_mixed_rm expect_mixed_rm
142
'
test/sharness/t0054-dag-car-import-export.sh
+2
-2
@@ -67,7 +67,7 @@ EOE
67
# Explainer:
68
# naked_root_import_json_expected output is produced by dag import of combined_naked_roots_genesis_and_128.car
69
# 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)
71
cat >naked_root_import_json_expected <<EOE
72
{"Root":{"Cid":{"/":"bafy2bzaceaxm23epjsmh75yvzcecsrbavlmkcxnva66bkdebdcnyw3bjrc74u"},"PinErrorMsg":""}}
73
{"Root":{"Cid":{"/":"bafy2bzaced4ueelaegfs5fqu4tzsh6ywbbpfk3cxppupmxfdhbpbhzawfw5oy"},"PinErrorMsg":""}}
@@ -179,7 +179,7 @@ test_expect_success "basic offline export of 'getting started' dag works" '
179
'
180
181
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
183
test_expect_success "basic offline export of nonexistent cid" '
184
! ipfs dag export QmYwAPJXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX 2> offline_fetch_error_actual >/dev/null
185
'
test/sharness/t0080-repo.sh
+1
-1
@@ -64,7 +64,7 @@ test_expect_success "'ipfs repo gc --silent' succeeds (no output)" '
64
ipfs repo gc --silent >gc_out_empty &&
65
test_cmp /dev/null gc_out_empty &&
66
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
68
'
69
70
test_kill_ipfs_daemon
test/sharness/t0081-repo-pinning.sh
+1
-1
@@ -238,7 +238,7 @@ test_expect_success "some are no longer there" '
238
test_launch_ipfs_daemon_without_network
239
test_expect_success "recursive pin fails without objects" '
240
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 ||
242
test_fsh cat err_expected8
243
'
244
test/sharness/t0085-pins.sh
+2
-2
@@ -115,7 +115,7 @@ test_pins_error_reporting() {
115
116
test_expect_success "'ipfs pin add $PIN_ARGS' on non-existent hash should fail" '
117
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
119
'
120
}
121
@@ -147,7 +147,7 @@ test_pin_dag() {
147
test_expect_success "pin file, should fail" '
148
test_must_fail ipfs pin add --recursive=true $HASH 2> err &&
149
cat err &&
150
- grep -q "not found" err
150
+ grep -q "ipld: could not find" err
151
'
152
}
153