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_test.go
+++ b/swarm/api/api_test.go
@ -216,7 +216,7 @@ func TestAPIResolve(t *testing.T) {
 			api := &Api{dns: x.dns}
 			uri := &URI{Addr: x.addr, Scheme: "bzz"}
 			if x.immutable {
-				uri.Scheme = "bzzi"
+				uri.Scheme = "bzz-immutable"
 			}
 			res, err := api.Resolve(uri)
 			if err == nil {