Skip to content

Commit 27d698e

Browse files
flopez7flopez7
committed
Refactor retry configuration to options in test files for consistency
1 parent e5d66d9 commit 27d698e

File tree

8 files changed

+52
-52
lines changed

8 files changed

+52
-52
lines changed

‎packages/sdk/python/human-protocol-sdk/test/human_protocol_sdk/escrow/test_escrow_utils.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def test_get_escrows(self):
5151
"createdAt": "1683811973",
5252
}
5353

54-
def side_effect(subgraph_url, query, params, retry_config):
54+
def side_effect(subgraph_url, query, params, options):
5555
if subgraph_url == NETWORKS[ChainId.POLYGON_AMOY]:
5656
return {"data": {"escrows": [mock_escrow]}}
5757

@@ -83,7 +83,7 @@ def side_effect(subgraph_url, query, params, retry_config):
8383
"skip": 0,
8484
"orderDirection": "desc",
8585
},
86-
retry_config=None,
86+
options=None,
8787
)
8888
self.assertEqual(len(filtered), 1)
8989
self.assertEqual(filtered[0].address, mock_escrow["address"])
@@ -155,7 +155,7 @@ def side_effect(subgraph_url, query, params, retry_config):
155155
"skip": 0,
156156
"orderDirection": "desc",
157157
},
158-
retry_config=None,
158+
options=None,
159159
)
160160
self.assertEqual(len(filtered), 1)
161161
self.assertEqual(filtered[0].chain_id, ChainId.POLYGON_AMOY)
@@ -206,7 +206,7 @@ def test_get_escrows_with_status_array(self):
206206
"createdAt": "1672531200000",
207207
}
208208

209-
def side_effect(subgraph_url, query, params, retry_config):
209+
def side_effect(subgraph_url, query, params, options):
210210
if subgraph_url == NETWORKS[ChainId.POLYGON_AMOY]:
211211
return {"data": {"escrows": [mock_escrow_1, mock_escrow_2]}}
212212

@@ -234,7 +234,7 @@ def side_effect(subgraph_url, query, params, retry_config):
234234
"skip": 0,
235235
"orderDirection": "desc",
236236
},
237-
retry_config=None,
237+
options=None,
238238
)
239239
self.assertEqual(len(filtered), 2)
240240
self.assertEqual(filtered[0].address, mock_escrow_1["address"])
@@ -287,7 +287,7 @@ def test_get_escrow(self):
287287
params={
288288
"escrowAddress": "0x1234567890123456789012345678901234567890",
289289
},
290-
retry_config=None,
290+
options=None,
291291
)
292292
self.assertEqual(escrow.chain_id, ChainId.POLYGON_AMOY)
293293
self.assertEqual(escrow.address, mock_escrow["address"])
@@ -347,7 +347,7 @@ def test_get_escrow_empty_data(self):
347347
params={
348348
"escrowAddress": "0x1234567890123456789012345678901234567890",
349349
},
350-
retry_config=None,
350+
options=None,
351351
)
352352
self.assertEqual(escrow, None)
353353

@@ -621,7 +621,7 @@ def test_get_cancellation_refunds(self):
621621
"txHash": "0xhash1",
622622
}
623623

624-
def side_effect(subgraph_url, query, params, retry_config):
624+
def side_effect(subgraph_url, query, params, options):
625625
if subgraph_url == NETWORKS[ChainId.POLYGON_AMOY]:
626626
return {"data": {"cancellationRefundEvents": [mock_refund]}}
627627

‎packages/sdk/python/human-protocol-sdk/test/human_protocol_sdk/kvstore/test_kvstore_utils.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def test_get_kvstore_data(self):
5151
params={
5252
"address": "0x15d34aaf54267db7d7c367839aaf71a00a2c6a65",
5353
},
54-
retry_config=None,
54+
options=None,
5555
)
5656
self.assertEqual(len(kvstores), 2)
5757
self.assertEqual(kvstores[0].key, "fee")
@@ -77,7 +77,7 @@ def test_get_kvstore_data_empty_data(self):
7777
params={
7878
"address": "0x15d34aaf54267db7d7c367839aaf71a00a2c6a65",
7979
},
80-
retry_config=None,
80+
options=None,
8181
)
8282
self.assertEqual(kvstores, [])
8383

