From 3327cb0b8030528745a15b380f4eef3f02ac1ac3 Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Fri, 4 Dec 2015 15:49:45 +0000 Subject: [PATCH] format code --- shell/point/inbound_detour.go | 2 +- testing/scenarios/dokodemo_test.go | 2 +- testing/scenarios/server_env.go | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/shell/point/inbound_detour.go b/shell/point/inbound_detour.go index e672e07d..27b752f7 100644 --- a/shell/point/inbound_detour.go +++ b/shell/point/inbound_detour.go @@ -56,7 +56,7 @@ func (this *InboundDetourHandler) Start() error { return nil }) if err != nil { - return err + return err } } return nil diff --git a/testing/scenarios/dokodemo_test.go b/testing/scenarios/dokodemo_test.go index 9c3950e8..7d4f6fe1 100644 --- a/testing/scenarios/dokodemo_test.go +++ b/testing/scenarios/dokodemo_test.go @@ -53,4 +53,4 @@ func TestDokodemoTCP(t *testing.T) { assert.StringLiteral("Processed: " + payload).Equals(string(response[:nBytes])) conn.Close() } -} \ No newline at end of file +} diff --git a/testing/scenarios/server_env.go b/testing/scenarios/server_env.go index 2caff550..7333d751 100644 --- a/testing/scenarios/server_env.go +++ b/testing/scenarios/server_env.go @@ -1,8 +1,8 @@ package scenarios import ( - "os" - "path/filepath" + "os" + "path/filepath" _ "github.com/v2ray/v2ray-core/app/router/config/json" _ "github.com/v2ray/v2ray-core/app/router/rules" @@ -25,11 +25,11 @@ import ( ) func TestFile(filename string) string { - return filepath.Join(os.Getenv("GOPATH"), "src", "github.com", "v2ray", "v2ray-core", "testing", "scenarios", "data", filename) + return filepath.Join(os.Getenv("GOPATH"), "src", "github.com", "v2ray", "v2ray-core", "testing", "scenarios", "data", filename) } func InitializeServer(configFile string) error { - config, err := jsonconf.LoadConfig(configFile) + config, err := jsonconf.LoadConfig(configFile) if err != nil { log.Error("Failed to read config file (%s): %v", configFile, err) return err