refactor: use query dict for endpoint params

client/api/api_nodes.py

@@ -3,5 +3,5 @@
 
 class ApiNodes(Resource):
 
-    def all(self, **kwargs):
-        return self.with_endpoint('api').request_get('api-nodes', kwargs)
+    def all(self, query={}):
+        return self.with_endpoint('api').request_get('api-nodes', query)

client/api/blocks.py

@@ -3,14 +3,8 @@
 
 class Blocks(Resource):
 
-    def all(self, page=None, limit=100, **kwargs):
-        extra_params = {name: kwargs[name] for name in kwargs if kwargs[name] is not None}
-        params = {
-            'page': page,
-            'limit': limit,
-            **extra_params
-        }
-        return self.with_endpoint('api').request_get('blocks', params)
+    def all(self, query={}):
+        return self.with_endpoint('api').request_get('blocks', query)
 
     def get(self, block_id):
         return self.with_endpoint('api').request_get(f'blocks/{block_id}')
@@ -21,5 +15,7 @@ def first(self):
     def last(self):
         return self.with_endpoint('api').request_get('blocks/last')
 
-    def transactions(self, block_id, **kwargs):
-        return self.with_endpoint('api').request_get(f'blocks/{block_id}/transactions', kwargs)
+    def transactions(self, block_id, query={}):
+        return self.with_endpoint('api').request_get(
+            f'blocks/{block_id}/transactions', query
+        )

client/api/node.py

@@ -10,13 +10,14 @@ def syncing(self):
         return self.with_endpoint('api').request_get('node/syncing')
 
     def configuration(self):
-        return self.with_endpoint('api').request_get('node/configuration')
+        return self.with_endpoint('api').request_get(
+            'node/configuration'
+        )
 
     def crypto(self):
-        return self.with_endpoint('api').request_get('node/configuration/crypto')
+        return self.with_endpoint('api').request_get(
+            'node/configuration/crypto'
+        )
 
-    def fees(self, days=None):
-        params = {
-            'days': days,
-        }
-        return self.with_endpoint('api').request_get('node/fees', params)
+    def fees(self, query={}):
+        return self.with_endpoint('api').request_get('node/fees', query)

client/api/peers.py

@@ -3,19 +3,8 @@
 
 class Peers(Resource):
 
-    def all(self, os=None, status=None, port=None, version=None, order_by=None,
-            page=None, limit=100):
-
-        params = {
-            'os': os,
-            'status': status,
-            'port': port,
-            'version': version,
-            'orderBy': order_by,
-            'page': page,
-            'limit': limit,
-        }
-        return self.with_endpoint('api').request_get('peers', params)
+    def all(self, query={}):
+        return self.with_endpoint('api').request_get('peers', query)
 
     def get(self, ip):
         return self.with_endpoint('api').request_get(f'peers/{ip}')

client/api/receipts.py

@@ -2,8 +2,10 @@
 
 
 class Receipts(Resource):
-    def all(self, **kwargs):
-        return self.with_endpoint('api').request_get('receipts', kwargs)
+    def all(self, query={}):
+        return self.with_endpoint('api').request_get('receipts', query)
 
     def get(self, transaction_hash: str):
-        return self.with_endpoint('api').request_get(f'receipts/{transaction_hash}')
+        return self.with_endpoint('api').request_get(
+            f'receipts/{transaction_hash}'
+        )

client/api/rounds.py

@@ -3,11 +3,13 @@
 
 class Rounds(Resource):
 
-    def all(self, **kwargs):
-        return self.with_endpoint('api').request_get('rounds', kwargs)
+    def all(self, query={}):
+        return self.with_endpoint('api').request_get('rounds', query)
 
     def show(self, round_id):
         return self.with_endpoint('api').request_get(f'rounds/{round_id}')
 
     def validators(self, round_id):
-        return self.with_endpoint('api').request_get(f'rounds/{round_id}/validators')
+        return self.with_endpoint('api').request_get(
+            f'rounds/{round_id}/validators'
+        )

client/api/tokens.py

@@ -3,41 +3,25 @@
 
 class Tokens(Resource):
 
-    def all(self, page=None, limit=100):
-        params = {
-            'page': page,
-            'limit': limit,
-        }
-        return self.with_endpoint('api').request_get('tokens', params)
+    def all(self, query={}):
+        return self.with_endpoint('api').request_get('tokens', query)
 
     def get(self, address):
         return self.with_endpoint('api').request_get(
             f'tokens/{address}'
         )
 
-    def holders(self, address, page=None, limit=100):
-        params = {
-            'page': page,
-            'limit': limit,
-        }
+    def holders(self, address, query={}):
         return self.with_endpoint('api').request_get(
-            f'tokens/{address}/holders', params
+            f'tokens/{address}/holders', query
         )
 
