Refactoring/#219 applied ptb checks and fixes #225

Job	Run time
Run Slow or Expensive Tests (e.g. SaaS)?	1s
Checks / Version Check	19s
Checks / Unit Tests / build_and_test	1m 31s
Checks / Type Checking (Python-3.10)	38s
Checks / Linting (Python-3.10)	1m 18s
Gate 1 - Regular CI	1s
metrics / Generate Status Report	0s
iTests (no DB) / Prepare Matrix for integration tests without DB	25s
iTests (with DB) / build_and_test	8m 21s
iTests (no DB) / Run test_broadcast.py	38s
iTests (no DB) / Run test_gather.py	35s
iTests (no DB) / Run test_communicator.py	2m 47s
iTests (no DB) / Run test_multi_node_discovery.py	23m 30s
iTests (no DB) / Run test_localhost_discovery.py	22m 11s
iTests (no DB) / Run test_poll.py	44s
iTests (no DB) / Run test_add_peer_and_close.py	35m 17s
iTests (no DB) / Run test_add_peer_forward_and_wait_for_peers.py	35m 2s
iTests (no DB) / Run test_add_peer_and_wait_close.py	3m 6s
iTests (no DB) / Run test_send_recv.py	36m 30s
iTests (no DB) / Run test_add_peer_and_wait_for_peers.py	33m 56s
iTests (no DB) / Run test_add_peer_forward_and_close.py	36m 39s
Gate 2 - Allow Merge	1s
	4h 3m 30s

Provide feedback