@@ -120,7 +120,7 @@ def test_get(self, mock_function):
120120
NETWORKS[ChainId.LOCALHOST],
121121
query=get_kvstore_by_address_and_key_query(),
122122
params={"address": address, "key": key},
123-
retry_config=None,
123+
options=None,
124124
)
125125
self.assertEqual(result, "1")
126126

@@ -157,7 +157,7 @@ def test_get_empty_value(self, mock_function):
157157
NETWORKS[ChainId.LOCALHOST],
158158
query=get_kvstore_by_address_and_key_query(),
159159
params={"address": address, "key": key},
160-
retry_config=None,
160+
options=None,
161161
)
162162

163163
@patch("human_protocol_sdk.kvstore.kvstore_utils.custom_gql_fetch")
@@ -186,7 +186,7 @@ def test_get_without_account(self, mock_function):
186186
NETWORKS[ChainId.LOCALHOST],
187187
query=get_kvstore_by_address_and_key_query(),
188188
params={"address": address, "key": key},
189-
retry_config=None,
189+
options=None,
190190
)
191191
self.assertEqual(result, "mock_value")
192192

‎packages/sdk/python/human-protocol-sdk/test/human_protocol_sdk/operator/test_operator_utils.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def test_get_operators(self):
6767
"first": filter.first,
6868
"skip": filter.skip,
6969
},
70-
retry_config=None,
70+
options=None,
7171
)
7272

7373
self.assertEqual(len(operators), 1)
@@ -144,7 +144,7 @@ def test_get_operators_when_job_types_is_none(self):
144144
"first": filter.first,
145145
"skip": filter.skip,
146146
},
147-
retry_config=None,
147+
options=None,
148148
)
149149

150150
self.assertEqual(len(operators), 1)
@@ -221,7 +221,7 @@ def test_get_operators_when_job_types_is_array(self):
221221
"first": filter.first,
222222
"skip": filter.skip,
223223
},
224-
retry_config=None,
224+
options=None,
225225
)
226226

227227
self.assertEqual(len(operators), 1)
@@ -274,7 +274,7 @@ def test_get_operators_empty_data(self):
274274
"first": filter.first,
275275
"skip": filter.skip,
276276
},
277-
retry_config=None,
277+
options=None,
278278
)
279279

280280
self.assertEqual(operators, [])
@@ -325,7 +325,7 @@ def test_get_operator(self):
325325
NETWORKS[ChainId.POLYGON],
326326
query=get_operator_query,
327327
params={"address": staker_address},
328-
retry_config=None,
328+
options=None,
329329
)
330330

331331
self.assertNotEqual(operator, None)
@@ -394,7 +394,7 @@ def test_get_operator_when_job_types_is_none(self):
394394
NETWORKS[ChainId.POLYGON],
395395
query=get_operator_query,
396396
params={"address": staker_address},
397-
retry_config=None,
397+
options=None,
398398
)
399399

400400
self.assertNotEqual(operator, None)
@@ -463,7 +463,7 @@ def test_get_operator_when_job_types_is_array(self):
463463
NETWORKS[ChainId.POLYGON],
464464
query=get_operator_query,
465465
params={"address": staker_address},
466-
retry_config=None,
466+
options=None,
467467
)
468468

469469
self.assertNotEqual(operator, None)
@@ -502,7 +502,7 @@ def test_get_operator_empty_data(self):
502502
NETWORKS[ChainId.POLYGON],
503503
query=get_operator_query,
504504
params={"address": staker_address},
505-
retry_config=None,
505+
options=None,
506506
)
507507

508508
self.assertEqual(operator, None)
@@ -549,7 +549,7 @@ def test_get_reputation_network_operators(self):
549549
NETWORKS[ChainId.POLYGON],
550550
query=get_reputation_network_query(None),
551551
params={"address": reputation_address, "role": None},
552-
retry_config=None,
552+
options=None,
553553
)
554554