-    def transfers_by_token(self, address, page=None, limit=100):
-        params = {
-            'page': page,
-            'limit': limit,
-        }
+    def transfers_by_token(self, address, query={}):
         return self.with_endpoint('api').request_get(
-            f'tokens/{address}/transfers', params
+            f'tokens/{address}/transfers', query
         )
 
-    def transfers(self, page=None, limit=100):
-        params = {
-            'page': page,
-            'limit': limit,
-        }
+    def transfers(self, query={}):
         return self.with_endpoint('api').request_get(
-            'tokens/transfers', params
+            'tokens/transfers', query
         )

client/api/transactions.py

@@ -3,32 +3,32 @@
 
 class Transactions(Resource):
 
-    def all(self, page=None, limit=100, **kwargs):
-        extra_params = {name: kwargs[name] for name in kwargs if kwargs[name] is not None}
-        params = {
-            'page': page,
-            'limit': limit,
-            **extra_params
-        }
-        return self.with_endpoint('api').request_get('transactions', params)
+    def all(self, query={}):
+        return self.with_endpoint('api').request_get(
+            'transactions', query
+        )
 
     def create(self, transactions):
-        return self.with_endpoint('transactions').request_post('transactions', data={'transactions': transactions})
+        return self.with_endpoint('transactions').request_post(
+            'transactions', data={'transactions': transactions}
+        )
 
     def get(self, transaction_id):
-        return self.with_endpoint('api').request_get(f'transactions/{transaction_id}')
+        return self.with_endpoint('api').request_get(
+            f'transactions/{transaction_id}'
+        )
 
-    def all_unconfirmed(self, limit=100, offset=None, **kwargs):
-        extra_params = {name: kwargs[name] for name in kwargs if kwargs[name] is not None}
-        params = {
-            'limit': limit,
-            'offset': offset,
-            **extra_params
-        }
-        return self.with_endpoint('api').request_get('transactions/unconfirmed', params)
+    def all_unconfirmed(self, query={}):
+        return self.with_endpoint('api').request_get(
+            'transactions/unconfirmed', query
+        )
 
     def get_unconfirmed(self, transaction_id):
-        return self.with_endpoint('api').request_get(f'transactions/unconfirmed/{transaction_id}')
+        return self.with_endpoint('api').request_get(
+            f'transactions/unconfirmed/{transaction_id}'
+        )
 
     def configuration(self):
-        return self.with_endpoint('transactions').request_get('configuration')
+        return self.with_endpoint('transactions').request_get(
+            'configuration'
+        )

client/api/validators.py

@@ -3,20 +3,20 @@
 
 class Validators(Resource):
 
-    def all(self, page=None, limit=100, **kwargs):
-        extra_params = {name: kwargs[name] for name in kwargs if kwargs[name] is not None}
-        params = {
-            'page': page,
-            'limit': limit,
-            **extra_params
-        }
-        return self.with_endpoint('api').request_get('validators', params)
+    def all(self, query={}):
+        return self.with_endpoint('api').request_get('validators', query)
 
     def get(self, validator_id):
-        return self.with_endpoint('api').request_get(f'validators/{validator_id}')
+        return self.with_endpoint('api').request_get(
+            f'validators/{validator_id}'
+        )
 
-    def blocks(self, validator_id, **kwargs):
-        return self.with_endpoint('api').request_get(f'validators/{validator_id}/blocks', kwargs)
+    def blocks(self, validator_id, query={}):
+        return self.with_endpoint('api').request_get(
+            f'validators/{validator_id}/blocks', query
+        )
 
-    def voters(self, validator_id, **kwargs):
-        return self.with_endpoint('api').request_get(f'validators/{validator_id}/voters', kwargs)
+    def voters(self, validator_id, query={}):
+        return self.with_endpoint('api').request_get(
+            f'validators/{validator_id}/voters', query
+        )

client/api/votes.py

@@ -3,12 +3,8 @@
 
 class Votes(Resource):
 
-    def all(self, page=None, limit=100):
-        params = {
-            'page': page,
-            'limit': limit,
-        }
-        return self.with_endpoint('api').request_get('votes', params)
+    def all(self, query={}):
+        return self.with_endpoint('api').request_get('votes', query)
 
     def get(self, vote_id):
         return self.with_endpoint('api').request_get(f'votes/{vote_id}')

client/api/wallets.py

@@ -3,64 +3,43 @@
 
 class Wallets(Resource):
 
-    def all(self, page=None, limit=100):
-        params = {
-            'page': page,
-            'limit': limit,
-        }
-        return self.with_endpoint('api').request_get('wallets', params)
+    def all(self, query={}):
+        return self.with_endpoint('api').request_get('wallets', query)
 
