Skip to content

Commit 53b0876

Browse files
alfonsobriesalfonsobries
authored
refactor: use query dict for endpoint params (#144)
1 parent d2539a3 commit 53b0876

22 files changed

Lines changed: 489 additions & 454 deletions

‎client/api/api_nodes.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
class ApiNodes(Resource):
55

6-
def all(self, **kwargs):
7-
return self.with_endpoint('api').request_get('api-nodes', kwargs)
6+
def all(self, query={}):
7+
return self.with_endpoint('api').request_get('api-nodes', query)

‎client/api/blocks.py‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,8 @@
33

44
class Blocks(Resource):
55

6-
def all(self, page=None, limit=100, **kwargs):
7-
extra_params = {name: kwargs[name] for name in kwargs if kwargs[name] is not None}
8-
params = {
9-
'page': page,
10-
'limit': limit,
11-
**extra_params
12-
}
13-
return self.with_endpoint('api').request_get('blocks', params)
6+
def all(self, query={}):
7+
return self.with_endpoint('api').request_get('blocks', query)
148

159
def get(self, block_id):
1610
return self.with_endpoint('api').request_get(f'blocks/{block_id}')
@@ -21,5 +15,7 @@ def first(self):
2115
def last(self):
2216
return self.with_endpoint('api').request_get('blocks/last')
2317

24-
def transactions(self, block_id, **kwargs):
25-
return self.with_endpoint('api').request_get(f'blocks/{block_id}/transactions', kwargs)
18+
def transactions(self, block_id, query={}):
19+
return self.with_endpoint('api').request_get(
20+
f'blocks/{block_id}/transactions', query
21+
)

‎client/api/node.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@ def syncing(self):
1010
return self.with_endpoint('api').request_get('node/syncing')
1111

1212
def configuration(self):
13-
return self.with_endpoint('api').request_get('node/configuration')
13+
return self.with_endpoint('api').request_get(
14+
'node/configuration'
15+
)
1416

1517
def crypto(self):
16-
return self.with_endpoint('api').request_get('node/configuration/crypto')
18+
return self.with_endpoint('api').request_get(
19+
'node/configuration/crypto'
20+
)
1721

18-
def fees(self, days=None):
19-
params = {
20-
'days': days,
21-
}
22-
return self.with_endpoint('api').request_get('node/fees', params)
22+
def fees(self, query={}):
23+
return self.with_endpoint('api').request_get('node/fees', query)

‎client/api/peers.py‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,8 @@
33

44
class Peers(Resource):
55

6-
def all(self, os=None, status=None, port=None, version=None, order_by=None,
7-
page=None, limit=100):
8-
9-
params = {
10-
'os': os,
11-
'status': status,
12-
'port': port,
13-
'version': version,
14-
'orderBy': order_by,
15-
'page': page,
16-
'limit': limit,
17-
}
18-
return self.with_endpoint('api').request_get('peers', params)
6+
def all(self, query={}):
7+
return self.with_endpoint('api').request_get('peers', query)
198

209
def get(self, ip):
2110
return self.with_endpoint('api').request_get(f'peers/{ip}')

‎client/api/receipts.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33

44
class Receipts(Resource):
5-
def all(self, **kwargs):
6-
return self.with_endpoint('api').request_get('receipts', kwargs)
5+
def all(self, query={}):
6+
return self.with_endpoint('api').request_get('receipts', query)
77

88
def get(self, transaction_hash: str):
9-
return self.with_endpoint('api').request_get(f'receipts/{transaction_hash}')
9+
return self.with_endpoint('api').request_get(
10+
f'receipts/{transaction_hash}'
11+
)

‎client/api/rounds.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33

44
class Rounds(Resource):
55

6-
def all(self, **kwargs):
7-
return self.with_endpoint('api').request_get('rounds', kwargs)
6+
def all(self, query={}):
7+
return self.with_endpoint('api').request_get('rounds', query)
88

99
def show(self, round_id):
1010
return self.with_endpoint('api').request_get(f'rounds/{round_id}')
1111

1212
def validators(self, round_id):
13-
return self.with_endpoint('api').request_get(f'rounds/{round_id}/validators')
13+
return self.with_endpoint('api').request_get(
14+
f'rounds/{round_id}/validators'
15+
)

‎client/api/tokens.py‎

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,25 @@
33

44
class Tokens(Resource):
55

6-
def all(self, page=None, limit=100):
7-
params = {
8-
'page': page,
9-
'limit': limit,
10-
}
11-
return self.with_endpoint('api').request_get('tokens', params)
6+
def all(self, query={}):
7+
return self.with_endpoint('api').request_get('tokens', query)
128

139
def get(self, address):
1410
return self.with_endpoint('api').request_get(
1511
f'tokens/{address}'
1612
)
1713

18-
def holders(self, address, page=None, limit=100):
19-
params = {
20-
'page': page,
21-
'limit': limit,
22-
}
14+
def holders(self, address, query={}):
2315
return self.with_endpoint('api').request_get(
24-
f'tokens/{address}/holders', params
16+
f'tokens/{address}/holders', query
2517
)
2618

27-
def transfers_by_token(self, address, page=None, limit=100):
28-
params = {
29-
'page': page,
30-
'limit': limit,
31-
}
19+
def transfers_by_token(self, address, query={}):
3220
return self.with_endpoint('api').request_get(
33-
f'tokens/{address}/transfers', params
21+
f'tokens/{address}/transfers', query
3422
)
3523

36-
def transfers(self, page=None, limit=100):
37-
params = {
38-
'page': page,
39-
'limit': limit,
40-
}
24+
def transfers(self, query={}):
4125
return self.with_endpoint('api').request_get(
42-
'tokens/transfers', params
26+
'tokens/transfers', query
4327
)

‎client/api/transactions.py‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,32 @@
33

44
class Transactions(Resource):
55

6-
def all(self, page=None, limit=100, **kwargs):
7-
extra_params = {name: kwargs[name] for name in kwargs if kwargs[name] is not None}
8-
params = {
9-
'page': page,
10-
'limit': limit,
11-
**extra_params
12-
}
13-
return self.with_endpoint('api').request_get('transactions', params)
6+
def all(self, query={}):
7+
return self.with_endpoint('api').request_get(
8+
'transactions', query
9+
)
1410

1511
def create(self, transactions):
16-
return self.with_endpoint('transactions').request_post('transactions', data={'transactions': transactions})
12+
return self.with_endpoint('transactions').request_post(
13+
'transactions', data={'transactions': transactions}
14+
)
1715

1816
def get(self, transaction_id):
19-
return self.with_endpoint('api').request_get(f'transactions/{transaction_id}')
17+
return self.with_endpoint('api').request_get(
18+
f'transactions/{transaction_id}'
19+
)
2020

21-
def all_unconfirmed(self, limit=100, offset=None, **kwargs):
22-
extra_params = {name: kwargs[name] for name in kwargs if kwargs[name] is not None}
23-
params = {
24-
'limit': limit,
25-
'offset': offset,
26-
**extra_params
27-
}
28-
return self.with_endpoint('api').request_get('transactions/unconfirmed', params)
21+
def all_unconfirmed(self, query={}):
22+
return self.with_endpoint('api').request_get(
23+
'transactions/unconfirmed', query
24+
)
2925

3026
def get_unconfirmed(self, transaction_id):
31-
return self.with_endpoint('api').request_get(f'transactions/unconfirmed/{transaction_id}')
27+
return self.with_endpoint('api').request_get(
28+
f'transactions/unconfirmed/{transaction_id}'
29+
)
3230

3331
def configuration(self):
34-
return self.with_endpoint('transactions').request_get('configuration')
32+
return self.with_endpoint('transactions').request_get(
33+
'configuration'
34+
)

‎client/api/validators.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33

44
class Validators(Resource):
55

6-
def all(self, page=None, limit=100, **kwargs):
7-
extra_params = {name: kwargs[name] for name in kwargs if kwargs[name] is not None}
8-
params = {
9-
'page': page,
10-
'limit': limit,
11-
**extra_params
12-
}
13-
return self.with_endpoint('api').request_get('validators', params)
6+
def all(self, query={}):
7+
return self.with_endpoint('api').request_get('validators', query)
148

159
def get(self, validator_id):
16-
return self.with_endpoint('api').request_get(f'validators/{validator_id}')
10+
return self.with_endpoint('api').request_get(
11+
f'validators/{validator_id}'
12+
)
1713

18-
def blocks(self, validator_id, **kwargs):
19-
return self.with_endpoint('api').request_get(f'validators/{validator_id}/blocks', kwargs)
14+
def blocks(self, validator_id, query={}):
15+
return self.with_endpoint('api').request_get(
16+
f'validators/{validator_id}/blocks', query
17+
)
2018

21-
def voters(self, validator_id, **kwargs):
22-
return self.with_endpoint('api').request_get(f'validators/{validator_id}/voters', kwargs)
19+
def voters(self, validator_id, query={}):
20+
return self.with_endpoint('api').request_get(
21+
f'validators/{validator_id}/voters', query
22+
)

‎client/api/votes.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33

44
class Votes(Resource):
55

6-
def all(self, page=None, limit=100):
7-
params = {
8-
'page': page,
9-
'limit': limit,
10-
}
11-
return self.with_endpoint('api').request_get('votes', params)
6+
def all(self, query={}):
7+
return self.with_endpoint('api').request_get('votes', query)
128

139
def get(self, vote_id):
1410
return self.with_endpoint('api').request_get(f'votes/{vote_id}')

0 commit comments

Comments
 (0)