Skip to content

Commit 2a04351

Browse files
Highjhackerfaustbrian
authored andcommitted
fix: set the limit parameter to 100 to match v1 defaults (#61)
1 parent e3575c6 commit 2a04351

File tree

10 files changed

+17
-17
lines changed

10 files changed

+17
-17
lines changed

client/api/one/accounts.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def delegates_fee(self):
1919
def get(self, address):
2020
return self.request_get('accounts', {'address': address})
2121

22-
def all(self, limit=20, offset=None):
22+
def all(self, limit=100, offset=None):
2323
if limit > 100:
2424
raise ArkParameterException('Maximum number of objects to return is 100')
2525
params = {
@@ -28,7 +28,7 @@ def all(self, limit=20, offset=None):
2828
}
2929
return self.request_get('accounts/getAllAccounts', params)
3030

31-
def top(self, limit=20, offset=None):
31+
def top(self, limit=100, offset=None):
3232
if limit > 100:
3333
raise ArkParameterException('Maximum number of objects to return is 100')
3434
params = {

client/api/one/blocks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class Blocks(Resource):
77
def get(self, block_id):
88
return self.request_get('blocks/get', {'id': block_id})
99

10-
def all(self, limit=20, offset=None, order_by=None, height=None, previous_block=None, number_of_transactions=None,
10+
def all(self, limit=100, offset=None, order_by=None, height=None, previous_block=None, number_of_transactions=None,
1111
total_amount=None, total_fee=None, reward=None, payload_hash=None, generator_public_key=None):
1212
if limit > 100:
1313
raise ArkParameterException('Maximum number of objects to return is 100')

client/api/one/delegates.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class Delegate(Resource):
77
def count(self):
88
return self.request_get('delegates/count')
99

10-
def search(self, query, limit=20, offset=None):
10+
def search(self, query, limit=100, offset=None):
1111
if limit > 100:
1212
raise ArkParameterException('Maximum number of objects to return is 100')
1313
params = {
@@ -30,9 +30,9 @@ def get(self, public_key=None, username=None):
3030
}
3131
return self.request_get('delegates/get', params)
3232

33-
def all(self, limit=20, offset=None, order_by=None):
33+
def all(self, limit=51, offset=None, order_by=None):
3434
if limit > 100:
35-
raise ArkParameterException('Maximum number of objects to return is 100')
35+
raise ArkParameterException('Maximum number of objects to return is 51')
3636

3737
params = {
3838
'limit': limit,

client/api/one/peers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def get(self, ip, port):
1111
}
1212
return self.request_get('peers/get', params)
1313

14-
def all(self, limit=20, offset=None):
14+
def all(self, limit=100, offset=None):
1515
if limit > 100:
1616
raise ArkParameterException('Maximum number of objects to return is 100')
1717
params = {

client/api/one/transactions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class Transactions(Resource):
77
def get(self, transaction_id):
88
return self.request_get('transactions/get', {'id': transaction_id})
99

10-
def all(self, limit=20, offset=None, block_id=None, type=None, order_by=None, sender_public_key=None,
10+
def all(self, limit=100, offset=None, block_id=None, type=None, order_by=None, sender_public_key=None,
1111
vendor_field=None, owner_public_key=None, owner_address=None, sender_id=None, recipient_id=None,
1212
amount=None, fee=None):
1313
if limit > 100:
@@ -32,7 +32,7 @@ def all(self, limit=20, offset=None, block_id=None, type=None, order_by=None, se
3232
def get_unconfirmed(self, transaction_id):
3333
return self.request_get('transactions/unconfirmed/get', {'id': transaction_id})
3434

35-
def all_unconfirmed(self, limit=20, offset=None):
35+
def all_unconfirmed(self, limit=100, offset=None):
3636
if limit > 100:
3737
raise ArkParameterException('Maximum number of objects to return is 100')
3838
params = {

tests/api/one/test_accounts.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def test_all_calls_correct_url_with_default_params():
9292
client.accounts.all()
9393
assert len(responses.calls) == 1
9494
assert responses.calls[0].request.url == (
95-
'http://127.0.0.1:4002/accounts/getAllAccounts?limit=20'
95+
'http://127.0.0.1:4002/accounts/getAllAccounts?limit=100'
9696
)
9797

9898

@@ -125,7 +125,7 @@ def test_top_calls_correct_url_with_default_params():
125125
client = ArkClient('http://127.0.0.1:4002', api_version='v1')
126126
client.accounts.top()
127127
assert len(responses.calls) == 1
128-
assert responses.calls[0].request.url == 'http://127.0.0.1:4002/accounts/top?limit=20'
128+
assert responses.calls[0].request.url == 'http://127.0.0.1:4002/accounts/top?limit=100'
129129

130130

131131
def test_top_calls_correct_url_with_passed_in_params():

tests/api/one/test_blocks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def test_all_calls_correct_url_with_default_params():
3131
client = ArkClient('http://127.0.0.1:4002', api_version='v1')
3232
client.blocks.all()
3333
assert len(responses.calls) == 1
34-
assert responses.calls[0].request.url == 'http://127.0.0.1:4002/blocks?limit=20'
34+
assert responses.calls[0].request.url == 'http://127.0.0.1:4002/blocks?limit=100'
3535

3636

3737
def test_all_calls_correct_url_with_passed_in_params():

tests/api/one/test_delegates.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def test_search_calls_correct_url_with_default_params():
3131
assert len(responses.calls) == 1
3232
assert responses.calls[0].request.url.startswith('http://127.0.0.1:4002/delegates/search?')
3333
assert 'q=my-query' in responses.calls[0].request.url
34-
assert 'limit=20' in responses.calls[0].request.url
34+
assert 'limit=100' in responses.calls[0].request.url
3535

3636

3737
def test_search_calls_correct_url_with_passed_in_params():
@@ -94,7 +94,7 @@ def test_all_calls_correct_url_with_default_params():
9494
client = ArkClient('http://127.0.0.1:4002', api_version='v1')
9595
client.delegates.all()
9696
assert len(responses.calls) == 1
97-
assert responses.calls[0].request.url == 'http://127.0.0.1:4002/delegates?limit=20'
97+
assert responses.calls[0].request.url == 'http://127.0.0.1:4002/delegates?limit=51'
9898

9999

100100
def test_all_calls_correct_url_with_passed_in_params():

tests/api/one/test_peers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def test_all_calls_correct_url_with_default_params():
3131
client = ArkClient('http://127.0.0.1:4002', api_version='v1')
3232
client.peers.all()
3333
assert len(responses.calls) == 1
34-
assert responses.calls[0].request.url == 'http://127.0.0.1:4002/peers?limit=20'
34+
assert responses.calls[0].request.url == 'http://127.0.0.1:4002/peers?limit=100'
3535

3636

3737
def test_all_calls_correct_url_with_passed_in_params():

tests/api/one/test_transactions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def test_all_calls_correct_url_with_default_params():
3131
client = ArkClient('http://127.0.0.1:4002', api_version='v1')
3232
client.transactions.all()
3333
assert len(responses.calls) == 1
34-
assert responses.calls[0].request.url == 'http://127.0.0.1:4002/transactions?limit=20'
34+
assert responses.calls[0].request.url == 'http://127.0.0.1:4002/transactions?limit=100'
3535

3636

3737
def test_all_calls_correct_url_with_passed_in_params():
@@ -101,7 +101,7 @@ def test_all_unconfirmed_calls_correct_url_with_default_params():
101101
client.transactions.all_unconfirmed()
102102
assert len(responses.calls) == 1
103103
assert responses.calls[0].request.url == (
104-
'http://127.0.0.1:4002/transactions/unconfirmed?limit=20'
104+
'http://127.0.0.1:4002/transactions/unconfirmed?limit=100'
105105
)
106106

107107

0 commit comments

Comments
 (0)