feat(json_types): implement FromStr for ValidAccountId #391
Conversation
austinabell
requested review from
chadoh,
evgenykuzyakov and
mikedotexe
as code owners
| #[derive( | ||
| Debug, Clone, PartialEq, PartialOrd, Ord, Eq, BorshDeserialize, BorshSerialize, Serialize, | ||
| )] | ||
| pub struct ValidAccountId(AccountId); | ||
|
|
||
| impl ValidAccountId { | ||
| fn is_valid(&self) -> bool { | ||
| is_valid_account_id(&self.0.as_bytes()) | ||
| } | ||
| pub fn to_string(&self) -> String { |
There was a problem hiding this comment.
Also, this function does nothing, since to_string() comes with ToString which is auto impl from fmt::Display. I kept it in though because technically it's a breaking change although I don't know if you can actually trigger it because ValidAccountId::to_string(&id) still works.
Edit: or is this to avoid some unnecessary logic around fmt::Display?
There was a problem hiding this comment.
Yeah, we should remove this once we are ready to to a semver-breaking change.
| #[derive( | ||
| Debug, Clone, PartialEq, PartialOrd, Ord, Eq, BorshDeserialize, BorshSerialize, Serialize, | ||
| )] | ||
| pub struct ValidAccountId(AccountId); | ||
|
|
||
| impl ValidAccountId { | ||
| fn is_valid(&self) -> bool { | ||
| is_valid_account_id(&self.0.as_bytes()) | ||
| } | ||
| pub fn to_string(&self) -> String { |
There was a problem hiding this comment.
Yeah, we should remove this once we are ready to to a semver-breaking change.
| /// # Example | ||
| /// ``` | ||
| /// use near_sdk::AccountId; | ||
| /// use near_sdk::json_types::ValidAccountId; | ||
| /// | ||
| /// let id: AccountId = "bob.near".to_string(); | ||
| /// let validated: ValidAccountId = id.parse().unwrap(); | ||
| /// ``` |
There was a problem hiding this comment.
❤️ , examples are great, we need more of those!
austinabell
changed the title
| @@ -87,7 +121,7 @@ mod tests { | |||
|
|
|||
| #[test] | |||
| fn test_ser() { | |||
| let key: ValidAccountId = "alice.near".try_into().unwrap(); | |||
| let key: ValidAccountId = "alice.near".parse().unwrap(); | |||
There was a problem hiding this comment.
Cool, this is new to me. 👍🏼
Just saw https://stackoverflow.com/questions/67332443/how-to-convert-accountid-into-validaccountid-in-near-protocol-contracts
and this makes it easier to convert as it doesn't require importing the
TryFromorTryIntotraitAlso changes the logic a bit to avoid allocating a
Stringfrom&strbefore it's checked as valid.