555555
self.assertNotEqual(operators, [])
@@ -602,7 +602,7 @@ def test_get_reputation_network_operators_when_job_types_is_none(self):
602602
NETWORKS[ChainId.POLYGON],
603603
query=get_reputation_network_query(None),
604604
params={"address": reputation_address, "role": None},
605-
retry_config=None,
605+
options=None,
606606
)
607607

608608
self.assertNotEqual(operators, [])
@@ -655,7 +655,7 @@ def test_get_reputation_network_operators_when_job_types_is_array(self):
655655
NETWORKS[ChainId.POLYGON],
656656
query=get_reputation_network_query(None),
657657
params={"address": reputation_address, "role": None},
658-
retry_config=None,
658+
options=None,
659659
)
660660

661661
self.assertNotEqual(operators, [])
@@ -684,7 +684,7 @@ def test_get_reputation_network_operators_empty_data(self):
684684
NETWORKS[ChainId.POLYGON],
685685
query=get_reputation_network_query(None),
686686
params={"address": reputation_address, "role": None},
687-
retry_config=None,
687+
options=None,
688688
)
689689

690690
self.assertEqual(operators, [])
@@ -716,7 +716,7 @@ def test_get_rewards_info(self):
716716
NETWORKS[ChainId.POLYGON],
717717
query=get_reward_added_events_query,
718718
params={"slasherAddress": slasher},
719-
retry_config=None,
719+
options=None,
720720
)
721721

722722
self.assertEqual(len(rewards_info), 2)
@@ -739,7 +739,7 @@ def test_get_rewards_info_empty_data(self):
739739
NETWORKS[ChainId.POLYGON],
740740
query=get_reward_added_events_query,
741741
params={"slasherAddress": slasher},
742-
retry_config=None,
742+
options=None,
743743
)
744744

745745
self.assertEqual(rewards_info, [])

‎packages/sdk/python/human-protocol-sdk/test/human_protocol_sdk/staking/test_staking_utils.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def test_get_stakers(self):
6969
"first": 2,
7070
"skip": 0,
7171
},
72-
retry_config=None,
72+
options=None,
7373
)
7474
self.assertEqual(len(stakers), 2)
7575
self.assertIsInstance(stakers[0], StakerData)
@@ -161,7 +161,7 @@ def test_get_staker(self):
161161
NETWORKS[ChainId.POLYGON_AMOY],
162162
query=get_staker_query(),
163163
params={"id": "0x123"},
164-
retry_config=None,
164+
options=None,
165165
)
166166
self.assertIsInstance(staker, StakerData)
167167
self.assertEqual(staker.id, "1")

‎packages/sdk/python/human-protocol-sdk/test/human_protocol_sdk/statistics/test_statistics_client.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def test_get_escrow_statistics(self):
6565
mock_function.assert_any_call(
6666
NETWORKS[ChainId.LOCALHOST],
6767
query=get_escrow_statistics_query,
68-
retry_config=None,
68+
options=None,
6969
)
7070

7171
mock_function.assert_any_call(
@@ -78,7 +78,7 @@ def test_get_escrow_statistics(self):
7878
"skip": 0,
7979
"orderDirection": "asc",
8080
},
81-
retry_config=None,
81+
options=None,
8282
)
8383

8484
self.assertEqual(escrow_statistics.total_escrows, 1)
@@ -130,7 +130,7 @@ def test_get_worker_statistics(self):
130130
"skip": 0,
131131
"orderDirection": "asc",
132132
},
133-
retry_config=None,
133+
options=None,
134134
)
135135

136136
self.assertEqual(len(payment_statistics.daily_workers_data), 1)
@@ -176,7 +176,7 @@ def test_get_payment_statistics(self):
176176
"skip": 0,
177177
"orderDirection": "asc",
178178
},
179-
retry_config=None,
179+
options=None,
180180
)
181181

182182
self.assertEqual(len(payment_statistics.daily_payments_data), 1)
@@ -215,7 +215,7 @@ def test_get_hmt_statistics(self):
215215
mock_function.assert_any_call(
216216
NETWORKS[ChainId.LOCALHOST],
217217
query=get_hmtoken_statistics_query,
218-
retry_config=None,
218+
options=None,
219219
)
220220

