From f04f9216e732cb959f69cf90460cc10aab532a0d Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Mon, 6 May 2019 10:30:19 -0700 Subject: [PATCH 1/2] default cidv1 to base32 --- cid.go | 2 +- cid_test.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cid.go b/cid.go index 7565edf..6b62d30 100644 --- a/cid.go +++ b/cid.go @@ -368,7 +368,7 @@ func (c Cid) String() string { case 0: return c.Hash().B58String() case 1: - mbstr, err := mbase.Encode(mbase.Base58BTC, c.Bytes()) + mbstr, err := mbase.Encode(mbase.Base32, c.Bytes()) if err != nil { panic("should not error with hardcoded mbase: " + err.Error()) } diff --git a/cid_test.go b/cid_test.go index 808bb3a..a1dae64 100644 --- a/cid_test.go +++ b/cid_test.go @@ -438,13 +438,13 @@ func TestHexDecode(t *testing.T) { t.Fatal(err) } - if c.String() != "zb2rhhFAEMepUBbGyP1k8tGfz7BSciKXP6GHuUeUsJBaK6cqG" { + if c.String() != "bafkreie5qrjvaw64n4tjm6hbnm7fnqvcssfed4whsjqxzslbd3jwhsk3mm" { t.Fatal("hash value failed to round trip decoding from hex") } } func ExampleDecode() { - encoded := "zb2rhhFAEMepUBbGyP1k8tGfz7BSciKXP6GHuUeUsJBaK6cqG" + encoded := "bafkreie5qrjvaw64n4tjm6hbnm7fnqvcssfed4whsjqxzslbd3jwhsk3mm" c, err := Decode(encoded) if err != nil { fmt.Printf("Error: %s", err) @@ -452,11 +452,11 @@ func ExampleDecode() { } fmt.Println(c) - // Output: zb2rhhFAEMepUBbGyP1k8tGfz7BSciKXP6GHuUeUsJBaK6cqG + // Output: bafkreie5qrjvaw64n4tjm6hbnm7fnqvcssfed4whsjqxzslbd3jwhsk3mm } func TestFromJson(t *testing.T) { - cval := "zb2rhhFAEMepUBbGyP1k8tGfz7BSciKXP6GHuUeUsJBaK6cqG" + cval := "bafkreie5qrjvaw64n4tjm6hbnm7fnqvcssfed4whsjqxzslbd3jwhsk3mm" jsoncid := []byte(`{"/":"` + cval + `"}`) var c Cid err := json.Unmarshal(jsoncid, &c) @@ -470,7 +470,7 @@ func TestFromJson(t *testing.T) { } func TestJsonRoundTrip(t *testing.T) { - exp, err := Decode("zb2rhhFAEMepUBbGyP1k8tGfz7BSciKXP6GHuUeUsJBaK6cqG") + exp, err := Decode("bafkreie5qrjvaw64n4tjm6hbnm7fnqvcssfed4whsjqxzslbd3jwhsk3mm") if err != nil { t.Fatal(err) } From b16425b966ec9a50ebe27ad9ba06d07083b62259 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Fri, 10 May 2019 09:41:01 -0700 Subject: [PATCH 2/2] make CID in readme base32 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 866740e..0824d51 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ This will make sure that dependencies are rewritten to known working versions. ```go // Create a cid from a marshaled string -c, err := cid.Decode("zdvgqEMYmNeH5fKciougvQcfzMcNjF3Z1tPouJ8C7pc3pe63k") +c, err := cid.Decode("bafzbeigai3eoy2ccc7ybwjfz5r3rdxqrinwi4rwytly24tdbh6yk7zslrm") if err != nil {...} fmt.Println("Got CID: ", c)