chore: bump go-ipld-format v0.4.0 and fix related sharness tests

Jorropo · Jorropo · commit e36f28d58190 · 2022-04-02T05:07:51.000+02:00
diff --git a/go.mod b/go.mod
@@ -42,7 +42,7 @@ require (
 	github.com/ipfs/go-ipfs-routing v0.2.1
 	github.com/ipfs/go-ipfs-util v0.0.2
 	github.com/ipfs/go-ipld-cbor v0.0.5
-	github.com/ipfs/go-ipld-format v0.3.0
+	github.com/ipfs/go-ipld-format v0.4.0
 	github.com/ipfs/go-ipld-git v0.1.1
 	github.com/ipfs/go-ipld-legacy v0.1.0
 	github.com/ipfs/go-ipns v0.1.2
@@ -57,7 +57,7 @@ require (
 	github.com/ipfs/go-unixfs v0.3.1
 	github.com/ipfs/go-unixfsnode v1.1.3
 	github.com/ipfs/go-verifcid v0.0.1
-	github.com/ipfs/interface-go-ipfs-core v0.6.0
+	github.com/ipfs/interface-go-ipfs-core v0.6.2
 	github.com/ipfs/tar-utils v0.0.2
 	github.com/ipld/go-car v0.3.2
 	github.com/ipld/go-codec-dagpb v1.3.0
diff --git a/go.sum b/go.sum
@@ -519,8 +519,9 @@ github.com/ipfs/go-ipld-cbor v0.0.5/go.mod h1:BkCduEx3XBCO6t2Sfo5BaHzuok7hbhdMm9
 github.com/ipfs/go-ipld-format v0.0.1/go.mod h1:kyJtbkDALmFHv3QR6et67i35QzO3S0dCDnkOJhcZkms=
 github.com/ipfs/go-ipld-format v0.0.2/go.mod h1:4B6+FM2u9OJ9zCV+kSbgFAZlOrv1Hqbf0INGQgiKf9k=
 github.com/ipfs/go-ipld-format v0.2.0/go.mod h1:3l3C1uKoadTPbeNfrDi+xMInYKlx2Cvg1BuydPSdzQs=
-github.com/ipfs/go-ipld-format v0.3.0 h1:Mwm2oRLzIuUwEPewWAWyMuuBQUsn3awfFEYVb8akMOQ=
 github.com/ipfs/go-ipld-format v0.3.0/go.mod h1:co/SdBE8h99968X0hViiw1MNlh6fvxxnHpvVLnH7jSM=
+github.com/ipfs/go-ipld-format v0.4.0 h1:yqJSaJftjmjc9jEOFYlpkwOLVKv68OD27jFLlSghBlQ=
+github.com/ipfs/go-ipld-format v0.4.0/go.mod h1:co/SdBE8h99968X0hViiw1MNlh6fvxxnHpvVLnH7jSM=
 github.com/ipfs/go-ipld-git v0.1.1 h1:TWGnZjS0htmEmlMFEkA3ogrNCqWjIxwr16x1OsdhG+Y=
 github.com/ipfs/go-ipld-git v0.1.1/go.mod h1:+VyMqF5lMcJh4rwEppV0e6g4nCCHXThLYYDpKUkJubI=
 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
 github.com/ipfs/go-verifcid v0.0.1 h1:m2HI7zIuR5TFyQ1b79Da5N9dnnCP1vcu2QqawmWlK2E=
 github.com/ipfs/go-verifcid v0.0.1/go.mod h1:5Hrva5KBeIog4A+UpqlaIU+DEstipcJYQQZc0g37pY0=
 github.com/ipfs/interface-go-ipfs-core v0.4.0/go.mod h1:UJBcU6iNennuI05amq3FQ7g0JHUkibHFAfhfUIy927o=
-github.com/ipfs/interface-go-ipfs-core v0.6.0 h1:a43QNc3CNayuMjZM+4D9SeyiSF2nKxBaG8qbCAelMNs=
-github.com/ipfs/interface-go-ipfs-core v0.6.0/go.mod h1:h3NuO3wzv2KuKazt0zDF2/i8AFRqiKHusyh5DUQQdPA=
+github.com/ipfs/interface-go-ipfs-core v0.6.2 h1:nnkq9zhb5O8lPzkZeynEymc83RqkTRqfYH4x5JNUkT4=
+github.com/ipfs/interface-go-ipfs-core v0.6.2/go.mod h1:h3NuO3wzv2KuKazt0zDF2/i8AFRqiKHusyh5DUQQdPA=
 github.com/ipfs/tar-utils v0.0.2 h1:UNgHB4x/PPzbMkmJi+7EqC9LNMPDztOVSnx1HAqSNg4=
 github.com/ipfs/tar-utils v0.0.2/go.mod h1:4qlnRWgTVljIMhSG2SqRYn66NT+3wrv/kZt9V+eqxDM=
 github.com/ipld/go-car v0.3.2 h1:V9wt/80FNfbMRWSD98W5br6fyjUAyVgI2lDOTZX16Lg=
diff --git a/test/sharness/t0050-block.sh b/test/sharness/t0050-block.sh
@@ -134,9 +134,9 @@ test_expect_success "multi-block 'ipfs block rm <invalid> <valid> <invalid>'" '
 '
 
 test_expect_success "multi-block 'ipfs block rm <invalid> <valid> <invalid>' output looks good" '
-  echo "cannot remove $RANDOMHASH: $RANDOMHASH not found" >> expect_mixed_rm &&
+  echo "cannot remove $RANDOMHASH: ipld: could not find $RANDOMHASH" >> expect_mixed_rm &&
   echo "removed $TESTHASH" >> expect_mixed_rm &&
-  echo "cannot remove $RANDOMHASH: $RANDOMHASH not found" >> expect_mixed_rm &&
+  echo "cannot remove $RANDOMHASH: ipld: could not find $RANDOMHASH" >> expect_mixed_rm &&
   echo "Error: some blocks not removed" >> expect_mixed_rm
   test_cmp actual_mixed_rm expect_mixed_rm
 '
diff --git a/test/sharness/t0054-dag-car-import-export.sh b/test/sharness/t0054-dag-car-import-export.sh
@@ -67,7 +67,7 @@ EOE
   # Explainer:
   # naked_root_import_json_expected output is produced by dag import of combined_naked_roots_genesis_and_128.car
   # executed when roots are already present in the repo - thus the BlockCount=0
-  # (if blocks were not present in the repo, blockstore: block not found would be returned)
+  # (if blocks were not present in the repo, ipld: could not find <CID> would be returned)
   cat >naked_root_import_json_expected <<EOE
 {"Root":{"Cid":{"/":"bafy2bzaceaxm23epjsmh75yvzcecsrbavlmkcxnva66bkdebdcnyw3bjrc74u"},"PinErrorMsg":""}}
 {"Root":{"Cid":{"/":"bafy2bzaced4ueelaegfs5fqu4tzsh6ywbbpfk3cxppupmxfdhbpbhzawfw5oy"},"PinErrorMsg":""}}
@@ -179,7 +179,7 @@ test_expect_success "basic offline export of 'getting started' dag works" '
 '
 
 
-echo "Error: block was not found locally (offline): QmYwAPJXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX not found (currently offline, perhaps retry after attaching to the network)" > offline_fetch_error_expected
+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
 test_expect_success "basic offline export of nonexistent cid" '
   ! ipfs dag export QmYwAPJXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX 2> offline_fetch_error_actual >/dev/null
 '
diff --git a/test/sharness/t0080-repo.sh b/test/sharness/t0080-repo.sh
@@ -64,7 +64,7 @@ test_expect_success "'ipfs repo gc --silent' succeeds (no output)" '
   ipfs repo gc --silent >gc_out_empty &&
   test_cmp /dev/null gc_out_empty &&
   test_must_fail ipfs cat "$HASH2" 2>err_expected1 &&
-  grep "Error: $HASH2 not found" err_expected1
+  grep "Error: ipld: could not find $HASH2" err_expected1
 '
 
 test_kill_ipfs_daemon
diff --git a/test/sharness/t0081-repo-pinning.sh b/test/sharness/t0081-repo-pinning.sh
@@ -238,7 +238,7 @@ test_expect_success "some are no longer there" '
 test_launch_ipfs_daemon_without_network
 test_expect_success "recursive pin fails without objects" '
   test_must_fail ipfs pin add -r "$HASH_DIR1" 2>err_expected8 &&
-  grep "not found" err_expected8 ||
+  grep "ipld: could not find" err_expected8 ||
   test_fsh cat err_expected8
 '
 
diff --git a/test/sharness/t0085-pins.sh b/test/sharness/t0085-pins.sh
@@ -115,7 +115,7 @@ test_pins_error_reporting() {
 
   test_expect_success "'ipfs pin add $PIN_ARGS' on non-existent hash should fail" '
     test_must_fail ipfs pin add $PIN_ARGS $RANDOM_HASH 2> err &&
-    grep -q "not found" err
+    grep -q "ipld: could not find" err
   '
 }
 
@@ -147,7 +147,7 @@ test_pin_dag() {
   test_expect_success "pin file, should fail" '
     test_must_fail ipfs pin add --recursive=true $HASH 2> err &&
     cat err &&
-    grep -q "not found" err
+    grep -q "ipld: could not find" err
   '
 }
 

Original file line number	Diff line number	Diff line change
`@@ -134,9 +134,9 @@ test_expect_success "multi-block 'ipfs block rm <invalid> <valid> <invalid>'" '`
`134`	`134`	`'`
`135`	`135`
`136`	`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`	`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`	`140`	`echo "Error: some blocks not removed" >> expect_mixed_rm`
`141`	`141`	`test_cmp actual_mixed_rm expect_mixed_rm`
`142`	`142`	`'`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ test_expect_success "'ipfs repo gc --silent' succeeds (no output)" '`
`64`	`64`	`ipfs repo gc --silent >gc_out_empty &&`
`65`	`65`	`test_cmp /dev/null gc_out_empty &&`
`66`	`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`	`68`	`'`
`69`	`69`
`70`	`70`	`test_kill_ipfs_daemon`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ test_expect_success "some are no longer there" '`
`238`	`238`	`test_launch_ipfs_daemon_without_network`
`239`	`239`	`test_expect_success "recursive pin fails without objects" '`
`240`	`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`	`242`	`test_fsh cat err_expected8`
`243`	`243`	`'`
`244`	`244`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ test_pins_error_reporting() {`
`115`	`115`
`116`	`116`	`test_expect_success "'ipfs pin add $PIN_ARGS' on non-existent hash should fail" '`
`117`	`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`	`119`	`'`
`120`	`120`	`}`
`121`	`121`
`@@ -147,7 +147,7 @@ test_pin_dag() {`
`147`	`147`	`test_expect_success "pin file, should fail" '`
`148`	`148`	`test_must_fail ipfs pin add --recursive=true $HASH 2> err &&`
`149`	`149`	`cat err &&`
`150`		`- grep -q "not found" err`
	`150`	`+ grep -q "ipld: could not find" err`
`151`	`151`	`'`
`152`	`152`	`}`
`153`	`153`