Skip to content

Commit 32445d6

Browse files
committed
update get_event_result
1 parent 48d4dae commit 32445d6

File tree

1 file changed

+14
-20
lines changed

1 file changed

+14
-20
lines changed

tronapi/main.py

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
:license: MIT License
1616
"""
1717

18-
1918
import ecdsa
2019
from eth_utils import apply_to_return_value, to_hex
2120
from hexbytes import HexBytes
@@ -178,24 +177,21 @@ def default_address(self, address: str) -> None:
178177
'base58': _base58
179178
})
180179

181-
def get_event_result(self,
182-
contract_address=None,
183-
since=0,
184-
event_name=None,
185-
block_number=None,
186-
size=20,
187-
page=1):
180+
def get_event_result(self, **kwargs):
188181
"""Will return all events matching the filters.
189182
190183
Args:
191-
contract_address (str): Address to query for events.
192-
since (int): Filter for events since certain timestamp.
193-
event_name (str): Name of the event to filter by.
194-
block_number (str): Specific block number to query
195-
size (int): size
196-
page (int): page str
184+
kwargs (any): List parameters
197185
"""
198186

187+
# Check the most necessary parameters
188+
contract_address = kwargs.setdefault('contract_address', self.default_address.hex)
189+
event_name = kwargs.setdefault('event_name', 'Notify')
190+
since_timestamp = kwargs.setdefault('since_timestamp', 0)
191+
block_number = kwargs.setdefault('block_number', '')
192+
size = kwargs.setdefault('size', 20)
193+
page = kwargs.setdefault('page', 1)
194+
199195
if not self.isAddress(contract_address):
200196
raise InvalidTronError('Invalid contract address provided')
201197

@@ -208,27 +204,25 @@ def get_event_result(self,
208204
if not is_integer(page):
209205
raise ValueError('Invalid size provided')
210206

211-
if not is_integer(since):
207+
if not is_integer(since_timestamp):
212208
raise ValueError('Invalid sinceTimestamp provided')
213209

210+
# If the size exceeds 200, displays an error
214211
if size > 200:
215212
raise ValueError('Defaulting to maximum accepted size: 200')
216213

214+
# We collect all parameters in one array
217215
route_params = []
218-
219216
if contract_address:
220217
route_params.append(contract_address)
221-
222218
if event_name:
223219
route_params.append(event_name)
224-
225220
if block_number:
226221
route_params.append(block_number)
227222

228223
route = '/'.join(route_params)
229-
230224
return self.manager.request("/event/contract/{0}?since={1}&size={2}&page={3}"
231-
.format(route, since, size, page), method='get')
225+
.format(route, since_timestamp, size, page), method='get')
232226

233227
def get_event_transaction_id(self, tx_id):
234228
"""Will return all events within a transactionID.

0 commit comments

Comments
 (0)