mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-02-06 03:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into marko/int64-

Browse Source
This commit is contained in:
Marko
2021-02-01 16:54:32 +00:00
committed by GitHub
parent 0e477c014d 2a2279e010
commit b2f3e767a7
10 changed files with 79 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rpc/client/http/http.go
View File

@@ -118,12 +118,12 @@ func New(remote, wsEndpoint string) (*HTTP, error) {
// NewWithTimeout does the same thing as New, except you can set a Timeout for
// http.Client. A Timeout of zero means no timeout.
func NewWithTimeout(remote, wsEndpoint string, timeout uint) (*HTTP, error) {
func NewWithTimeout(remote, wsEndpoint string, timeout time.Duration) (*HTTP, error) {
httpClient, err := jsonrpcclient.DefaultHTTPClient(remote)
if err != nil {
return nil, err
}
httpClient.Timeout = time.Duration(timeout) * time.Second
httpClient.Timeout = timeout
return NewWithClient(remote, wsEndpoint, httpClient)
}

5
rpc/client/rpc_test.go
View File

@@ -40,7 +40,7 @@ func getHTTPClient() *rpchttp.HTTP {
return c
}
func getHTTPClientWithTimeout(timeout uint) *rpchttp.HTTP {
func getHTTPClientWithTimeout(timeout time.Duration) *rpchttp.HTTP {
rpcAddr := rpctest.GetConfig().RPC.ListenAddress
c, err := rpchttp.NewWithTimeout(rpcAddr, "/websocket", timeout)
if err != nil {
@@ -497,8 +497,7 @@ func TestTx(t *testing.T) {
}
func TestTxSearchWithTimeout(t *testing.T) {
// Get a client with a time-out of 10 secs.
timeoutClient := getHTTPClientWithTimeout(10)
timeoutClient := getHTTPClientWithTimeout(10 * time.Second)
_, _, tx := MakeTxKV()
_, err := timeoutClient.BroadcastTxCommit(context.Background(), tx)