-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: rename master secret to link secret
Signed-off-by: blu3beri <[email protected]>
- Loading branch information
1 parent
742e2d2
commit 0936b2c
Showing
41 changed files
with
502 additions
and
475 deletions.
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| use crate::error::ConversionError; | ||
| use std::fmt; | ||
| use ursa::{ | ||
| bn::BigNumber, | ||
| cl::{prover::Prover as UrsaProver, MasterSecret}, | ||
| }; | ||
| pub struct LinkSecret(pub ursa::bn::BigNumber); | ||
|
|
||
| impl LinkSecret { | ||
| #[must_use] | ||
| pub fn new() -> Result<Self, ConversionError> { | ||
| let value = UrsaProver::new_master_secret() | ||
| .and_then(|v| v.value()) | ||
| .map_err(|err| { | ||
| ConversionError::from_msg(format!("Error creating link secret: {err}")) | ||
| })?; | ||
|
|
||
| Ok(Self(value)) | ||
| } | ||
|
|
||
| pub fn try_clone(&self) -> Result<Self, ConversionError> { | ||
| let cloned = self.0.try_clone().map_err(|err| { | ||
| ConversionError::from_msg(format!("Error cloning link secret: {err}")) | ||
| })?; | ||
|
|
||
| Ok(Self(cloned)) | ||
| } | ||
| } | ||
|
|
||
| impl fmt::Debug for LinkSecret { | ||
| fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { | ||
| f.debug_tuple("LinkSecret") | ||
| .field(if cfg!(test) { &self.0 } else { &"<hidden>" }) | ||
| .finish() | ||
| } | ||
| } | ||
|
|
||
| impl TryInto<MasterSecret> for LinkSecret { | ||
| type Error = ConversionError; | ||
|
|
||
| fn try_into(self) -> Result<MasterSecret, Self::Error> { | ||
| let j = serde_json::json!({ | ||
| "ms": self.0 | ||
| }); | ||
| serde_json::from_value(j) | ||
| .map_err(|err| ConversionError::from_msg(format!("Error creating link secret: {err}"))) | ||
| } | ||
| } | ||
|
|
||
| impl TryInto<MasterSecret> for &LinkSecret { | ||
| type Error = ConversionError; | ||
|
|
||
| fn try_into(self) -> Result<MasterSecret, Self::Error> { | ||
| let j = serde_json::json!({ | ||
| "ms": self.0 | ||
| }); | ||
|
|
||
| serde_json::from_value(j) | ||
| .map_err(|err| ConversionError::from_msg(format!("Error creating link secret: {err}"))) | ||
| } | ||
| } | ||
|
|
||
| impl TryInto<String> for LinkSecret { | ||
| type Error = ConversionError; | ||
|
|
||
| fn try_into(self) -> Result<String, Self::Error> { | ||
| self.0 | ||
| .to_dec() | ||
| .map_err(|err| ConversionError::from_msg(format!("Error creating link secret: {err}"))) | ||
| } | ||
| } | ||
|
|
||
| impl TryFrom<&str> for LinkSecret { | ||
| type Error = ConversionError; | ||
|
|
||
| fn try_from(value: &str) -> Result<Self, Self::Error> { | ||
| Ok(Self(BigNumber::from_dec(value).map_err(|err| { | ||
| ConversionError::from_msg(format!("Error creating link secret: {err}")) | ||
| })?)) | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod link_secret_tests { | ||
| use super::*; | ||
|
|
||
| #[test] | ||
| fn should_create_new_link_secret() { | ||
| let link_secret = LinkSecret::new(); | ||
| assert!(link_secret.is_ok()); | ||
| } | ||
|
|
||
| #[test] | ||
| fn should_convert_between_string_and_link_secret_roundtrip() { | ||
| let ls = "123"; | ||
| let link_secret = LinkSecret::try_from(ls).expect("Error creating link secret"); | ||
| let link_secret_str: String = link_secret.try_into().expect("Error creating link secret"); | ||
| assert_eq!(link_secret_str, ls); | ||
| } | ||
|
|
||
| #[test] | ||
| fn should_convert_between_master_secret() { | ||
| let link_secret = LinkSecret::new().expect("Unable to create link secret"); | ||
| let master_secret: MasterSecret = link_secret | ||
| .try_clone() | ||
| .expect("Error cloning link secret") | ||
| .try_into() | ||
| .expect("error converting link secret"); | ||
|
|
||
| assert_eq!( | ||
| link_secret.0, | ||
| master_secret | ||
| .value() | ||
| .expect("Error getting value from master secret") | ||
| ); | ||
| } | ||
|
|
||
| #[test] | ||
| fn should_clone_link_secret() { | ||
| let link_secret = LinkSecret::new().expect("Unable to create link secret"); | ||
| let cloned_link_secret = link_secret | ||
| .try_clone() | ||
| .expect("Unable to clone link secret"); | ||
|
|
||
| assert_eq!(link_secret.0, cloned_link_secret.0); | ||
| } | ||
| } |
Oops, something went wrong.