221221
self.assertEqual(hmt_statistics.total_transfer_amount, 100)
@@ -255,7 +255,7 @@ def test_get_hmt_holders(self):
255255
"orderBy": "balance",
256256
"orderDirection": param.order_direction,
257257
},
258-
retry_config=None,
258+
options=None,
259259
)
260260

261261
self.assertEqual(len(holders), 2)
@@ -302,7 +302,7 @@ def test_get_hmt_daily_data(self):
302302
"skip": 0,
303303
"orderDirection": "asc",
304304
},
305-
retry_config=None,
305+
options=None,
306306
)
307307

308308
self.assertEqual(len(hmt_statistics), 1)

‎packages/sdk/python/human-protocol-sdk/test/human_protocol_sdk/test_utils.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from validators import ValidationError
44

55
from human_protocol_sdk.utils import (
6-
SubgraphRetryConfig,
6+
SubgraphOptions,
77
custom_gql_fetch,
88
is_indexer_error,
99
validate_url,
@@ -54,7 +54,7 @@ def setUp(self):
5454
self.query = "query Test"
5555
self.variables = {"foo": "bar"}
5656

57-
def test_returns_response_without_retry_config(self):
57+
def test_returns_response_without_options(self):
5858
expected = {"data": {"ok": True}}
5959
with patch(
6060
"human_protocol_sdk.utils._fetch_subgraph_data",
@@ -66,38 +66,38 @@ def test_returns_response_without_retry_config(self):
6666
mock_fetch.assert_called_once_with(self.network, self.query, self.variables)
6767

6868
def test_retries_on_indexer_error_and_succeeds(self):
69-
retry_config = SubgraphRetryConfig(max_retries=2, base_delay=100)
69+
options = SubgraphOptions(max_retries=2, base_delay=100)
7070
error = make_graphql_error({"errors": [{"message": "Bad indexers: syncing"}]})
7171

7272
with patch(
7373
"human_protocol_sdk.utils._fetch_subgraph_data",
7474
side_effect=[error, {"data": {"ok": True}}],
7575
) as mock_fetch, patch("human_protocol_sdk.utils.time.sleep") as mock_sleep:
7676
result = custom_gql_fetch(
77-
self.network, self.query, self.variables, retry_config=retry_config
77+
self.network, self.query, self.variables, options=options
7878
)
7979

8080
self.assertEqual(result, {"data": {"ok": True}})
8181
self.assertEqual(mock_fetch.call_count, 2)
8282
mock_sleep.assert_called_once()
8383

8484
def test_raises_immediately_on_non_indexer_error(self):
85-
retry_config = SubgraphRetryConfig(max_retries=3, base_delay=50)
85+
options = SubgraphOptions(max_retries=3, base_delay=50)
8686
with patch(
8787
"human_protocol_sdk.utils._fetch_subgraph_data",
8888
side_effect=Exception("network failure"),
8989
) as mock_fetch, patch("human_protocol_sdk.utils.time.sleep") as mock_sleep:
9090
with self.assertRaises(Exception) as ctx:
9191
custom_gql_fetch(
92-
self.network, self.query, self.variables, retry_config=retry_config
92+
self.network, self.query, self.variables, options=options
9393
)
9494

9595
self.assertIn("network failure", str(ctx.exception))
9696
mock_fetch.assert_called_once()
9797
mock_sleep.assert_not_called()
9898

9999
def test_raises_after_exhausting_retries(self):
100-
retry_config = SubgraphRetryConfig(max_retries=2, base_delay=10)
100+
options = SubgraphOptions(max_retries=2, base_delay=10)
101101
errors = [
102102
make_graphql_error({"errors": [{"message": "bad indexers: stalled"}]})
103103
for _ in range(3)
@@ -109,7 +109,7 @@ def test_raises_after_exhausting_retries(self):
109109
) as mock_fetch, patch("human_protocol_sdk.utils.time.sleep"):
110110
with self.assertRaises(Exception) as ctx:
111111
custom_gql_fetch(
112-
self.network, self.query, self.variables, retry_config=retry_config
112+
self.network, self.query, self.variables, options=options
113113
)
114114

115115
self.assertTrue(is_indexer_error(ctx.exception))

0 commit comments

Comments
 (0)