kamikazechaser/cic-internal-integration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify conditional scope

Browse Source
This commit is contained in:
nolash 2021-04-14 08:11:06 +02:00
parent 689f04c1be
commit 6535760abb
Signed by untrusted user who does not match committer: lash
GPG Key ID: 21D2E7BB88C2A746
1 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/cic-eth/cic_eth/runnable/daemons/filters/callback.py
View File

@ -20,7 +20,8 @@ logg = logging.getLogger().getChild(__name__)
def parse_transfer(tx): def parse_transfer(tx):
if tx.payload: if not tx.payload:
return (None, None)
r = ERC20.parse_transfer_request(tx.payload) r = ERC20.parse_transfer_request(tx.payload)
transfer_data = {} transfer_data = {}
transfer_data['to'] = r[0] transfer_data['to'] = r[0]
@ -28,12 +29,11 @@ def parse_transfer(tx):
transfer_data['from'] = tx['from'] transfer_data['from'] = tx['from']
transfer_data['token_address'] = tx['to'] transfer_data['token_address'] = tx['to']
return ('transfer', transfer_data) return ('transfer', transfer_data)
else:
pass
def parse_transferfrom(tx): def parse_transferfrom(tx):
if tx.payload: if not tx.payload:
return (None, None)
r = ERC20.parse_transfer_request(tx.payload) r = ERC20.parse_transfer_request(tx.payload)
transfer_data = {} transfer_data = {}
transfer_data['from'] = r[0] transfer_data['from'] = r[0]
@ -41,12 +41,11 @@ def parse_transferfrom(tx):
transfer_data['value'] = r[2] transfer_data['value'] = r[2]
transfer_data['token_address'] = tx['to'] transfer_data['token_address'] = tx['to']
return ('transferfrom', transfer_data) return ('transferfrom', transfer_data)
else:
pass
def parse_giftto(tx): def parse_giftto(tx):
if tx.payload: if not tx.payload:
return (None, None)
r = Faucet.parse_give_to_request(tx.payload) r = Faucet.parse_give_to_request(tx.payload)
transfer_data = {} transfer_data = {}
transfer_data['to'] = r[0] transfer_data['to'] = r[0]
@ -54,8 +53,6 @@ def parse_giftto(tx):
transfer_data['from'] = tx['from'] transfer_data['from'] = tx['from']
transfer_data['token_address'] = tx['to'] transfer_data['token_address'] = tx['to']
return ('tokengift', transfer_data) return ('tokengift', transfer_data)
else:
pass
class CallbackFilter(SyncFilter): class CallbackFilter(SyncFilter):
@ -110,7 +107,8 @@ class CallbackFilter(SyncFilter):
try: try:
if tx: if tx:
(transfer_type, transfer_data) = parser(tx) (transfer_type, transfer_data) = parser(tx)
break if transfer_type == None:
continue
else: else:
pass pass
except RequestMismatchException: except RequestMismatchException: