Skip to content

Commit

Permalink
removes unused function :: fixes formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
zanuka committed Jun 19, 2018
1 parent b754cf1 commit 5d06de1
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 31 deletions.
19 changes: 4 additions & 15 deletions app/conf/appconfig.go
Expand Up @@ -16,28 +16,18 @@ type CoinData struct {
CurrencyCode string `json:"currencyCode"`
LibPath string `json:"libPath"`
DataDir string `json:"dataDir"`
DaemonHeartbeat int `json:"daemonHeartbeat"`
DaemonHeartbeat int `json:"daemonHeartbeat"`
DaemonVersion string `json:"daemonVersion"`
WindowsDaemonName string `json:"windowsDaemonName"`
DarwinDaemonName string `json:"darwinDaemonName"`
LatestReleaseAPI string `json:"latestReleaseApi"`
ReleaseAPI string `json:"ReleaseApi"`
LivePort int `json:"livePort"`
TestNetPort int `json:"testnetPort"`
LivePort int `json:"livePort"`
TestNetPort int `json:"testnetPort"`
UseTestNet bool `json:"useTestNet"`
IndexTransactions bool `json:"indexTransactions"`
IndexTransactions bool `json:"indexTransactions"`
}

// StartConfigManager sets up the ticker loop to load app config
//func StartConfigManager() {
// ticker := time.NewTicker(time.Millisecond * 500)
// go func() {
// for range ticker.C {
// LoadAppConfig()
// }
// }()
//}

// LoadAppConfig sets up viper, reads and parses app config
func LoadAppConfig() error {

Expand All @@ -63,4 +53,3 @@ func LoadAppConfig() error {

return nil
}

1 change: 0 additions & 1 deletion app/conf/serverconfig.go
Expand Up @@ -32,4 +32,3 @@ func LoadServerConfig() error {
return nil

}

4 changes: 1 addition & 3 deletions app/daemon/daemon.go
Expand Up @@ -15,8 +15,8 @@ import (
"fmt"

"github.com/Encrypt-S/kauri-api/app/conf"
"github.com/Encrypt-S/kauri-api/app/fs"
"github.com/Encrypt-S/kauri-api/app/daemon/daemonrpc"
"github.com/Encrypt-S/kauri-api/app/fs"
)

type OSInfo struct {
Expand Down Expand Up @@ -234,8 +234,6 @@ func startCoinDaemons(coinData conf.CoinData, daemonPath string) *exec.Cmd {

cmdStr := []string{rpcUser, rpcPassword}



if coinData.UseTestNet {
cmdStr = append(cmdStr, "-testnet")
}
Expand Down
10 changes: 5 additions & 5 deletions app/daemon/daemonapi/getrawtransactions_test.go
Expand Up @@ -5,9 +5,9 @@ import (
"encoding/json"
"testing"

"github.com/Encrypt-S/kauri-api/app/conf"
"github.com/stretchr/testify/assert"
"gopkg.in/jarcoal/httpmock.v1"
"github.com/Encrypt-S/kauri-api/app/conf"
)

func mockCoinData() conf.CoinData {
Expand Down Expand Up @@ -130,7 +130,7 @@ func Test_getTxIDsRPC(t *testing.T) {
defer httpmock.DeactivateAndReset()

httpmock.RegisterResponder("POST", "http://127.0.0.1:0",
httpmock.NewStringResponder(200, mockGetTxIdsResponseData()))
httpmock.NewStringResponder(200, mockGetTxIdsResponseData()))

coinData := mockCoinData()

Expand All @@ -148,7 +148,7 @@ func Test_getRawTx(t *testing.T) {
defer httpmock.DeactivateAndReset()

httpmock.RegisterResponder("POST", "http://127.0.0.1:0",
httpmock.NewStringResponder(200, mockGetRawTxResponseData()))
httpmock.NewStringResponder(200, mockGetRawTxResponseData()))

coinData := mockCoinData()

Expand All @@ -165,11 +165,11 @@ func Test_getVerboseTx(t *testing.T) {
defer httpmock.DeactivateAndReset()

httpmock.RegisterResponder("POST", "http://127.0.0.1:0",
httpmock.NewStringResponder(200, mockGetRawTxVerboseResponseData()))
httpmock.NewStringResponder(200, mockGetRawTxVerboseResponseData()))

coinData := mockCoinData()

rpcResp, _ := getRawTxVerbose(coinData,"11a7071a43a8da2b9ac116865a6cd92c985c3f7cbde63933d253f88dffaa311a")
rpcResp, _ := getRawTxVerbose(coinData, "11a7071a43a8da2b9ac116865a6cd92c985c3f7cbde63933d253f88dffaa311a")

assert.Equal(t, "123", rpcResp)

Expand Down
5 changes: 1 addition & 4 deletions app/main.go
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/Encrypt-S/kauri-api/app/api"
"github.com/Encrypt-S/kauri-api/app/conf"
"github.com/gorilla/mux"
"github.com/Encrypt-S/kauri-api/app/manager"
"github.com/gorilla/mux"
)

func main() {
Expand All @@ -36,8 +36,6 @@ func main() {
log.Println("Failed to load the app config: " + err.Error())
}

//conf.StartConfigManager()

// load the dev config file if one is set
conf.LoadDevConfig()

Expand All @@ -59,4 +57,3 @@ func main() {
// start http server and listen up
http.ListenAndServe(port, router)
}

7 changes: 4 additions & 3 deletions app/manager/manager.go
@@ -1,15 +1,16 @@
package manager

import (
"log"

"github.com/Encrypt-S/kauri-api/app/conf"
"github.com/Encrypt-S/kauri-api/app/daemon"
"github.com/Encrypt-S/kauri-api/app/daemon/daemonapi"
"github.com/gorilla/mux"
"log"
)

// StartAllDaemonManagers ranges through coins, starts daemons
func StartAllDaemonManagers(activeCoins []conf.CoinData) {
func StartAllDaemonManagers(activeCoins []conf.CoinData) {

log.Println("ranging through active coins, starting daemons")

Expand All @@ -20,7 +21,7 @@ func StartAllDaemonManagers(activeCoins []conf.CoinData) {
}

// StartWalletHandlers ranges through activeCoins, inits handlers
func StartWalletHandlers(r *mux.Router, activeCoins []conf.CoinData) {
func StartWalletHandlers(r *mux.Router, activeCoins []conf.CoinData) {

log.Println("ranging through active coins, initialising wallet handlers")

Expand Down

0 comments on commit 5d06de1

Please sign in to comment.