Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Cleanups in the Keyring #5001

Merged
merged 6 commits into from
Apr 8, 2019
Merged

Cleanups in the Keyring #5001

merged 6 commits into from
Apr 8, 2019

Conversation

richvdh
Copy link
Member

@richvdh richvdh commented Apr 3, 2019

A few miscellaneous refactors which don't achieve anything on their own, but I'd like to get off my stack.

Check the commits.

@richvdh richvdh force-pushed the rav/keyring_cleanups branch 3 times, most recently from 4145b05 to ee2c9ed Compare April 4, 2019 16:53
@codecov
Copy link

codecov bot commented Apr 4, 2019

Codecov Report

Merging #5001 into develop will decrease coverage by 0.72%.
The diff coverage is 100%.

@@             Coverage Diff             @@
##           develop    #5001      +/-   ##
===========================================
- Coverage    61.51%   60.79%   -0.73%     
===========================================
  Files          332      332              
  Lines        34227    34170      -57     
  Branches      5646     5630      -16     
===========================================
- Hits         21056    20772     -284     
- Misses       11661    11923     +262     
+ Partials      1510     1475      -35

@richvdh richvdh force-pushed the rav/keyring_cleanups branch from ee2c9ed to f2004fb Compare April 4, 2019 17:54
richvdh added 5 commits April 4, 2019 19:12
Make this just return the key dict, rather than a single-entry dict mapping the
server name to the key dict. It's easy for the caller to get the server name
from from the response object anyway.
It's easier to check it in the caller than to complicate the interface with an
extra param.
@richvdh richvdh force-pushed the rav/keyring_cleanups branch from f2004fb to b78aac5 Compare April 4, 2019 18:13
@richvdh richvdh requested a review from a team April 4, 2019 18:14
@richvdh
Copy link
Member Author

richvdh commented Apr 4, 2019

which don't achieve anything on their own

Actually this isn't quite true. I think it will fix a bug in get_server_verify_key_v2_direct, wherein we call /key/v2/server for each key we require from that server, even if we got all the keys on the first request, due to confusion over what is stored in keys.

@richvdh richvdh merged commit 7fc1e17 into develop Apr 8, 2019
@richvdh richvdh deleted the rav/keyring_cleanups branch May 23, 2019 13:24
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants