From 04d4f2ec148f988164f9f7c8adeef35ea4e96cf1 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Fri, 23 Aug 2019 16:50:49 -0700
Subject: [PATCH] test: handle id -> identity rename

"identity" is the official name
---
 test/sharness/t0046-id-hash.sh | 20 ++++++++++----------
 test/sharness/t0290-cid.sh     |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/sharness/t0046-id-hash.sh b/test/sharness/t0046-id-hash.sh
index 9954f917d18a..d4c28f215078 100755
--- a/test/sharness/t0046-id-hash.sh
+++ b/test/sharness/t0046-id-hash.sh
@@ -9,19 +9,19 @@ test_init_ipfs
 ID_HASH0=bafkqaedknncdsodknncdsnzvnbvuioak
 ID_HASH0_CONTENTS=jkD98jkD975hkD8
 
-test_expect_success "can fetch random id hash" '
+test_expect_success "can fetch random identity hash" '
   ipfs cat $ID_HASH0 > expected &&
   echo $ID_HASH0_CONTENTS > actual &&
   test_cmp expected actual
 '
 
-test_expect_success "can pin random id hash" '
+test_expect_success "can pin random identity hash" '
   ipfs pin add $ID_HASH0
 '
 
-test_expect_success "ipfs add succeeds with id hash" '
+test_expect_success "ipfs add succeeds with identity hash" '
   echo "djkd7jdkd7jkHHG" > junk.txt &&
-  HASH=$(ipfs add -q --hash=id junk.txt)
+  HASH=$(ipfs add -q --hash=identity junk.txt)
 '
 
 test_expect_success "content not actually added" '
@@ -48,10 +48,10 @@ test_expect_success "ipfs add --inline works as expected" '
   HASH=$(ipfs add -q --inline afile)
 '
 
-test_expect_success "ipfs add --inline uses id multihash" '
+test_expect_success "ipfs add --inline uses identity multihash" '
   MHTYPE=`cid-fmt %h $HASH`
   echo "mhtype is $MHTYPE"
-  test "$MHTYPE" = id
+  test "$MHTYPE" = identity
 '
 
 test_expect_success "ipfs add --inline --raw-leaves works as expected" '
@@ -82,19 +82,19 @@ test_expect_success "enable filestore" '
   ipfs config --json Experimental.FilestoreEnabled true
 '
 
-test_expect_success "can fetch random id hash (filestore enabled)" '
+test_expect_success "can fetch random identity hash (filestore enabled)" '
   ipfs cat $ID_HASH0 > expected &&
   echo $ID_HASH0_CONTENTS > actual &&
   test_cmp expected actual
 '
 
-test_expect_success "can pin random id hash (filestore enabled)" '
+test_expect_success "can pin random identity hash (filestore enabled)" '
   ipfs pin add $ID_HASH0
 '
 
-test_expect_success "ipfs add succeeds with id hash and --nocopy" '
+test_expect_success "ipfs add succeeds with identity hash and --nocopy" '
   echo "djkd7jdkd7jkHHG" > junk.txt &&
-  HASH=$(ipfs add -q --hash=id --nocopy junk.txt)
+  HASH=$(ipfs add -q --hash=identity --nocopy junk.txt)
 '
 
 test_expect_success "content not actually added (filestore enabled)" '
diff --git a/test/sharness/t0290-cid.sh b/test/sharness/t0290-cid.sh
index a0b6d84f31f8..5cf27f1c1a97 100755
--- a/test/sharness/t0290-cid.sh
+++ b/test/sharness/t0290-cid.sh
@@ -115,7 +115,7 @@ cat <<EOF > codecs_expect
 EOF
 
 cat <<EOF > hashes_expect
-    0  id
+    0  identity
    17  sha1
    18  sha2-256
    19  sha2-512