syntactic changes

network/router/options.go

@@ -5,13 +5,6 @@ import (
 	"github.com/micro/go-micro/registry"
 )
 
-var (
-	// DefaultAddress is default router address
-	DefaultAddress = ":9093"
-	// DefaultNetwork is default micro network
-	DefaultNetwork = "go.micro"
-)
-
 // Options are router options
 type Options struct {
 	// Id is router id

network/router/router.go

@@ -5,13 +5,6 @@ import (
 	"time"
 )
 
-var (
-	// DefaultRouter is default network router
-	DefaultRouter = NewRouter()
-	// DefaultName is default router service name
-	DefaultName = "go.micro.router"
-)
-
 // Router is an interface for a routing control plane
 type Router interface {
 	// Init initializes the router with options
@@ -110,6 +103,17 @@ type Advert struct {
 	Events []*Event
 }
 
+var (
+	// DefaultAddress is default router address
+	DefaultAddress = ":9093"
+	// DefaultName is default router service name
+	DefaultName = "go.micro.router"
+	// DefaultNetwork is default micro network
+	DefaultNetwork = "go.micro"
+	// DefaultRouter is default network router
+	DefaultRouter = NewRouter()
+)
+
 // NewRouter creates new Router and returns it
 func NewRouter(opts ...Option) Router {
 	return newRouter(opts...)

network/router/watcher.go

@@ -6,11 +6,6 @@ import (
 	"time"
 )
 
-var (
-	// ErrWatcherStopped is returned when routing table watcher has been stopped
-	ErrWatcherStopped = errors.New("watcher stopped")
-)
-
 // EventType defines routing table event
 type EventType int
 
@@ -118,7 +113,7 @@ func (w *tableWatcher) Stop() {
 	}
 }
 
-// String prints debug information
+var (
-func (w tableWatcher) String() string {
+	// ErrWatcherStopped is returned when routing table watcher has been stopped
-	return "watcher"
+	ErrWatcherStopped = errors.New("watcher stopped")
-}
+)