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

swarm/api: rebased and fixed merge conflicts

Browse source
This commit is contained in:
Fabio Barone 2017-04-12 20:30:36 -05:00
parent 4ec6216dfb
commit d7c5047164
1 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
swarm/api/api.go
View file

@ -99,23 +99,7 @@ func (self *Api) Resolve(uri *URI) (storage.Key, error) {
return storage.Key(common.Hex2Bytes(uri.Addr)), nil return storage.Key(common.Hex2Bytes(uri.Addr)), nil
} }
if err != nil { if err != nil {
<<<<<<< HEAD
return nil, fmt.Errorf("'%s' does not resolve: %v but is not a content hash", uri.Addr, err) return nil, fmt.Errorf("'%s' does not resolve: %v but is not a content hash", uri.Addr, err)
=======
return nil, fmt.Errorf("'%s' does not resolve: %v but is not a content hash", hostPort, err)
}
return nil, fmt.Errorf("'%s' is not a content hash", hostPort)
}
func Parse(uri string) (hostPort, path string) {
if uri == "" {
return
}
parts := slashes.Split(uri, 3)
var i int
if len(parts) == 0 {
return
>>>>>>> swarm/api: Println had %s but no substitution
} }
return nil, fmt.Errorf("'%s' is not a content hash", uri.Addr) return nil, fmt.Errorf("'%s' is not a content hash", uri.Addr)
} }