Replace generate_* functions with methods of HpkeKeypair #3287
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tgeoghegan
approved these changes
Jul 9, 2024
inahga
commented
Jul 9, 2024
Comment on lines
+1085
to
+1086
| let leader_hpke_keypairs = [HpkeKeypair::test(), HpkeKeypair::test_with_id(1)]; | ||
| let helper_hpke_keypairs = [HpkeKeypair::test(), HpkeKeypair::test_with_id(1)]; |
There was a problem hiding this comment.
I will fix this flake in another PR. I'm surprised this has never flaked on me before.
branlwyd
approved these changes
Jul 9, 2024
| pub fn generate_test_hpke_config_and_private_key() -> HpkeKeypair { | ||
| generate_hpke_config_and_private_key( | ||
| impl HpkeKeypair { | ||
| pub fn test() -> Self { |
There was a problem hiding this comment.
nit: this could fall through to a call to test_with_id
| @@ -341,8 +336,8 @@ pub mod test_util { | |||
| .unwrap() | |||
| } | |||
|
|
|||
| pub fn generate_test_hpke_config_and_private_key_with_id(id: u8) -> HpkeKeypair { | |||
| generate_hpke_config_and_private_key( | |||
| pub fn test_with_id(id: u8) -> Self { | |||
There was a problem hiding this comment.
nit: this could fall through to a call to test_with_ciphersuite
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Small refactor.
generate_test_hpke_config_and_private_key_with_id_and_ciphersuite()is a pretty incredible name, so let's shorten that up by making these functions methods onHpkeKeypair.A lot of ways this could be cleaned up, e.g. builder pattern,
impl Distribution, but this seemed the most straightforward win to me.