Merge pull request #2013 from OffchainLabs/rpcclient_retry_default

Rpcclient retry default
OffchainLabs · Dec 11, 2023 · 1de9e02 · 1de9e02
2 parents 629d0ae + 67d99d3
commit 1de9e02
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/util/rpcclient/rpcclient.go b/util/rpcclient/rpcclient.go
@@ -53,6 +53,8 @@ var TestClientConfig = ClientConfig{
 var DefaultClientConfig = ClientConfig{
 	URL:         "self-auth",
 	JWTSecret:   "",
+	Retries:     3,
+	RetryErrors: "websocket: close.*|dial tcp .*|.*i/o timeout|.*connection reset by peer|.*connection refused",
 	ArgLogLimit: 2048,
 }
 

diff --git a/util/rpcclient/rpcclient_toxiproxy_test.go b/util/rpcclient/rpcclient_toxiproxy_test.go
@@ -22,15 +22,12 @@ func TestToxiRpcClient(t *testing.T) {
 	Require(t, err)
 	defer proxy.Delete()
 
-	config := &ClientConfig{
-		URL:         "ws://" + proxy.Listen,
-		Timeout:     time.Second * 5,
-		Retries:     3,
-		RetryErrors: "websocket: close.*|.* i/o timeout|.*connection reset by peer|dial tcp .*",
-		RetryDelay:  time.Millisecond * 500,
-	}
+	config := DefaultClientConfig
+	config.URL = "ws://" + proxy.Listen
+	config.Timeout = time.Second * 5
+	config.RetryDelay = time.Millisecond * 500
 	Require(t, config.Validate())
-	configFetcher := func() *ClientConfig { return config }
+	configFetcher := func() *ClientConfig { return &config }
 
 	client := NewRpcClient(configFetcher, server1)