From d1402f4e922414e83206f622051a51a04cffa18f Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Tue, 24 Apr 2018 20:55:15 -0400 Subject: [PATCH] move waitForXxx funcs from lcd to tests.WaitForXxx --- client/lcd/helpers.go | 19 -------- client/lcd/lcd_test.go | 82 +++---------------------------- tests/util.go | 107 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 94 deletions(-) create mode 100644 tests/util.go diff --git a/client/lcd/helpers.go b/client/lcd/helpers.go index a64d44dfa..367e1a53d 100644 --- a/client/lcd/helpers.go +++ b/client/lcd/helpers.go @@ -7,33 +7,14 @@ import ( "os" "path/filepath" "strings" - "time" cmn "github.com/tendermint/tmlibs/common" cfg "github.com/tendermint/tendermint/config" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - rpcclient "github.com/tendermint/tendermint/rpc/lib/client" ) var globalConfig *cfg.Config -func waitForRPC() { - laddr := GetConfig().RPC.ListenAddress - fmt.Println("LADDR", laddr) - client := rpcclient.NewJSONRPCClient(laddr) - ctypes.RegisterAmino(client.Codec()) - result := new(ctypes.ResultStatus) - for { - _, err := client.Call("status", map[string]interface{}{}, result) - if err == nil { - return - } - fmt.Println("error", err) - time.Sleep(time.Millisecond) - } -} - // f**ing long, but unique for each test func makePathname() string { // get path diff --git a/client/lcd/lcd_test.go b/client/lcd/lcd_test.go index 0b5c6b064..66a8a4085 100644 --- a/client/lcd/lcd_test.go +++ b/client/lcd/lcd_test.go @@ -10,7 +10,6 @@ import ( "os" "regexp" "testing" - "time" "github.com/spf13/viper" "github.com/stretchr/testify/assert" @@ -34,6 +33,7 @@ import ( keys "github.com/cosmos/cosmos-sdk/client/keys" bapp "github.com/cosmos/cosmos-sdk/examples/basecoin/app" btypes "github.com/cosmos/cosmos-sdk/examples/basecoin/types" + tests "github.com/cosmos/cosmos-sdk/tests" sdk "github.com/cosmos/cosmos-sdk/types" ) @@ -157,7 +157,7 @@ func TestNodeStatus(t *testing.T) { func TestBlock(t *testing.T) { - waitForHeight(2) + tests.WaitForHeight(2, port) var resultBlock ctypes.ResultBlock @@ -224,7 +224,7 @@ func TestCoinSend(t *testing.T) { // create TX receiveAddr, resultTx := doSend(t, port, seed) - waitForHeight(resultTx.Height + 1) + tests.WaitForHeight(resultTx.Height+1, port) // check if tx was commited assert.Equal(t, uint32(0), resultTx.CheckTx.Code) @@ -253,7 +253,7 @@ func TestIBCTransfer(t *testing.T) { // create TX resultTx := doIBCTransfer(t, port, seed) - waitForHeight(resultTx.Height + 1) + tests.WaitForHeight(resultTx.Height+1, port) // check if tx was commited assert.Equal(t, uint32(0), resultTx.CheckTx.Code) @@ -286,7 +286,7 @@ func TestTxs(t *testing.T) { // create TX _, resultTx := doSend(t, port, seed) - waitForHeight(resultTx.Height + 1) + tests.WaitForHeight(resultTx.Height+1, port) // check if tx is findable res, body := request(t, port, "GET", fmt.Sprintf("/txs/%s", resultTx.Hash), nil) @@ -380,7 +380,7 @@ func startTMAndLCD() (*nm.Node, net.Listener, error) { return nil, nil, err } - waitForStart() + tests.WaitForStart(port) return node, lcd, nil } @@ -407,7 +407,7 @@ func startTM(cfg *tmcfg.Config, logger log.Logger, genDoc *tmtypes.GenesisDoc, p } // wait for rpc - waitForRPC() + tests.WaitForRPC(GetConfig().RPC.ListenAddress) logger.Info("Tendermint running!") return n, err @@ -490,71 +490,3 @@ func doIBCTransfer(t *testing.T, port, seed string) (resultTx ctypes.ResultBroad return resultTx } - -func waitForHeight(height int64) { - for { - var resultBlock ctypes.ResultBlock - - url := fmt.Sprintf("http://localhost:%v%v", port, "/blocks/latest") - res, err := http.Get(url) - if err != nil { - panic(err) - } - - body, err := ioutil.ReadAll(res.Body) - if err != nil { - panic(err) - } - res.Body.Close() - - err = cdc.UnmarshalJSON([]byte(body), &resultBlock) - if err != nil { - fmt.Println("RES", res) - fmt.Println("BODY", string(body)) - panic(err) - } - - if resultBlock.Block.Height >= height { - return - } - time.Sleep(time.Millisecond * 100) - } -} - -// wait for 2 blocks -func waitForStart() { - waitHeight := int64(2) - for { - time.Sleep(time.Second) - - url := fmt.Sprintf("http://localhost:%v%v", port, "/blocks/latest") - res, err := http.Get(url) - if err != nil { - panic(err) - } - - // waiting for server to start ... - if res.StatusCode != http.StatusOK { - res.Body.Close() - continue - } - - body, err := ioutil.ReadAll(res.Body) - if err != nil { - panic(err) - } - res.Body.Close() - - resultBlock := new(ctypes.ResultBlock) - err = cdc.UnmarshalJSON([]byte(body), &resultBlock) - if err != nil { - fmt.Println("RES", res) - fmt.Println("BODY", string(body)) - panic(err) - } - - if resultBlock.Block.Height >= waitHeight { - return - } - } -} diff --git a/tests/util.go b/tests/util.go new file mode 100644 index 000000000..a6f026f24 --- /dev/null +++ b/tests/util.go @@ -0,0 +1,107 @@ +package tests + +import ( + "fmt" + "io/ioutil" + "net/http" + "time" + + amino "github.com/tendermint/go-amino" + ctypes "github.com/tendermint/tendermint/rpc/core/types" + rpcclient "github.com/tendermint/tendermint/rpc/lib/client" +) + +// TODO: these functions just print to Stdout. +// consider using the logger. + +// Uses localhost +func WaitForHeight(height int64, port string) { + for { + var resultBlock ctypes.ResultBlock + + url := fmt.Sprintf("http://localhost:%v%v", port, "/blocks/latest") + res, err := http.Get(url) + if err != nil { + panic(err) + } + + body, err := ioutil.ReadAll(res.Body) + if err != nil { + panic(err) + } + res.Body.Close() + + err = cdc.UnmarshalJSON([]byte(body), &resultBlock) + if err != nil { + fmt.Println("RES", res) + fmt.Println("BODY", string(body)) + panic(err) + } + + if resultBlock.Block.Height >= height { + return + } + time.Sleep(time.Millisecond * 100) + } +} + +// wait for 2 blocks. +// uses localhost +func WaitForStart(port string) { + waitHeight := int64(2) + for { + time.Sleep(time.Second) + + url := fmt.Sprintf("http://localhost:%v%v", port, "/blocks/latest") + res, err := http.Get(url) + if err != nil { + panic(err) + } + + // waiting for server to start ... + if res.StatusCode != http.StatusOK { + res.Body.Close() + continue + } + + body, err := ioutil.ReadAll(res.Body) + if err != nil { + panic(err) + } + res.Body.Close() + + resultBlock := new(ctypes.ResultBlock) + err = cdc.UnmarshalJSON([]byte(body), &resultBlock) + if err != nil { + fmt.Println("RES", res) + fmt.Println("BODY", string(body)) + panic(err) + } + + if resultBlock.Block.Height >= waitHeight { + return + } + } +} + +// Wait for the RPC server to respond to /status +func WaitForRPC(laddr string) { + fmt.Println("LADDR", laddr) + client := rpcclient.NewJSONRPCClient(laddr) + ctypes.RegisterAmino(client.Codec()) + result := new(ctypes.ResultStatus) + for { + _, err := client.Call("status", map[string]interface{}{}, result) + if err == nil { + return + } + fmt.Printf("Waiting for RPC server to start on %s:%v\n", laddr, err) + time.Sleep(time.Millisecond) + } +} + +var cdc = amino.NewCodec() + +func init() { + ctypes.RegisterAmino(cdc) +}