forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-23 05:06:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

api: get rid of errResolve

Browse source
This commit is contained in:
zelig 2015-05-31 15:34:21 +01:00
parent 456cb39cf0
commit b2942dbc7c
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bzz/api.go
View file

@ -260,9 +260,7 @@ func (self *Api) Register(sender common.Address, hash common.Hash, domain string
return return
} }
type errResolve error func (self *Api) Resolve(hostport string) (contentHash Key, err error) {
func (self *Api) Resolve(hostport string) (contentHash Key, errR errResolve) {
var host, port string var host, port string
var err error var err error
host, port, err = net.SplitHostPort(hostport) host, port, err = net.SplitHostPort(hostport)
@ -270,7 +268,7 @@ func (self *Api) Resolve(hostport string) (contentHash Key, errR errResolve) {
if err.Error() == "missing port in address "+hostport { if err.Error() == "missing port in address "+hostport {
host = hostport host = hostport
} else { } else {
errR = errResolve(fmt.Errorf("invalid host '%s': %v", hostport, err)) err = fmt.Errorf("invalid host '%s': %v", hostport, err)
return return
} }
} }
@ -285,12 +283,12 @@ func (self *Api) Resolve(hostport string) (contentHash Key, errR errResolve) {
var hash common.Hash var hash common.Hash
hash, err = self.Resolver.KeyToContentHash(hostHash) hash, err = self.Resolver.KeyToContentHash(hostHash)
if err != nil { if err != nil {
err = errResolve(fmt.Errorf("unable to resolve '%s': %v", hostport, err)) err = fmt.Errorf("unable to resolve '%s': %v", hostport, err)
} }
contentHash = Key(hash.Bytes()) contentHash = Key(hash.Bytes())
dpaLogger.Debugf("Swarm: resolve host to contentHash: '%064x'", contentHash) dpaLogger.Debugf("Swarm: resolve host to contentHash: '%064x'", contentHash)
} else { } else {
err = errResolve(fmt.Errorf("no resolver '%s': %v", hostport, err)) err = fmt.Errorf("no resolver '%s': %v", hostport, err)
} }
} }
return return