Change main.go Dirs

SimplyStaking · Apr 9, 2020 · 938b797 · 938b797
1 parent 41d92bc
commit 938b797
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/run_api.sh b/run_api.sh
@@ -1,2 +1,2 @@
-
+cd src
 go run main.go
diff --git a/run_tests.sh b/run_tests.sh
@@ -1 +1,2 @@
-go test ./src/handlers ./src/config ./src/rpc -v
+cd src
+go test ./handlers ./config ./rpc -v
diff --git a/src/config/config.go b/src/config/config.go
@@ -11,9 +11,9 @@ var (
 	confMain       ini.Config
 	confNodes      ini.Config
 	confSentry     ini.Config
-	mainConfigFile = "config/user_config_main.ini"
-	nodesFile      = "config/user_config_nodes.ini"
-	sentryFile     = "config/user_config_sentry.ini"
+	mainConfigFile = "../config/user_config_main.ini"
+	nodesFile      = "../config/user_config_nodes.ini"
+	sentryFile     = "../config/user_config_sentry.ini"
 )
 
 // SetSentryFile sets file location containing sentry data

diff --git a/src/config/config_test.go b/src/config/config_test.go
@@ -24,7 +24,7 @@ func TestMain(m *testing.M) {
 }
 
 func setup() {
-	os.Chdir("../../")
+	os.Chdir("../")
 
 	// Set Logger that will be used by API through all packages
 	lgr.SetLogger(os.Stdout, os.Stdout, os.Stderr)

diff --git a/go.mod → src/go.mod b/go.mod → src/go.mod
@@ -1,4 +1,4 @@
-module github.com/SimplyVC/oasis_api_server
+module github.com/SimplyVC/oasis_api_server/src
 
 go 1.13
 
@@ -45,7 +45,6 @@ require (
 	github.com/tendermint/tendermint v0.32.8
 	github.com/tendermint/tm-db v0.2.0
 	github.com/thepudds/fzgo v0.2.2
-	github.com/therecipe/qt v0.0.0-20200126204426-5074eb6d8c41 // indirect
 	github.com/uber/jaeger-client-go v2.16.0+incompatible
 	github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc
 	github.com/zondax/ledger-oasis-go v0.3.0

diff --git a/go.sum → src/go.sum b/go.sum → src/go.sum
diff --git a/src/handlers/consensus_handler_test.go b/src/handlers/consensus_handler_test.go
@@ -33,7 +33,7 @@ func setup() {
 
 	// Set Logger that will be used by API through all packages
 	// And Load all configuration that need to be used by router
-	os.Chdir("../../")
+	os.Chdir("../")
 	lgr.SetLogger(os.Stdout, os.Stdout, os.Stderr)
 	conf.LoadMainConfiguration()
 	conf.LoadNodesConfiguration()

diff --git a/main.go → src/main.go b/main.go → src/main.go