certusone
/
tendermint
mirror of https://github.com/certusone/tendermint.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rpc: use NewBlock event in rpc tests

This commit is contained in:
Ethan Buchman 2015-04-14 01:42:11 -07:00
parent 2e918e8c0b
commit 860d5478e9
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
rpc/test/tests.go
View File

@ -9,7 +9,7 @@ import (
"github.com/tendermint/tendermint/state"
"github.com/tendermint/tendermint/types"
"testing"
"time"
//"time"
)
func testStatus(t *testing.T, typ string) {
@ -89,6 +89,13 @@ func testBroadcastTx(t *testing.T, typ string) {
}
func testGetStorage(t *testing.T, typ string) {
con := newWSCon(t)
eid := types.EventStringNewBlock()
subscribe(t, con, eid)
defer func() {
unsubscribe(t, con, eid)
con.Close()
}()
priv := state.LoadPrivValidator(".tendermint/priv_validator.json")
_ = priv
//core.SetPrivValidator(priv)
@ -108,7 +115,11 @@ func testGetStorage(t *testing.T, typ string) {
}
// allow it to get mined
time.Sleep(time.Second * 20)
//time.Sleep(time.Second * 20)
waitForEvent(t, con, eid, true, func() {
}, func(eid string, b []byte) error {
return nil
})
mempoolCount = 0
v := getStorage(t, typ, contractAddr, []byte{0x1})
@ -136,6 +147,14 @@ func testCallCode(t *testing.T, typ string) {
}
func testCall(t *testing.T, typ string) {
con := newWSCon(t)
eid := types.EventStringNewBlock()
subscribe(t, con, eid)
defer func() {
unsubscribe(t, con, eid)
con.Close()
}()
client := clients[typ]
// create the contract
@ -154,7 +173,11 @@ func testCall(t *testing.T, typ string) {
}
// allow it to get mined
time.Sleep(time.Second * 20)
//time.Sleep(time.Second * 20)
waitForEvent(t, con, eid, true, func() {
}, func(eid string, b []byte) error {
return nil
})
mempoolCount = 0
// run a call through the contract