swarm, cmd/swarm: Merge branch 'master' into multiple-ens-endpoints

2018-02-09 12:23:30 +01:00
parent 820cf09c98 1a4e68721a
commit a3a07350dc
487 changed files with 178047 additions and 8088 deletions
--- a/swarm/api/api.go
+++ b/swarm/api/api.go
@ -159,7 +159,7 @@ func (self *Api) Resolve(uri *URI) (storage.Key, error) {

 	// if the URI is immutable, check if the address is a hash
 	isHash := hashMatcher.MatchString(uri.Addr)
-	if uri.Immutable() {
+	if uri.Immutable() || uri.DeprecatedImmutable() {
 		if !isHash {
 			return nil, fmt.Errorf("immutable address not a content hash: %q", uri.Addr)
 		}