Scx1332/tokenrefaktor #3042
Merged
Scx1332/tokenrefaktor #3042
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
nieznanysprawiciel
previously approved these changes
Feb 5, 2024
Comment on lines
+46
to
+49
| impl Display for TokenName { | ||
| fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { | ||
| write!(f, "{}", self.0) | ||
| } |
There was a problem hiding this comment.
Comment on lines
+247
to
+251
| impl Display for PaymentPlatformTriple { | ||
| fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { | ||
| write!(f, "{}-{}-{}", self.driver, self.network, self.token) | ||
| } | ||
| } |
There was a problem hiding this comment.
core/payment/src/api/allocations.rs
Outdated
Comment on lines
123
to
155
| let default_platform = Self::default_testnet(); | ||
| log::debug!("Empty paymentPlatform object, using {default_platform}"); | ||
| default_platform | ||
| } else if p.token.is_some() && p.network.is_none() && p.driver.is_none() { | ||
| let token = p.token.as_ref().unwrap(); | ||
| if token == "GLM" || token == "tGLM" { | ||
| return Err(bad_req_and_log(format!( | ||
| "Uppercase token names are not supported. Use lowercase glm or tglm instead of {}", | ||
| token | ||
| ))); | ||
| } else if token == "glm" { | ||
| let default_platform = Self::default_mainnet(); | ||
| log::debug!("Selected network {default_platform} (default for glm token)"); | ||
| default_platform | ||
| } else if token == "tglm" { | ||
| let default_platform = Self::default_testnet(); | ||
| log::debug!("Selected network {default_platform} (default for tglm token)"); | ||
| default_platform | ||
| } else { | ||
| return Err(bad_req_and_log(format!( | ||
| "Only glm or tglm token values are accepted vs {token} provided" | ||
| ))); | ||
| } | ||
| } else { | ||
| let network_str = p.network.as_deref().unwrap_or_else(|| { | ||
| if let Some(token) = p.token.as_ref() { | ||
| if token == "glm" { | ||
| log::debug!( | ||
| "Network not specified, using default {}, because token set to glm", | ||
| DEFAULT_MAINNET_NETWORK | ||
| ); | ||
| DEFAULT_MAINNET_NETWORK.into() | ||
| } else { | ||
| log::debug!( | ||
| "Network not specified, using default {}", | ||
| DEFAULT_TESTNET_NETWORK | ||
| ); | ||
| DEFAULT_TESTNET_NETWORK.into() | ||
| } | ||
| } else { | ||
| log::debug!( | ||
| "Network not specified and token not specified, using default {}", | ||
| DEFAULT_TESTNET_NETWORK | ||
| ); | ||
| DEFAULT_TESTNET_NETWORK.into() | ||
| } | ||
| }); | ||
| let network = validate_network(network_str).map_err(|err| { | ||
| bad_req_and_log(format!("Validate network failed (1): {err}")) | ||
| })?; | ||
|
|
||
| let driver_str = p.driver.as_deref().unwrap_or_else(|| { | ||
| log::debug!( | ||
| "Network not specified, using default {}, because token set to glm", | ||
| DEFAULT_MAINNET_NETWORK | ||
| "Driver not specified, using default {}", | ||
| DEFAULT_PAYMENT_DRIVER | ||
| ); | ||
| DEFAULT_MAINNET_NETWORK.into() | ||
| DEFAULT_PAYMENT_DRIVER.into() | ||
| }); | ||
| let driver = validate_driver(&network, driver_str) | ||
| .map_err(|err| bad_req_and_log(format!("Validate driver failed (1): {err}")))?; | ||
|
|
||
| if let Some(token) = p.token.as_ref() { | ||
| let token = | ||
| TokenName::from_token_string(&driver, &network, token).map_err(|err| { | ||
| bad_req_and_log(format!("Validate token failed (1): {err}")) | ||
| })?; | ||
| log::debug!("Selected network {}-{}-{}", driver, network, token); | ||
| Self { | ||
| driver, | ||
| network, | ||
| token, | ||
| } | ||
| } else { | ||
| let default_token = TokenName::default(&driver, &network); | ||
|
|
||
| log::debug!( | ||
| "Network not specified, using default {}", | ||
| DEFAULT_TESTNET_NETWORK | ||
| "Selected network with default token {}-{}-{}", | ||
| driver, | ||
| network, | ||
| default_token | ||
| ); | ||
| DEFAULT_TESTNET_NETWORK.into() | ||
| Self { | ||
| driver, | ||
| network, | ||
| token: default_token, | ||
| } | ||
| } | ||
| } else { | ||
| log::debug!( | ||
| "Network not specified and token not specified, using default {}", | ||
| DEFAULT_TESTNET_NETWORK | ||
| ); | ||
| DEFAULT_TESTNET_NETWORK.into() | ||
| } |
There was a problem hiding this comment.
This could be match statement probably:
match (p.driver, p.network, p.token) {
(None, None, None) => { ... },
(None, None, Some(token)) => { ... }
}
core/payment/src/api/allocations.rs
Outdated
Comment on lines
129
to
134
| if token == "GLM" || token == "tGLM" { | ||
| return Err(bad_req_and_log(format!( | ||
| "Uppercase token names are not supported. Use lowercase glm or tglm instead of {}", | ||
| token | ||
| ))); | ||
| } else if token == "glm" { |
There was a problem hiding this comment.
It looks similar to from_token_string function implementation
|
|
||
| let network = validate_network(network_str) | ||
| .map_err(|err| bad_req_and_log(format!("Validate network failed (2): {err}")))?; | ||
| fn validate_network(network: &str) -> Result<NetworkName, String> { |
There was a problem hiding this comment.
Common practice would be to use anyhow if you need to return something generic as string.
Co-authored-by: nieznanysprawiciel <nieznany.sprawiciel@gmail.com>
Co-authored-by: nieznanysprawiciel <nieznany.sprawiciel@gmail.com>
nieznanysprawiciel
approved these changes
Feb 6, 2024
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.
No description provided.