mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-09-08 00:57:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jae Kwon
2015-05-17 16:19:58 -07:00
parent 75ef479547
commit 3565db4eef
19 changed files with 92 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/debora/commands.go
+3 -3
View File
@@ -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
+4
View File
@@ -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"