simplify routing resolution a bit
License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>
Steven Allen committed
May 7, 2018 at 21:34 UTC
56232ba4bcfddea67cab60dcc5c7c36e86531aff
1 file changed
+10
-12
namesys/routing.go
+10
-12
@@ -168,24 +168,22 @@ func (r *routingResolver) resolveOnce(ctx context.Context, name string, options
168
return "", err
169
}
170
171
+ var p path.Path
172
// check for old style record:
172
- valh, err := mh.Cast(entry.GetValue())
173
- if err != nil {
173
+ if valh, err := mh.Cast(entry.GetValue()); err == nil {
174
+ // Its an old style multihash record
175
+ log.Debugf("encountered CIDv0 ipns entry: %s", valh)
176
+ p = path.FromCid(cid.NewCidV0(valh))
177
+ } else {
178
// Not a multihash, probably a new record
175
- p, err := path.ParsePath(string(entry.GetValue()))
179
+ p, err = path.ParsePath(string(entry.GetValue()))
180
if err != nil {
181
return "", err
182
}
179
-
180
- r.cacheSet(name, p, entry)
181
- return p, nil
182
- } else {
183
- // Its an old style multihash record
184
- log.Debugf("encountered CIDv0 ipns entry: %s", valh)
185
- p := path.FromCid(cid.NewCidV0(valh))
186
- r.cacheSet(name, p, entry)
187
- return p, nil
183
}
184
+
185
+ r.cacheSet(name, p, entry)
186
+ return p, nil
187
}
188
189
func checkEOL(e *pb.IpnsEntry) (time.Time, bool) {