Skip to content

Commit

Permalink
fix unit-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@BulatSaif
BulatSaif committed Aug 24, 2023
1 parent eb3d8bf commit f48bca3
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 26 deletions.
6 changes: 3 additions & 3 deletions tests/balance_utils_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class BalanceUtilsTest(unittest.TestCase):
def setUp(self):
# Start Alice validator
self.alice_validator = DockerContainer('parity/polkadot:latest')
self.alice_validator.with_command('--chain rococo-local --validator --alice --unsafe-ws-external --rpc-cors=all --rpc-methods=unsafe')
self.alice_validator.with_command('--chain rococo-local --validator --alice --unsafe-rpc-external --rpc-cors=all --rpc-methods=unsafe')
self.alice_validator.with_exposed_ports(9944)
self.alice_validator.start()
self.alice_validator_rpc_ws_url = 'ws://{}:{}'.format(self.alice_validator.get_container_host_ip(),
Expand All @@ -22,10 +22,10 @@ def setUp(self):
# Start Bob validator
self.bob_validator = DockerContainer('parity/polkadot:latest')
self.bob_validator.with_command('--chain rococo-local --validator --bob --unsafe-rpc-external --rpc-cors=all --rpc-methods=unsafe')
self.bob_validator.with_exposed_ports(9933)
self.bob_validator.with_exposed_ports(9944)
self.bob_validator.start()
self.bob_validator_http_url = 'http://{}:{}'.format(self.bob_validator.get_container_host_ip(),
self.bob_validator.get_exposed_port(9933))
self.bob_validator.get_exposed_port(9944))
# prepare keys
self.alice_key = '0xe5be9a5092b81bca64be81d212e7f2f9eba183bb7a90954f7b76361f6edb5c0a'
self.alice_key_address = '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY'
Expand Down
5 changes: 1 addition & 4 deletions tests/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ services:
image: *polkadotimage
ports:
- "9944"
- "9933"
volumes: *chainspec
depends_on: &depends_on_chainspec
- chainspec
Expand All @@ -32,15 +31,13 @@ services:
command: --chain=/chainspec/rococo-local.json --bob --tmp

collator:
image: parity/polkadot-collator:latest
image: parity/polkadot-parachain:latest
volumes: *chainspec
ports:
- "9944"
- "9933"
depends_on: *depends_on_chainspec
command: >
--chain shell
--unsafe-ws-external
--unsafe-rpc-external
--rpc-cors=all
--tmp
Expand Down
6 changes: 3 additions & 3 deletions tests/node_utils_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ class NodeUtilsTest(unittest.TestCase):

