From 1fcc9dc6542d037f60dcdda2103a4d10e74faa89 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Sat, 29 Apr 2017 00:04:01 -0400
Subject: [PATCH] remove viper from proxy

---
 consensus/replay_file.go |  3 ++-
 node/node.go             |  8 ++++++--
 proxy/client.go          |  9 ++-------
 proxy/multi_app_conn.go  | 10 +++-------
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/consensus/replay_file.go b/consensus/replay_file.go
index 5717adda8..9bcfafe6c 100644
--- a/consensus/replay_file.go
+++ b/consensus/replay_file.go
@@ -246,7 +246,8 @@ func newConsensusStateForReplay(config *viper.Viper) *ConsensusState {
 	state := sm.MakeGenesisStateFromFile(stateDB, config.GetString("genesis_file"))
 
 	// Create proxyAppConn connection (consensus, mempool, query)
-	proxyApp := proxy.NewAppConns(config, proxy.DefaultClientCreator(config), NewHandshaker(config, state, blockStore))
+	clientCreator := proxy.DefaultClientCreator(config.GetString("proxy_app"), config.GetString("abci"), config.GetString("db_dir"))
+	proxyApp := proxy.NewAppConns(clientCreator, NewHandshaker(config, state, blockStore))
 	_, err := proxyApp.Start()
 	if err != nil {
 		cmn.Exit(cmn.Fmt("Error starting proxy app conns: %v", err))
diff --git a/node/node.go b/node/node.go
index f7aca6d05..2958f98ef 100644
--- a/node/node.go
+++ b/node/node.go
@@ -62,7 +62,11 @@ func NewNodeDefault(config *viper.Viper) *Node {
 	// Get PrivValidator
 	privValidatorFile := config.GetString("priv_validator_file")
 	privValidator := types.LoadOrGenPrivValidator(privValidatorFile)
-	return NewNode(config, privValidator, proxy.DefaultClientCreator(config))
+	return NewNode(config, privValidator, proxy.DefaultClientCreator(
+		config.GetString("proxy_app"),
+		config.GetString("abci"),
+		config.GetString("db_dir"),
+	))
 }
 
 func NewNode(config *viper.Viper, privValidator *types.PrivValidator, clientCreator proxy.ClientCreator) *Node {
@@ -81,7 +85,7 @@ func NewNode(config *viper.Viper, privValidator *types.PrivValidator, clientCrea
 
 	// Create the proxyApp, which manages connections (consensus, mempool, query)
 	// and sync tendermint and the app by replaying any necessary blocks
-	proxyApp := proxy.NewAppConns(config, clientCreator, consensus.NewHandshaker(config, state, blockStore))
+	proxyApp := proxy.NewAppConns(clientCreator, consensus.NewHandshaker(config, state, blockStore))
 	if _, err := proxyApp.Start(); err != nil {
 		cmn.Exit(cmn.Fmt("Error starting proxy app connections: %v", err))
 	}
diff --git a/proxy/client.go b/proxy/client.go
index 4c50f38b3..5720cce30 100644
--- a/proxy/client.go
+++ b/proxy/client.go
@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/spf13/viper"
-
 	abcicli "github.com/tendermint/abci/client"
 	"github.com/tendermint/abci/example/dummy"
 	"github.com/tendermint/abci/types"
@@ -64,15 +62,12 @@ func (r *remoteClientCreator) NewABCIClient() (abcicli.Client, error) {
 //-----------------------------------------------------------------
 // default
 
-func DefaultClientCreator(config *viper.Viper) ClientCreator {
-	addr := config.GetString("proxy_app")
-	transport := config.GetString("abci")
-
+func DefaultClientCreator(addr, transport, dbDir string) ClientCreator {
 	switch addr {
 	case "dummy":
 		return NewLocalClientCreator(dummy.NewDummyApplication())
 	case "persistent_dummy":
-		return NewLocalClientCreator(dummy.NewPersistentDummyApplication(config.GetString("db_dir")))
+		return NewLocalClientCreator(dummy.NewPersistentDummyApplication(dbDir))
 	case "nilapp":
 		return NewLocalClientCreator(types.NewBaseApplication())
 	default:
diff --git a/proxy/multi_app_conn.go b/proxy/multi_app_conn.go
index 9f70713eb..8043f4818 100644
--- a/proxy/multi_app_conn.go
+++ b/proxy/multi_app_conn.go
@@ -1,7 +1,6 @@
 package proxy
 
 import (
-	"github.com/spf13/viper"
 	cmn "github.com/tendermint/tmlibs/common"
 )
 
@@ -16,8 +15,8 @@ type AppConns interface {
 	Query() AppConnQuery
 }
 
-func NewAppConns(config *viper.Viper, clientCreator ClientCreator, handshaker Handshaker) AppConns {
-	return NewMultiAppConn(config, clientCreator, handshaker)
+func NewAppConns(clientCreator ClientCreator, handshaker Handshaker) AppConns {
+	return NewMultiAppConn(clientCreator, handshaker)
 }
 
 //-----------------------------
@@ -34,8 +33,6 @@ type Handshaker interface {
 type multiAppConn struct {
 	cmn.BaseService
 
-	config *viper.Viper
-
 	handshaker Handshaker
 
 	mempoolConn   *appConnMempool
@@ -46,9 +43,8 @@ type multiAppConn struct {
 }
 
 // Make all necessary abci connections to the application
-func NewMultiAppConn(config *viper.Viper, clientCreator ClientCreator, handshaker Handshaker) *multiAppConn {
+func NewMultiAppConn(clientCreator ClientCreator, handshaker Handshaker) *multiAppConn {
 	multiAppConn := &multiAppConn{
-		config:        config,
 		handshaker:    handshaker,
 		clientCreator: clientCreator,
 	}