|
|
@@ -209,9 +209,9 @@ impl Cashierd {
|
|
|
}
|
|
|
|
|
|
let result: Result<String> = async {
|
|
|
- let token_id = generate_id(&mint_address)?;
|
|
|
+ let token_id = generate_id(&mint_address, &network)?;
|
|
|
|
|
|
- let mint_address_opt = Self::check_token_id(&network, &mint_address)?;
|
|
|
+ let mint_address_opt = Self::validate_token_id(&network, &mint_address)?;
|
|
|
|
|
|
if mint_address_opt.is_none() {
|
|
|
mint_address = String::new();
|
|
|
@@ -308,9 +308,9 @@ impl Cashierd {
|
|
|
}
|
|
|
|
|
|
let result: Result<String> = async {
|
|
|
- let token_id = generate_id(&mint_address)?;
|
|
|
+ let token_id = generate_id(&mint_address, &network)?;
|
|
|
|
|
|
- let mint_address_opt = Self::check_token_id(&network, &mint_address)?;
|
|
|
+ let mint_address_opt = Self::validate_token_id(&network, &mint_address)?;
|
|
|
|
|
|
if mint_address_opt.is_none() {
|
|
|
// empty string
|
|
|
@@ -363,7 +363,7 @@ impl Cashierd {
|
|
|
))
|
|
|
}
|
|
|
|
|
|
- fn check_token_id(network: &NetworkName, token_id: &str) -> Result<Option<String>> {
|
|
|
+ fn validate_token_id(network: &NetworkName, token_id: &str) -> Result<Option<String>> {
|
|
|
match network {
|
|
|
#[cfg(feature = "sol")]
|
|
|
NetworkName::Solana => {
|