def setUp(self):
self.polkadot = DockerContainer('parity/polkadot:latest')
self.polkadot.with_command('--dev --validator --node-key 4b067400ba508d783ccf86b73aa825ebafea96c95ebdff3f307ab6dd854f0852 --unsafe-rpc-external --unsafe-ws-external --rpc-methods=unsafe --rpc-cors=all')
self.polkadot.with_exposed_ports(9933, 9944)
self.polkadot.with_command('--dev --validator --node-key 4b067400ba508d783ccf86b73aa825ebafea96c95ebdff3f307ab6dd854f0852 --unsafe-rpc-external --unsafe-rpc-external --rpc-methods=unsafe --rpc-cors=all')
self.polkadot.with_exposed_ports(9944)
self.polkadot.start()
self.polkadot_rpc_http_url = 'http://{}:{}'.format(self.polkadot.get_container_host_ip(), self.polkadot.get_exposed_port(9933))
self.polkadot_rpc_http_url = 'http://{}:{}'.format(self.polkadot.get_container_host_ip(), self.polkadot.get_exposed_port(9944))
self.polkadot_rpc_ws_url = 'ws://{}:{}'.format(self.polkadot.get_container_host_ip(), self.polkadot.get_exposed_port(9944))
wait_for_http_ready(self.polkadot_rpc_http_url + '/health')
time.sleep(10)
Expand Down
4 changes: 2 additions & 2 deletions tests/parachain_manager_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ def tearDownClass(cls):
def setUp(self):
self.compose = ParachainManagerTest.compose
self.relay_rpc_ws_url = 'ws://172.17.0.1:{}'.format(self.compose.get_service_port("node_alice", 9944))
self.relay_rpc_http_url = 'http://172.17.0.1:{}'.format(self.compose.get_service_port("node_alice", 9933))
self.relay_rpc_http_url = 'http://172.17.0.1:{}'.format(self.compose.get_service_port("node_alice", 9944))
self.parachain_rpc_ws_url = 'ws://172.17.0.1:{}'.format(self.compose.get_service_port("collator", 9944))
self.parachain_rpc_http_url = 'http://172.17.0.1:{}'.format(self.compose.get_service_port("collator", 9933))
self.parachain_rpc_http_url = 'http://172.17.0.1:{}'.format(self.compose.get_service_port("collator", 9944))
wait_for_http_ready(self.relay_rpc_http_url + '/health')
wait_for_http_ready(self.parachain_rpc_http_url + '/health')
self.parachain_substrate = SubstrateInterface(url=self.parachain_rpc_ws_url)
Expand Down
6 changes: 3 additions & 3 deletions tests/session_keys_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ class NodeSessionKeysTest(unittest.TestCase):

def setUp(self):
self.polkadot = DockerContainer('parity/polkadot:latest')
self.polkadot.with_command('--dev --validator --unsafe-rpc-external --unsafe-ws-external --rpc-methods=unsafe --rpc-cors=all')
self.polkadot.with_exposed_ports(9933,9944)
self.polkadot.with_command('--dev --validator --unsafe-rpc-external --unsafe-rpc-external --rpc-methods=unsafe --rpc-cors=all')
self.polkadot.with_exposed_ports(9944)
self.polkadot.start()
self.polkadot_rpc_http_url = 'http://{}:{}'.format(self.polkadot.get_container_host_ip(), self.polkadot.get_exposed_port(9933))
self.polkadot_rpc_http_url = 'http://{}:{}'.format(self.polkadot.get_container_host_ip(), self.polkadot.get_exposed_port(9944))
self.polkadot_rpc_ws_url = 'ws://{}:{}'.format(self.polkadot.get_container_host_ip(), self.polkadot.get_exposed_port(9944))
wait_for_http_ready(self.polkadot_rpc_http_url + '/health')

Expand Down
6 changes: 3 additions & 3 deletions tests/stash_account_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ class StashAccountTest(unittest.TestCase):

def setUp(self):
self.polkadot = DockerContainer('parity/polkadot:latest')
self.polkadot.with_command('--dev --validator --unsafe-rpc-external --unsafe-ws-external --rpc-methods=unsafe --rpc-cors=all')
self.polkadot.with_exposed_ports(9933, 9944)
self.polkadot.with_command('--dev --validator --unsafe-rpc-external --unsafe-rpc-external --rpc-methods=unsafe --rpc-cors=all')
self.polkadot.with_exposed_ports(9944)
self.polkadot.start()

