Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
5984c19
cherrypick part of changes
Dec 1, 2021
613a469
create indexer.py
Dec 1, 2021
c0d0e6c
remove solana_receipts_update.py
Dec 1, 2021
3f6b5c4
Cherry pick files from old branch
Dec 1, 2021
0790298
add requirement
Dec 1, 2021
340c854
fix refactoring issues
Dec 1, 2021
7449b38
Fix inspection issues
Dec 1, 2021
b3dacfa
fix last issue
Dec 1, 2021
a50cd47
Merge branch '336_indexer_refactoring' into 337_сreate_base_airdroppe…
Dec 1, 2021
2b8f879
Merge remote-tracking branch 'origin/develop' into 337_сreate_base_ai…
Dec 2, 2021
f51f2ed
simplify tests
Dec 2, 2021
6678924
add test
Dec 2, 2021
5d454b7
Merge remote-tracking branch 'origin/develop' into 337_сreate_base_ai…
Dec 3, 2021
add136a
add price provider
Dec 1, 2021
9a4be44
fix PriceProvider, add test
Dec 1, 2021
07aaca8
Add tests. Check worn on all nets
Dec 1, 2021
7a46c12
refactoring
Dec 1, 2021
2fc1424
integrate price_provider into airdropper
Dec 2, 2021
d157d67
integrate price provider
Dec 2, 2021
8a6abfd
use new faucet method
Dec 3, 2021
3d4dec9
add new parameter to airdropper main
Dec 3, 2021
5c29832
Test discriptions for airdropper
Dec 3, 2021
6a4efdc
Comments for price provider tests
Dec 3, 2021
14aeeed
remove unnecessary comment
Dec 3, 2021
bd35791
Merge remote-tracking branch 'origin/develop' into 338_create_sol_pri…
Dec 3, 2021
ff1f557
Merge remote-tracking branch 'origin/develop' into 338_create_sol_pri…
Dec 6, 2021
c28ca8e
fix error
Dec 6, 2021
8c68755
Merge remote-tracking branch 'origin/develop' into 338_create_sol_pri…
Dec 7, 2021
5325895
Merge remote-tracking branch 'origin/develop' into 338_create_sol_pri…
Dec 8, 2021
a1cbad2
fix airdropper run
Dec 10, 2021
4ed6d78
remove duplicated code
Dec 15, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
integrate price provider
  • Loading branch information
ivanl committed Dec 3, 2021
commit d157d673371e6062c80fd56d5d314fc728be158b
4 changes: 1 addition & 3 deletions proxy/indexer/airdropper.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,7 @@ def _check_transfer(self, account_keys, create_token_acc, token_transfer) -> boo

def _airdrop_to(self, create_acc):
eth_address = "0x" + bytearray(base58.b58decode(create_acc['data'])[20:][:20]).hex()


if self.airdrop_ready.get(eth_address) is not None: # transaction already processed
if eth_address in self.airdrop_ready: # transaction already processed
return

sol_price_usd = self.price_provider.get_price('SOL/USD')
Expand Down
64 changes: 53 additions & 11 deletions proxy/testing/test_airdropper.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import unittest
from proxy.testing.mock_server import MockServer
from proxy.indexer.airdropper import Airdropper
from proxy.indexer.airdropper import Airdropper, AIRDROP_AMOUNT_SOL, NEON_PRICE_USD
from proxy.indexer.sql_dict import SQLDict
from proxy.indexer.price_provider import PriceProvider
import time
from flask import request, Response
from unittest.mock import MagicMock, patch, call, ANY
Expand Down Expand Up @@ -47,7 +48,6 @@ def setUpClass(cls) -> None:
print("testing indexer in airdropper mode")
cls.address = 'localhost'
cls.faucet_port = 3333
cls.airdrop_amount = 10

cls.faucet = MockFaucet(cls.faucet_port)
cls.faucet.start()
Expand All @@ -59,7 +59,6 @@ def setUpClass(cls) -> None:
cls.evm_loader_id,
f'http://{cls.address}:{cls.faucet_port}',
cls.wrapper_whitelist,
cls.airdrop_amount,
'INFO')


Expand All @@ -68,25 +67,53 @@ def tearDownClass(cls) -> None:
cls.faucet.shutdown_server()
cls.faucet.join()


@patch.object(PriceProvider, 'get_price')
@patch.object(SQLDict, '__setitem__')
@patch.object(SQLDict, '__contains__')
def test_success_process_trx_with_one_airdrop(self,
mock_sql_dict_contains,
mock_sql_dict_setitem):
mock_sql_dict_setitem,
mock_get_price):
print("\n\nShould airdrop to new address - one target in transaction")

sol_price = 341
airdrop_amount = (AIRDROP_AMOUNT_SOL * sol_price) / NEON_PRICE_USD
mock_get_price.side_effect = [sol_price]
mock_sql_dict_contains.side_effect = [False] # new eth address
self.faucet.request_eth_token_mock.side_effect = [Response("{}", status=200, mimetype='application/json')]

self.airdropper.process_trx_airdropper_mode(pre_token_airdrop_trx1)

