Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust the integration test (faucet-refactoring) #433

Merged
merged 9 commits into from
Jan 12, 2022
Merged

Adjust the integration test (faucet-refactoring) #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f208c7a
Adjust the integration test (faucet-refactoring)
vakond Jan 5, 2022
ae72af7
Merge branch 'develop' into faucet-refactoring
vakond Jan 5, 2022
ed9bb25
Merge branch 'develop' into faucet-refactoring
vakond Jan 7, 2022
d4600b5
Try fix envs for faucet (faucet-refactoring)
vakond Jan 10, 2022
249e396
Try set temporary image (faucet-refactoring)
vakond Jan 10, 2022
f03297b
Unset temporary image (faucet-refactoring)
vakond Jan 10, 2022
7a7e156
Bugfix (faucet-refactoring)
vakond Jan 11, 2022
150683d
Refactoring (faucet-refactoring)
vakond Jan 11, 2022
fec8470
Bugfix (faucet-refactoring)
vakond Jan 11, 2022
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
8 changes: 4 additions & 4 deletions proxy/docker-compose-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,15 @@ services:
image: neonlabsorg/proxy:${REVISION}
environment:
FAUCET_RPC_PORT: 3333
FAUCET_RPC_ALLOWED_ORIGINS: http://airdropper
FAUCET_RPC_ALLOWED_ORIGINS: '["http://airdropper"]'
FAUCET_WEB3_ENABLE: 'false'
WEB3_RPC_URL: http://proxy:9090/solana
WEB3_RPC_URL: 'http://proxy:9090/solana'
WEB3_PRIVATE_KEY: ''
NEON_ERC20_TOKENS:
NEON_ERC20_MAX_AMOUNT: 1000
FAUCET_SOLANA_ENABLE: 'true'
SOLANA_URL: http://solana:8899
NEON_OPERATOR_KEYFILE: /root/.config/solana/id.json
SOLANA_URL: 'http://solana:8899'
NEON_OPERATOR_KEYFILE: '/root/.config/solana/id.json'
NEON_ETH_MAX_AMOUNT: 10
TEST_FAUCET_INIT_NEON_BALANCE: 10000
hostname: faucet
Expand Down
11 changes: 6 additions & 5 deletions proxy/testing/test_neon_faucet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,13 @@ def deploy_erc20_token(self, name):
return tx_deploy_receipt.contractAddress

def start_faucet(self):
os.environ['FAUCET_RPC_BIND'] = '0.0.0.0'
os.environ['FAUCET_RPC_PORT'] = '3333'
os.environ['FAUCET_RPC_ALLOWED_ORIGINS'] = 'http://localhost'
os.environ['FAUCET_RPC_ALLOWED_ORIGINS'] = '["http://localhost"]'
os.environ['FAUCET_WEB3_ENABLE'] = 'true'
os.environ['WEB3_RPC_URL'] = proxy_url
os.environ['WEB3_PRIVATE_KEY'] = admin.key.hex()
os.environ['NEON_ERC20_TOKENS'] = self.token_a + ',' + self.token_b
os.environ['NEON_ERC20_TOKENS'] = '["' + self.token_a + '", "' + self.token_b + '"]'
os.environ['NEON_ERC20_MAX_AMOUNT'] = '1000'
os.environ['FAUCET_SOLANA_ENABLE'] = 'true'
os.environ['SOLANA_URL'] = os.environ.get('SOLANA_URL', 'http://solana:8899')
Expand Down Expand Up @@ -203,9 +204,9 @@ def test_neon_faucet_01_neon_in_galans(self):
self.assertEqual(balance_after - balance_before, 99999000000000)

# @unittest.skip("a.i.")
def test_neon_faucet_02_eth_token(self):
def test_neon_faucet_02_neon(self):
print()
url = 'http://localhost:{}/request_eth_token'.format(os.environ['FAUCET_RPC_PORT'])
url = 'http://localhost:{}/request_neon'.format(os.environ['FAUCET_RPC_PORT'])
# First request - trigger creation of the account without real transfer
data = '{"wallet": "' + user.address + '", "amount": 0}'
r = requests.post(url, data=data)
Expand All @@ -229,7 +230,7 @@ def test_neon_faucet_02_eth_token(self):
# @unittest.skip("a.i.")
def test_neon_faucet_03_erc20_tokens(self):
print()
url = 'http://localhost:{}/request_erc20_tokens'.format(os.environ['FAUCET_RPC_PORT'])
url = 'http://localhost:{}/request_erc20'.format(os.environ['FAUCET_RPC_PORT'])
a_before = self.get_token_balance(self.token_a, user.address)
b_before = self.get_token_balance(self.token_b, user.address)
print('token A balance before:', a_before)
Expand Down