From 641e5db851ecb0f80a6dcfcbde8504dadd09ff4b Mon Sep 17 00:00:00 2001 From: v2ray Date: Tue, 8 Dec 2015 00:04:02 +0100 Subject: [PATCH] rename RouterConfig to Config --- app/router/config.go | 2 +- shell/point/config.go | 2 +- shell/point/json/json.go | 2 +- shell/point/testing/mocks/config.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/router/config.go b/app/router/config.go index 4a55400e3..1bcebbc1f 100644 --- a/app/router/config.go +++ b/app/router/config.go @@ -1,6 +1,6 @@ package router -type RouterConfig interface { +type Config interface { Strategy() string Settings() interface{} } diff --git a/shell/point/config.go b/shell/point/config.go index 4bba76d24..d731f1ea4 100644 --- a/shell/point/config.go +++ b/shell/point/config.go @@ -38,7 +38,7 @@ type OutboundDetourConfig interface { type PointConfig interface { Port() v2net.Port LogConfig() LogConfig - RouterConfig() router.RouterConfig + RouterConfig() router.Config InboundConfig() ConnectionConfig OutboundConfig() ConnectionConfig InboundDetours() []InboundDetourConfig diff --git a/shell/point/json/json.go b/shell/point/json/json.go index 7177805e3..49b124a23 100644 --- a/shell/point/json/json.go +++ b/shell/point/json/json.go @@ -35,7 +35,7 @@ func (config *Config) LogConfig() point.LogConfig { return config.LogConfigValue } -func (this *Config) RouterConfig() router.RouterConfig { +func (this *Config) RouterConfig() router.Config { if this.RouterConfigValue == nil { return nil } diff --git a/shell/point/testing/mocks/config.go b/shell/point/testing/mocks/config.go index a3771bdc4..4f61c1706 100644 --- a/shell/point/testing/mocks/config.go +++ b/shell/point/testing/mocks/config.go @@ -91,7 +91,7 @@ func (config *Config) LogConfig() point.LogConfig { return config.LogConfigValue } -func (this *Config) RouterConfig() router.RouterConfig { +func (this *Config) RouterConfig() router.Config { if this.RouterConfigValue == nil { return nil }