-    def top(self, page=None, limit=100):
-        params = {
-            'page': page,
-            'limit': limit
-        }
-        return self.with_endpoint('api').request_get('wallets/top', params)
+    def top(self, query={}):
+        return self.with_endpoint('api').request_get('wallets/top', query)
 
     def get(self, wallet_id):
-        return self.with_endpoint('api').request_get(f'wallets/{wallet_id}')
-
-    def transactions(self, wallet_id, page=None, limit=100, **kwargs):
-        extra_params = {name: kwargs[name] for name in kwargs if kwargs[name] is not None}
-        params = {
-            'page': page,
-            'limit': limit,
-            **extra_params
-        }
-        return self.with_endpoint('api').request_get(f'wallets/{wallet_id}/transactions', params)
-
-    def sent_transactions(self, wallet_id, page=None, limit=100):
-        params = {
-            'page': page,
-            'limit': limit,
-        }
-        return self.with_endpoint('api').request_get(f'wallets/{wallet_id}/transactions/sent', params)
-
-    def received_transactions(self, wallet_id, page=None, limit=100):
-        params = {
-            'page': page,
-            'limit': limit,
-        }
-        return self.with_endpoint('api').request_get(f'wallets/{wallet_id}/transactions/received', params)
-
-    def votes(self, wallet_id, page=None, limit=100):
-        params = {
-            'page': page,
-            'limit': limit,
-        }
-        return self.with_endpoint('api').request_get(f'wallets/{wallet_id}/votes', params)
-
-    def tokens(self, wallet_id, page=None, limit=100):
-        params = {
-            'page': page,
-            'limit': limit,
-        }
-        return self.with_endpoint('api').request_get(f'wallets/{wallet_id}/tokens', params)
-
-    def tokens_for(self, addresses, page=None, limit=100):
-        params = {
-            'addresses': addresses,
-            'page': page,
-            'limit': limit,
-        }
-        return self.with_endpoint('api').request_get('wallets/tokens', params)
+        return self.with_endpoint('api').request_get(
+            f'wallets/{wallet_id}'
+        )
+
+    def transactions(self, wallet_id, query={}):
+        return self.with_endpoint('api').request_get(
+            f'wallets/{wallet_id}/transactions', query
+        )
+
+    def sent_transactions(self, wallet_id, query={}):
+        return self.with_endpoint('api').request_get(
+            f'wallets/{wallet_id}/transactions/sent', query
+        )
+
+    def received_transactions(self, wallet_id, query={}):
+        return self.with_endpoint('api').request_get(
+            f'wallets/{wallet_id}/transactions/received', query
+        )
+
+    def votes(self, wallet_id, query={}):
+        return self.with_endpoint('api').request_get(
+            f'wallets/{wallet_id}/votes', query
+        )
+
+    def tokens(self, wallet_id, query={}):
+        return self.with_endpoint('api').request_get(
+            f'wallets/{wallet_id}/tokens', query
+        )
+
+    def tokens_for(self, query={}):
+        return self.with_endpoint('api').request_get(
+            'wallets/tokens', query
+        )

tests/api/test_api_nodes.py

@@ -1,4 +1,3 @@
-import json
 import responses
 from client import ArkClient
 
@@ -14,7 +13,9 @@ def test_api_nodes_calls_correct_url():
     client = ArkClient('http://127.0.0.1:4002/api')
     client.api_nodes.all()
     assert len(responses.calls) == 1
-    assert responses.calls[0].request.url == 'http://127.0.0.1:4002/api/api-nodes'
+    assert responses.calls[0].request.url == (
+        'http://127.0.0.1:4002/api/api-nodes'
+    )
 
 
 def test_api_nodes_calls_correct_url_with_params():
@@ -26,8 +27,12 @@ def test_api_nodes_calls_correct_url_with_params():
     )
 
     client = ArkClient('http://127.0.0.1:4002/api')
-    client.api_nodes.all(query_param1='value1', query_param2='value2')
+    client.api_nodes.all({
+        'query_param1': 'value1',
+        'query_param2': 'value2',
+    })
     assert len(responses.calls) == 1
-    assert responses.calls[0].request.url.startswith('http://127.0.0.1:4002/api/api-nodes?')
-    assert 'query_param1=value1' in responses.calls[0].request.url
-    assert 'query_param2=value2' in responses.calls[0].request.url
+    url = responses.calls[0].request.url
+    assert url.startswith('http://127.0.0.1:4002/api/api-nodes?')
+    assert 'query_param1=value1' in url
+    assert 'query_param2=value2' in url