fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-07-02 22:21:44 +00:00
Code Issues Projects Releases Wiki Activity

rpc: myriad little fixes

Browse Source
This commit is contained in:
Ethan Buchman
2015-04-01 05:12:38 -07:00
parent 8cc8757252
commit 8fe1274323
4 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
rpc/test/test.go
View File

@ -3,7 +3,6 @@ package rpc
import (
"bytes"
"encoding/hex"
"encoding/json"
"github.com/tendermint/tendermint2/account"
"github.com/tendermint/tendermint2/binary"
"github.com/tendermint/tendermint2/config"
@ -12,6 +11,7 @@ import (
"github.com/tendermint/tendermint2/p2p"
"github.com/tendermint/tendermint2/rpc"
"github.com/tendermint/tendermint2/rpc/core"
"github.com/tendermint/tendermint2/state"
"github.com/tendermint/tendermint2/types"
"io/ioutil"
"net/http"
@ -61,12 +61,35 @@ func init() {
app.Set("Log.Stdout.Level", "debug")
config.SetApp(app)
logger.Reset()
priv := state.LoadPrivValidator(rootDir + "/priv_validator.json")
priv.LastHeight = 0
priv.LastRound = 0
priv.LastStep = 0
priv.Save()
// start a node
ready := make(chan struct{})
go newNode(ready)
<-ready
}
func getAccount(t *testing.T, typ string, addr []byte) *account.Account {
var client rpc.Client
switch typ {
case "JSONRPC":
client = rpc.NewClient(requestAddr, "JSONRPC")
case "HTTP":
client = rpc.NewClient(requestAddr, "HTTP")
}
ac, err := client.GetAccount(addr)
if err != nil {
t.Fatal(err)
}
return ac.Account
}
/*
func getAccount(t *testing.T, typ string, addr []byte) *account.Account {
var resp *http.Response
var err error
@ -107,7 +130,7 @@ func getAccount(t *testing.T, typ string, addr []byte) *account.Account {
t.Fatal(err)
}
return response.Result.Account
}
}*/
func makeSendTx(t *testing.T, typ string, from, to []byte, amt uint64) *types.SendTx {
acc := getAccount(t, typ, from)