Ticket 33675: Adding regex to search microdescriptor files for relay ed25519 keys #62
Conversation
|
Hi, I think there's something unusual happening in the logs. How are you running "make test-network-all" ? |
|
Hey @teor2345 , no I am running the command only once. |
|
@teor2345 In the latest commit I made the changes you suggested, but I am still facing certain errors, can you suggest me further what steps to take in order to eradicate the mistakes. Thank you very much for your help. I have attached log file as well. |
|
Hey @ahf , Can you kindly review this PR and suggest me the changes. Thank you very much. |
teor2345
changed the title
lib/chutney/TorNet.py
Outdated
| @@ -1323,11 +1358,12 @@ def getNodeDirInfoStatusPattern(self, dir_format): | |||
| elif desc: | |||
| return r'^router ' + nickname + " " | |||
| elif md: | |||
| if ed25519_key: | |||
| # Not yet implemented, see #33428 | |||
There was a problem hiding this comment.
Cleanup: this feature is now implemented, so we can delete this comment.
lib/chutney/TorNet.py
Outdated
| return None | ||
| # Return None if ed25519_id not found |
There was a problem hiding this comment.
Cleanup: we usually put the comments above the code.
We use comments to explain what the code does when the program runs. Or why we wrote the code.
We don't repeat what is written in the code already.
| return None | |
| # Return None if ed25519_id not found | |
| # If there is no ed25519_id, then we can't search for it | |
| return None |
lib/chutney/TorNet.py
Outdated
| @@ -1300,7 +1334,8 @@ def getNodeDirInfoStatusPattern(self, dir_format): | |||
| the ed25519 key. (Or RSA block matching, which is hard.) | |||
There was a problem hiding this comment.
More cleanup:
- The microdesc format is now implemented, so we can delete that comment.
- We need to explain what returning "None" means for this function. I can make that change. I should have done it when I wrote the function.
| @@ -1323,11 +1358,12 @@ def getNodeDirInfoStatusPattern(self, dir_format): | |||
| elif desc: | |||
| return r'^router ' + nickname + " " | |||
| elif md: | |||
There was a problem hiding this comment.
I think we are only getting None for ed25519_key here. Because we are loading ed25519_id during configure(). But this code is called during wait_for_bootstrap().
Can you help me check what is happening?
If md is True, print the values of nickname and ed25519_key. Then we can check the logs.
|
I think this PR is obsoleted by #66. |
@teor2345 : I have added the following code, however when I run the command "make test-network-all" generally the test fails and I get warning. I have tried to fix the errors by reading the log files and solved most of the syntactical errors. Also when I ran the command, when regex code was not added and only function _setEd25519() was present in the file, then all the test were successful. I did not got any error at all. It therefore seems error is in the new code for regex. I have attached the file below which has all the logs. Kindly help to solve the following error. Also made the new branch for testing because did not wanted to pollute the already working branch with errors, but have made the same changes regardless. Thank you for your help.
single-onion-v23.log