Fix timelord issue

This commit is contained in:
Mariano Sorgente 2020-12-11 04:36:25 +09:00 committed by Yostra
parent 71ef01ae4a
commit b4bf2b1715
5 changed files with 10 additions and 9 deletions

View File

@ -85,7 +85,7 @@ kwargs = dict(
"chia_farmer = src.server.start_farmer:main",
"chia_introducer = src.server.start_introducer:main",
"chia_timelord = src.server.start_timelord:main",
"chia_timelord_launcher = src.timelord_launcher:main",
"chia_timelord_launcher = src.timelord.timelord_launcher:main",
"chia_full_node_simulator = src.simulator.start_simulator:main",
]
},

View File

@ -620,7 +620,8 @@ class FullNodeAPI:
prev_sb = None
else:
self.log.warning(
f"Making a non-genesis block. curr total iters{curr.total_iters} {total_iters_pos_slot + sp_iters}"
f"Making a non-genesis block. curr total iters{curr.total_iters} "
f"{total_iters_pos_slot + sp_iters}"
)
pool_target = request.pool_target
prev_sb = curr

View File

@ -391,10 +391,10 @@ class ChiaServer:
await self.app_shut_down_task
if self.site_shutdown_task is not None:
await self.site_shutdown_task
_, pending = await asyncio.wait(self.api_tasks, timeout=3, return_when=asyncio.ALL_COMPLETED)
for task in pending:
task.cancel()
if len(self.api_tasks) > 0:
_, pending = await asyncio.wait(self.api_tasks, timeout=3, return_when=asyncio.ALL_COMPLETED)
for task in pending:
task.cancel()
async def get_peer_info(self) -> Optional[PeerInfo]:
ip = None

View File

@ -103,7 +103,6 @@ class Timelord:
async with self.lock:
client_ip = writer.get_extra_info("peername")[0]
log.info(f"New timelord connection from client: {client_ip}.")
# print(client_ip, self.ip_whitelist)
if client_ip in self.ip_whitelist:
self.free_clients.append((client_ip, reader, writer))
log.info(f"Added new VDF client {client_ip}.")
@ -220,6 +219,7 @@ class Timelord:
self.iters_to_submit[Chain.CHALLENGE_CHAIN].append(left_subslot_iters)
self.iters_to_submit[Chain.REWARD_CHAIN].append(left_subslot_iters)
self.iteration_to_proof_type[left_subslot_iters] = IterationType.END_OF_SUBSLOT
log.warning(f"Iters to submit {self.iters_to_submit}")
for chain, iters in self.iters_to_submit.items():
for iteration in iters:
@ -697,7 +697,7 @@ class Timelord:
# Send (a, b) from 'initial_form'.
for num in [initial_form.a, initial_form.b]:
prefix_l = len(str(num))
prefix_len = len(str(prefix))
prefix_len = len(str(prefix_l))
writer.write((str(prefix_len) + str(prefix_l) + str(num)).encode())
await writer.drain()
try:

View File

@ -1,5 +1,5 @@
[pytest]
; logging options
log_cli = 1
log_level = WARNING
log_level = INFO
log_format = %(asctime)s %(name)s: %(levelname)s %(message)s