mock_sql_dict_contains.assert_called_once_with(token_airdrop_address1)
mock_sql_dict_setitem.assert_has_calls([call(token_airdrop_address1, ANY)])
json_req = {'wallet': token_airdrop_address1, 'amount': self.airdrop_amount}
mock_get_price.assert_called_once_with('SOL/USD')
json_req = {'wallet': token_airdrop_address1, 'amount': airdrop_amount}
self.faucet.request_eth_token_mock.assert_called_once_with(json_req)
self.faucet.request_eth_token_mock.reset_mock()


@patch.object(PriceProvider, 'get_price')
@patch.object(SQLDict, '__setitem__')
@patch.object(SQLDict, '__contains__')
def test_failed_process_trx_with_one_airdrop_price_provider_error(self,
mock_sql_dict_contains,
mock_sql_dict_setitem,
mock_get_price):
print("\n\nShould not airdrop to new address due to price provider error")

mock_get_price.side_effect = [None]
mock_sql_dict_contains.side_effect = [False] # new eth address
self.faucet.request_eth_token_mock.side_effect = [Response("{}", status=200, mimetype='application/json')]

self.airdropper.process_trx_airdropper_mode(pre_token_airdrop_trx1)

mock_sql_dict_contains.assert_called_once_with(token_airdrop_address1)
mock_sql_dict_setitem.assert_not_called()
mock_get_price.assert_called_once_with('SOL/USD')
self.faucet.request_eth_token_mock.assert_not_called()
self.faucet.request_eth_token_mock.reset_mock()


@patch.object(Airdropper, '_is_allowed_wrapper_contract')
@patch.object(SQLDict, '__setitem__')
@patch.object(SQLDict, '__contains__')
Expand All @@ -105,20 +132,27 @@ def test_failed_airdrop_contract_not_in_whitelist(self,
self.faucet.request_eth_token_mock.reset_mock()


@patch.object(PriceProvider, 'get_price')
@patch.object(SQLDict, '__setitem__')
@patch.object(SQLDict, '__contains__')
def test_faucet_failure(self,
mock_sql_dict_contains,
mock_sql_dict_setitem):
mock_sql_dict_setitem,
mock_get_price):
print("\n\nShould not add address to processed list due to faucet error")

sol_price = 341
airdrop_amount = (AIRDROP_AMOUNT_SOL * sol_price) / NEON_PRICE_USD
mock_get_price.side_effect = [sol_price]
mock_sql_dict_contains.side_effect = [False] # new eth address
self.faucet.request_eth_token_mock.side_effect = [Response("{}", status=400, mimetype='application/json')]

self.airdropper.process_trx_airdropper_mode(pre_token_airdrop_trx1)

mock_sql_dict_contains.assert_called_once_with(token_airdrop_address1)
mock_get_price.assert_called_once_with('SOL/USD')
mock_sql_dict_setitem.assert_not_called()
json_req = {'wallet': token_airdrop_address1, 'amount': self.airdrop_amount}
json_req = {'wallet': token_airdrop_address1, 'amount': airdrop_amount}
self.faucet.request_eth_token_mock.assert_called_once_with(json_req)
self.faucet.request_eth_token_mock.reset_mock()

Expand All @@ -139,12 +173,19 @@ def test_process_trx_with_one_airdrop_for_already_processed_address(self,
self.faucet.request_eth_token_mock.reset_mock()


@patch.object(PriceProvider, 'get_price')
@patch.object(SQLDict, '__setitem__')
@patch.object(SQLDict, '__contains__')
def test_complex_transation(self,
mock_sql_dict_contains,
mock_sql_dict_setitem):
mock_sql_dict_setitem,
mock_get_price):
print("\n\nShould airdrop to several targets in one transaction")
sol_price1 = 341
sol_price2 = 225
airdrop_amount1 = (AIRDROP_AMOUNT_SOL * sol_price1) / NEON_PRICE_USD
airdrop_amount2 = (AIRDROP_AMOUNT_SOL * sol_price2) / NEON_PRICE_USD
mock_get_price.side_effect = [sol_price1, sol_price2]
mock_sql_dict_contains.side_effect = [False, False] # both targets are new
self.faucet.request_eth_token_mock.side_effect = [Response("{}", status=200, mimetype='application/json'),
Response("{}", status=200, mimetype='application/json')]
Expand All @@ -153,10 +194,11 @@ def test_complex_transation(self,

mock_sql_dict_contains.assert_has_calls([call(token_airdrop_address3),
call(token_airdrop_address2)])
mock_get_price.assert_has_calls([call('SOL/USD')]* 2)
mock_sql_dict_setitem.assert_has_calls([call(token_airdrop_address3, ANY),
call(token_airdrop_address2, ANY)])
json_req1 = {'wallet': token_airdrop_address2, 'amount': self.airdrop_amount}
json_req2 = {'wallet': token_airdrop_address3, 'amount': self.airdrop_amount}
json_req1 = {'wallet': token_airdrop_address2, 'amount': airdrop_amount2}
json_req2 = {'wallet': token_airdrop_address3, 'amount': airdrop_amount1}
self.faucet.request_eth_token_mock.assert_has_calls([call(json_req2), call(json_req1)])
self.faucet.request_eth_token_mock.reset_mock()

Expand Down