self.polkadot_rpc_http_url = 'http://{}:{}'.format(self.polkadot.get_container_host_ip(), self.polkadot.get_exposed_port(9933))
self.polkadot_rpc_http_url = 'http://{}:{}'.format(self.polkadot.get_container_host_ip(), self.polkadot.get_exposed_port(9944))
self.polkadot_rpc_ws_url = 'ws://{}:{}'.format(self.polkadot.get_container_host_ip(), self.polkadot.get_exposed_port(9944))
self.alice_key = '0xe5be9a5092b81bca64be81d212e7f2f9eba183bb7a90954f7b76361f6edb5c0a'
wait_for_http_ready(self.polkadot_rpc_http_url + '/health')
Expand Down
8 changes: 4 additions & 4 deletions tests/validator_manager_pos_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def setUp(self):
# Start Alice validator
self.alice_validator = DockerContainer('parity/polkadot:latest')
self.alice_validator.with_command("""
--chain westend-local --validator --alice --unsafe-ws-external --rpc-cors=all --rpc-methods=unsafe
--chain westend-local --validator --alice --unsafe-rpc-external --rpc-cors=all --rpc-methods=unsafe
""")
self.alice_validator.with_exposed_ports(9944, 10333)
self.alice_validator.start()
Expand All @@ -27,13 +27,13 @@ def setUp(self):
# Start Bob validator and connect it to Alice
self.bob_validator = DockerContainer('parity/polkadot:latest')
self.bob_validator.with_command("""
--chain westend-local --validator --bob --unsafe-ws-external --unsafe-rpc-external --rpc-cors=all \
--chain westend-local --validator --bob --unsafe-rpc-external --unsafe-rpc-external --rpc-cors=all \
--rpc-methods=unsafe --bootnodes /ip4/127.0.0.1/tcp/{}/p2p/12D3KooWAvdwXzjmRpkHpz8PzUTaX1o23SdpgAWVyTGMSQ68QXK6
""".format(self.alice_validator.get_exposed_port(10333)))
self.bob_validator.with_exposed_ports(9933, 9944)
self.bob_validator.with_exposed_ports( 9944)
self.bob_validator.start()
self.bob_validator_http_url = 'http://{}:{}'.format(self.bob_validator.get_container_host_ip(),
self.bob_validator.get_exposed_port(9933))
self.bob_validator.get_exposed_port(9944))
self.bob_validator_rpc_ws_url = 'ws://{}:{}'.format(self.bob_validator.get_container_host_ip(),
self.bob_validator.get_exposed_port(9944))
self.alice_key = '0xe5be9a5092b81bca64be81d212e7f2f9eba183bb7a90954f7b76361f6edb5c0a'
Expand Down
8 changes: 4 additions & 4 deletions tests/validator_manager_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class ValidatorManagerTest(unittest.TestCase):
def setUp(self):
# Start Alice validator
self.alice_validator = DockerContainer('parity/polkadot:latest')
self.alice_validator.with_command('--chain rococo-local --validator --alice --unsafe-ws-external --rpc-cors=all')
self.alice_validator.with_command('--chain rococo-local --validator --alice --unsafe-rpc-external --rpc-cors=all')
self.alice_validator.with_exposed_ports(9944, 10333)
self.alice_validator.start()

Expand All @@ -23,13 +23,13 @@ def setUp(self):
# Start Bob validator and connect it to Alice
self.bob_validator = DockerContainer('parity/polkadot:latest')
self.bob_validator.with_command("""
--chain rococo-local --validator --bob --unsafe-ws-external --unsafe-rpc-external --rpc-cors=all \
--chain rococo-local --validator --bob --unsafe-rpc-external --unsafe-rpc-external --rpc-cors=all \
--bootnodes /ip4/127.0.0.1/tcp/{}/p2p/12D3KooWAvdwXzjmRpkHpz8PzUTaX1o23SdpgAWVyTGMSQ68QXK6
""".format(self.alice_validator.get_exposed_port(10333)))
self.bob_validator.with_exposed_ports(9933, 9944)
self.bob_validator.with_exposed_ports(9944)
self.bob_validator.start()
self.bob_validator_http_url = 'http://{}:{}'.format(self.bob_validator.get_container_host_ip(),
self.bob_validator.get_exposed_port(9933))
self.bob_validator.get_exposed_port(9944))
self.bob_validator_rpc_ws_url = 'ws://{}:{}'.format(self.bob_validator.get_container_host_ip(),
self.bob_validator.get_exposed_port(9944))
self.alice_key = '0xe5be9a5092b81bca64be81d212e7f2f9eba183bb7a90954f7b76361f6edb5c0a'
Expand Down

0 comments on commit f48bca3

Please sign in to comment.