Merge pull request #393 from nkryuchkov/fix/rename-proxy-discovery

Rename proxy discovery to service discovery Former-commit-id: 88437e3
skycoin · Jun 10, 2020 · dd3da8b · dd3da8b
2 parents 04af455 + dc912eb
commit dd3da8b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/pkg/app/appdisc/factory.go b/pkg/app/appdisc/factory.go
@@ -30,7 +30,7 @@ func (f *Factory) setDefaults() {
 		f.UpdateInterval = skyenv.AppDiscUpdateInterval
 	}
 	if f.ProxyDisc == "" {
-		f.ProxyDisc = skyenv.DefaultProxyDiscAddr
+		f.ProxyDisc = skyenv.DefaultServiceDiscAddr
 	}
 }
 

diff --git a/pkg/skyenv/values.go b/pkg/skyenv/values.go
@@ -10,7 +10,7 @@ import (
 const (
 	DefaultTpDiscAddr          = "http://transport.discovery.skywire.skycoin.com"
 	DefaultDmsgDiscAddr        = "http://dmsg.discovery.skywire.skycoin.com"
-	DefaultProxyDiscAddr       = "http://proxy.discovery.skywire.skycoin.com"
+	DefaultServiceDiscAddr     = "http://service.discovery.skycoin.com"
 	DefaultRouteFinderAddr     = "http://routefinder.skywire.skycoin.com"
 	DefaultUptimeTrackerAddr   = "http://uptime-tracker.skywire.skycoin.com"
 	DefaultAddressResolverAddr = "http://address.resolver.skywire.skycoin.com"
@@ -21,10 +21,10 @@ const (
 const (
 	TestTpDiscAddr          = "http://transport.discovery.skywire.cc"
 	TestDmsgDiscAddr        = "http://dmsg.discovery.skywire.cc"
-	TestProxyDiscAddr       = "http://proxy.discovery.skywire.cc"
+	TestServiceDiscAddr     = "http://service.discovery.skywire.cc"
 	TestRouteFinderAddr     = "http://routefinder.skywire.cc"
-	TestUptimeTrackerAddr   = "http://uptime-tracker.skywire.cc"
-	TestAddressResolverAddr = "http://address-resolver.skywire.cc"
+	TestUptimeTrackerAddr   = "http://uptime.tracker.skywire.cc"
+	TestAddressResolverAddr = "http://address.resolver.skywire.cc"
 	TestSetupPK             = "026c5a07de617c5c488195b76e8671bf9e7ee654d0633933e202af9e111ffa358d"
 )
 

diff --git a/pkg/visor/init.go b/pkg/visor/init.go
@@ -229,7 +229,7 @@ func initLauncher(v *Visor) bool {
 		factory.PK = v.conf.PK
 		factory.SK = v.conf.SK
 		factory.UpdateInterval = time.Duration(conf.Discovery.UpdateInterval)
-		factory.ProxyDisc = conf.Discovery.ProxyDisc
+		factory.ProxyDisc = conf.Discovery.ServiceDisc
 	}
 
 	// Prepare proc manager.

diff --git a/pkg/visor/visorconfig/config.go b/pkg/visor/visorconfig/config.go
@@ -100,7 +100,7 @@ func defaultConfigFromCommon(cc *Common) (*V1, error) {
 
 	conf.Launcher.Discovery = &V1AppDisc{
 		UpdateInterval: Duration(skyenv.AppDiscUpdateInterval),
-		ProxyDisc:      skyenv.DefaultProxyDiscAddr,
+		ServiceDisc:    skyenv.DefaultServiceDiscAddr,
 	}
 
 	conf.Launcher.Apps = []launcher.AppConfig{
@@ -149,7 +149,7 @@ func MakeTestConfig(log *logging.MasterLogger, confPath string, sk *cipher.SecKe
 	conf.Routing.RouteFinder = skyenv.TestRouteFinderAddr
 	conf.Routing.SetupNodes = []cipher.PubKey{skyenv.MustPK(skyenv.TestSetupPK)}
 	conf.UptimeTracker.Addr = skyenv.TestUptimeTrackerAddr
-	conf.Launcher.Discovery.ProxyDisc = skyenv.TestProxyDiscAddr
+	conf.Launcher.Discovery.ServiceDisc = skyenv.TestServiceDiscAddr
 	conf.STCPR.AddressResolver = skyenv.TestAddressResolverAddr
 	conf.STCPH.AddressResolver = skyenv.TestAddressResolverAddr
 

diff --git a/pkg/visor/visorconfig/v1.go b/pkg/visor/visorconfig/v1.go
@@ -74,7 +74,7 @@ type V1UptimeTracker struct {
 // V1AppDisc configures Skywire App Discovery Clients.
 type V1AppDisc struct {
 	UpdateInterval Duration `json:"update_interval,omitempty"`
-	ProxyDisc      string   `json:"proxy_discovery_addr"`
+	ServiceDisc    string   `json:"proxy_discovery_addr"` // TODO: change JSON name
 }
 
 // V1Launcher configures the app launcher.