From 0eeb3980a46276e9e2286923f21b6167a9f2c251 Mon Sep 17 00:00:00 2001 From: Kevin Atkinson Date: Fri, 28 Sep 2018 14:06:19 -0400 Subject: [PATCH] Allow CID functions to work with non-default multibase. --- path.go | 11 +++++++---- resolver/resolver_test.go | 1 - 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/path.go b/path.go index 7754ef1..9b38e1f 100644 --- a/path.go +++ b/path.go @@ -36,8 +36,11 @@ func FromString(s string) Path { } // FromCid safely converts a cid.Cid type to a Path type. -func FromCid(c cid.Cid) Path { - return Path("/ipfs/" + c.String()) +func FromCid(f func(cid.Cid) string, c cid.Cid) Path { + if f == nil { + f = (cid.Cid).String + } + return Path("/ipfs/" + f(c)) } // Segments returns the different elements of a path @@ -134,12 +137,12 @@ func ParseCidToPath(txt string) (Path, error) { return "", ErrNoComponents } - c, err := cid.Decode(txt) + _, err := cid.Decode(txt) if err != nil { return "", err } - return FromCid(c), nil + return Path("/ipfs/" + txt), nil } // IsValid checks if a path is a valid ipfs Path. diff --git a/resolver/resolver_test.go b/resolver/resolver_test.go index cec160f..480ccdf 100644 --- a/resolver/resolver_test.go +++ b/resolver/resolver_test.go @@ -95,7 +95,6 @@ func TestRecurivePathResolution(t *testing.T) { t.Fatal(err) } - if len(rest) != 0 { t.Error("expected rest to be empty") }