From 56232ba4bcfddea67cab60dcc5c7c36e86531aff Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Mon, 7 May 2018 21:34:36 -0700 Subject: [PATCH] simplify routing resolution a bit License: MIT Signed-off-by: Steven Allen --- namesys/routing.go | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/namesys/routing.go b/namesys/routing.go index 73670145e..4a1668c31 100644 --- a/namesys/routing.go +++ b/namesys/routing.go @@ -168,24 +168,22 @@ func (r *routingResolver) resolveOnce(ctx context.Context, name string, options return "", err } + var p path.Path // check for old style record: - valh, err := mh.Cast(entry.GetValue()) - if err != nil { + if valh, err := mh.Cast(entry.GetValue()); err == nil { + // Its an old style multihash record + log.Debugf("encountered CIDv0 ipns entry: %s", valh) + p = path.FromCid(cid.NewCidV0(valh)) + } else { // Not a multihash, probably a new record - p, err := path.ParsePath(string(entry.GetValue())) + p, err = path.ParsePath(string(entry.GetValue())) if err != nil { return "", err } - - r.cacheSet(name, p, entry) - return p, nil - } else { - // Its an old style multihash record - log.Debugf("encountered CIDv0 ipns entry: %s", valh) - p := path.FromCid(cid.NewCidV0(valh)) - r.cacheSet(name, p, entry) - return p, nil } + + r.cacheSet(name, p, entry) + return p, nil } func checkEOL(e *pb.IpnsEntry) (time.Time, bool) {