Refactor RPC/*, tendermint/config for debora+barak

cmd/barak/main.go

@@ -19,13 +19,14 @@ import (
 	"github.com/tendermint/tendermint/binary"
 	. "github.com/tendermint/tendermint/cmd/barak/types"
 	. "github.com/tendermint/tendermint/common"
+	cfg "github.com/tendermint/tendermint/config"
 	pcm "github.com/tendermint/tendermint/process"
-	"github.com/tendermint/tendermint/rpc"
+	"github.com/tendermint/tendermint/rpc/server"
 )
 
-var Routes = map[string]*rpc.RPCFunc{
-	"status": rpc.NewRPCFunc(Status, []string{}),
-	"run":    rpc.NewRPCFunc(Run, []string{"auth_command"}),
+var Routes = map[string]*rpcserver.RPCFunc{
+	"status": rpcserver.NewRPCFunc(Status, []string{}),
+	"run":    rpcserver.NewRPCFunc(Run, []string{"auth_command"}),
 	// NOTE: also, two special non-JSONRPC routes called "download" and "upload"
 }
 
@@ -58,6 +59,9 @@ var barak = struct {
 func main() {
 	fmt.Printf("New Barak Process (PID: %d)\n", os.Getpid())
 
+	// Apply bare tendermint/* configuration.
+	cfg.ApplyConfig(cfg.MapConfig(map[string]interface{}{"log_level": "info"}))
+
 	// read flags to change options file.
 	var optionsBytes []byte
 	var optionsFile string
@@ -97,8 +101,8 @@ func main() {
 	mux.HandleFunc("/download", ServeFile)
 	mux.HandleFunc("/register", Register)
 	// TODO: mux.HandleFunc("/upload", UploadFile)
-	rpc.RegisterRPCFuncs(mux, Routes)
-	rpc.StartHTTPServer(options.ListenAddress, mux)
+	rpcserver.RegisterRPCFuncs(mux, Routes)
+	rpcserver.StartHTTPServer(options.ListenAddress, mux)
 
 	// Register this barak with central listener
 	for _, registry := range barak.registries {

cmd/debora/commands.go

@@ -10,7 +10,7 @@ import (
 	"github.com/tendermint/tendermint/binary"
 	btypes "github.com/tendermint/tendermint/cmd/barak/types"
 	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/rpc"
+	"github.com/tendermint/tendermint/rpc/client"
 	"net/http"
 )
 
@@ -89,7 +89,7 @@ func GetNonce(remote string) (uint64, error) {
 }
 
 func GetStatus(remote string) (response btypes.ResponseStatus, err error) {
-	_, err = rpc.Call(remote, "status", Arr(), &response)
+	_, err = rpcclient.Call(remote, "status", Arr(), &response)
 	if err != nil {
 		return response, fmt.Errorf("Error fetching nonce from remote %v:\n  %v", remote, err)
 	}
@@ -113,5 +113,5 @@ func RunAuthCommand(remote string, commandJSONBytes []byte, signatures []acm.Sig
 		CommandJSONStr: string(commandJSONBytes),
 		Signatures:     signatures,
 	}
-	return rpc.Call(remote, "run", Arr(authCommand), dest)
+	return rpcclient.Call(remote, "run", Arr(authCommand), dest)
 }

cmd/debora/main.go

@@ -14,6 +14,7 @@ import (
 	"github.com/tendermint/tendermint/binary"
 	btypes "github.com/tendermint/tendermint/cmd/barak/types"
 	. "github.com/tendermint/tendermint/common"
+	cfg "github.com/tendermint/tendermint/config"
 )
 
 func remoteNick(remote string) string {
@@ -33,6 +34,9 @@ var Config = struct {
 func main() {
 	fmt.Printf("New Debora Process (PID: %d)\n", os.Getpid())
 
+	// Apply bare tendermint/* configuration.
+	cfg.ApplyConfig(cfg.MapConfig(map[string]interface{}{"log_level": "info"}))
+
 	rootDir := os.Getenv("DEBROOT")
 	if rootDir == "" {
 		rootDir = os.Getenv("HOME") + "/.debora"