Unverified 提交 9a21a8cb 作者: Steven Allen 提交者: GitHub

Merge pull request #5409 from ipfs/nit/directly-parse-peer-id

directly parse peer IDs as peer IDs
...@@ -55,16 +55,10 @@ func (r *IpnsResolver) resolveOnce(ctx context.Context, name string, options *op ...@@ -55,16 +55,10 @@ func (r *IpnsResolver) resolveOnce(ctx context.Context, name string, options *op
} }
name = strings.TrimPrefix(name, "/ipns/") name = strings.TrimPrefix(name, "/ipns/")
hash, err := mh.FromB58String(name) pid, err := peer.IDB58Decode(name)
if err != nil { if err != nil {
// name should be a multihash. if it isn't, error out here. // name should be a multihash. if it isn't, error out here.
log.Debugf("RoutingResolver: bad input hash: [%s]\n", name) log.Debugf("RoutingResolver: IPNS address not a valid peer ID: [%s]\n", name)
return "", 0, err
}
pid, err := peer.IDFromBytes(hash)
if err != nil {
log.Debugf("RoutingResolver: could not convert public key hash %s to peer ID: %s\n", name, err)
return "", 0, err return "", 0, err
} }
......
...@@ -13,7 +13,7 @@ test_init_ipfs ...@@ -13,7 +13,7 @@ test_init_ipfs
test_expect_success "can make http request against dns resolved nc server" ' test_expect_success "can make http request against dns resolved nc server" '
nc -ld 5005 > nc_out & nc -ld 5005 > nc_out &
NCPID=$! NCPID=$!
go-sleep 0.5s && kill "$NCPID" & go-sleep 1s && kill "$NCPID" &
ipfs cat /ipfs/Qmabcdef --api /dns4/localhost/tcp/5005 || true ipfs cat /ipfs/Qmabcdef --api /dns4/localhost/tcp/5005 || true
' '
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论